Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs

@@ -28,7 +28,6 @@

                    break;
                case "2":
                case "4":
                    if (InsertOrUpdate(db, entity)) return 1;

                    break;
@@ -150,8 +149,13 @@
            CreateOrg = Convert.ToDecimal(depots.FCreateOrgId),
            UseOrg = Convert.ToDecimal(depots.FUseOrgId),
            CreateDate = DateTime.Now,
            FZYC= depots.FZYC,
            FGYC= depots.FGYC,
            FZMC= depots.FZMC,  
            CGYMC= depots.FCGYMC,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type=depots.Type,
        };
    }

@@ -194,7 +198,6 @@
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateBatch(db,
                                depotsGroup.Value)) // 批量插入或更新仓库
                            throw new NotImplementedException("同步失败");