From 6ee2dcc5a9003cc62db386fe9c3f90e090f1873b Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 19 Jul 2024 13:56:30 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BA=8C=E6=9C=9F=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=9B=E5=BB=BA=E4=BA=BA=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AE=8C=E6=88=90=E8=87=AA=E5=8A=A8=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=A0mes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage_manage/ios/enums/IOSEnum.java     |  3 +++
 .../impl/StIvtIostorinvServiceImpl.java       | 21 +++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
index f8527b61e..e0a06f97b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
@@ -112,6 +112,9 @@ public enum IOSEnum {
 
     //acs申请任务
     ACSTOLMS_TYPE(MapOf.of("成品入库任务", "1","空盘入库","2","空盘出库","3","异常处理位","4","木箱入库","5","退货入库","6","贴标","1","捆扎","2")),
+
+    // acs外部系统用户
+    EXT_ACS(MapOf.of("acs", "2","kc","康成")),
     ;
 
     private Map<String, String> code;
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 0bb44ced0..fa16650ee 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -41,6 +41,7 @@ import org.nl.common.utils.CodeUtil;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.param.ISysParamService;
+import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.basedata.st.service.StorattrService;
 import org.nl.wms.basedata.st.service.dto.StorattrDto;
 import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
@@ -668,6 +669,14 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         StorattrDto storattrDto = storattrService.findById(Long.parseLong((String) whereJson.get("stor_id")));
 
         if (ObjectUtil.isEmpty(mstDao)) {
+            String currentUserId = SecurityUtils.getCurrentUserId();
+            String currentNickName = SecurityUtils.getCurrentNickName();
+            if (currentUserId.equals(IOSEnum.EXT_ACS.code("acs"))) {
+                // 如果是外部系统创建人全部写系统参数
+                currentUserId = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IOS_CONFIRM_USER").getValue();
+                currentNickName = IOSEnum.EXT_ACS.code("kc");
+            }
+
             // 新增
             mstDao = StIvtIostorinv.builder()
                     .iostorinv_id(IdUtil.getLongId())
@@ -684,11 +693,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                     .bill_status(whereJson.get("bill_status").toString())
                     .total_qty(BigDecimal.valueOf(Double.parseDouble(whereJson.get("total_qty").toString())))
                     .create_mode(IOSEnum.CREATE_MODE.code("PC产生"))
-                    .input_optid(Long.parseLong(SecurityUtils.getCurrentUserId()))
-                    .input_optname(SecurityUtils.getCurrentNickName())
+                    .input_optid(Long.parseLong(currentUserId))
+                    .input_optname(currentNickName)
                     .input_time(DateUtil.now())
-                    .update_optid(Long.parseLong(SecurityUtils.getCurrentUserId()))
-                    .update_optname(SecurityUtils.getCurrentNickName())
+                    .update_optid(Long.parseLong(currentUserId))
+                    .update_optname(currentNickName)
                     .update_time(DateUtil.now())
                     .is_delete(IOSEnum.IS_NOTANDYES.code("否"))
                     .is_upload(IOSEnum.IS_NOTANDYES.code("否"))
@@ -959,7 +968,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         this.updateById(mstDao);
 
         // 生产入库：回传mes
-      /*  if (mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("生产入库"))) {
+        if (mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("生产入库")) || mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("改切入库"))) {
             InAndOutRetrunServiceImpl bean = SpringContextHolder.getBean(InAndOutRetrunServiceImpl.class);
 
             JSONObject param = new JSONObject();
@@ -974,7 +983,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
             } finally {
                 this.updateById(mstDao);
             }
-        }*/
+        }
 
     }
 }