Merge branch 'dev-temp-xw-202501090000-44270' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java

@@ -38,9 +38,6 @@ public class MesAssemblyNosortCfgController extends BaseMesController<MesAssembl
             MesExcelTool excelTool = new MesExcelTool(entityManager, RedisCacheTool.getImppRedis());
             List<MesAssemblyNosortCfg> beanList = excelTool.importData(file.getOriginalFilename(), file.getInputStream(), mesClass);
 
-            // 校验导入数据
-            baseService.validateImport(beanList);
-
             beanList.forEach(mesAssemblyNosortCfg -> {
                 mesAssemblyNosortCfg.setPid(sourceId);
             });

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdRuleNosortCfgController.java

@@ -59,8 +59,8 @@ public class MesProdRuleNosortCfgController extends BaseMesController<MesProdRul
     @ApiOperation(value = "流程导入")
     public ResultBean allImport(@RequestParam("file") MultipartFile file) {
         try {
-            //String organizeCode = AuthUtil.getOrganizeCode();
-            String organizeCode = "CK01";
+            String organizeCode = AuthUtil.getOrganizeCode();
+            //String organizeCode = "CK01";
             //数据空校验以及转换
             ExcelTool excelTool = new ExcelTool(entityManager, RedisCacheTool.getImppRedis());
             List<MesProdRuleNosortCfg> ruleNosortCfgList = getDataAndInitValid(excelTool, file.getOriginalFilename(), file.getInputStream(),
@@ -71,8 +71,8 @@ public class MesProdRuleNosortCfgController extends BaseMesController<MesProdRul
                     MesEquipmentProdParamCfg.class, "MesEquipmentProdParamCfg", true);
             List<MesTimeEfficientCfg> timeEfficientCfgList = getDataAndInitValid(excelTool, file.getOriginalFilename(), file.getInputStream(),
                     MesTimeEfficientCfg.class, "MesTimeEfficientCfg", true);
-            //String userName = AuthUtil.getSessionUser().getUserName();
-            String userName ="zxw";
+            String userName = AuthUtil.getSessionUser().getUserName();
+            //String userName ="zxw";
             ruleNosortCfgList.forEach(ruleNosortCfg -> {
                 ruleNosortCfg.setOrganizeCode(organizeCode);
                 ConvertBean.serviceModelInitialize(ruleNosortCfg,userName);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java

@@ -23,7 +23,7 @@ public class MesAssemblyNosortCfgService extends BaseMesService<MesAssemblyNosor
 
         for (MesAssemblyNosortCfg item : beanList) {
             // 数据校验
-            ValidatorBean.checkNotNull(item.getPid(), "非排序加工规则ID");
+            ValidatorBean.checkNotNull(item.getPid(), "非排序加工规则ID不能为空");
             ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "原料零件号不能为空");
 
         }