From ce6e53fd7212fc524e096fe4ea70262351a95f7c Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 13 Jan 2025 19:06:17 +0800
Subject: [PATCH] =?UTF-8?q?44270=20PC=EF=BC=9A=E9=9D=9E=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8A=A0=E5=B7=A5=E8=A7=84=E5=88=99=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/base/MesAssemblyNosortCfgController.java           | 3 ---
 .../controller/base/MesProdRuleNosortCfgController.java           | 8 ++++----
 .../apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java
index 558e5c7..318338c 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesAssemblyNosortCfgController.java
+++ b/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);
             });
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdRuleNosortCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdRuleNosortCfgController.java
index 8d581fd..0765a93 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdRuleNosortCfgController.java
+++ b/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);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java
index cc63214..1feed31 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesAssemblyNosortCfgService.java
+++ b/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(), "原料零件号不能为空");
 
         }