Merge remote-tracking branch 'origin/master_merge' into master_merge

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;

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_optid(Long.parseLong(currentUserId))
-                    .input_optname(SecurityUtils.getCurrentNickName())
+                    .input_optname(currentNickName)
                     .input_time(DateUtil.now())
-                    .update_optid(Long.parseLong(SecurityUtils.getCurrentUserId()))
+                    .update_optid(Long.parseLong(currentUserId))
-                    .update_optname(SecurityUtils.getCurrentNickName())
+                    .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();
@@ -971,10 +980,9 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                 bean.uploadMES(param);
             } catch (Exception e) {
                 log.info(e.getMessage());
-            } finally {
                 this.updateById(mstDao);
             }
-        }*/
+        }
 
     }
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java

@@ -247,18 +247,6 @@ public class OutBussManageServiceImpl implements OutBussManageService {
 
         List<StIvtIostorinvdis> resultDisList = new ArrayList<>();
 
-        // 查询库区
-        JSONObject jsonSect = WQLObject.getWQLObject("st_ivt_sectattr")
-                .query("sect_id = '" + likeBoxList.get(0).getString("sect_id") + "'")
-                .uniqueResult(0);
-
-        String work_status;
-        if (jsonSect.getString("sect_type_attr").equals(IOSEnum.SECT_TYPE.code("虚拟区"))) {
-            work_status = IOSEnum.WORK_STATUS.code("生成");
-        } else {
-            work_status = IOSEnum.WORK_STATUS.code("未生成");
-        }
-
         // 查询计量单位
         JSONObject jsonUnit = WQLObject.getWQLObject("md_pb_measureunit")
                 .query("measure_unit_id = '" + likeBoxList.get(0).getString("qty_unit_id") + "'")
@@ -273,10 +261,21 @@ public class OutBussManageServiceImpl implements OutBussManageService {
                 .query("container_name in ('" + pcsn_in + "')")
                 .getResultJSONArray(0).toJavaList(JSONObject.class);
 
-
         for (int i = 0; i < likeBoxList.size(); i++) {
             JSONObject jsonIvt = likeBoxList.get(i);
 
+            // 查询库区
+            JSONObject jsonSect = WQLObject.getWQLObject("st_ivt_sectattr")
+                    .query("sect_id = '" + jsonIvt.getString("sect_id") + "'")
+                    .uniqueResult(0);
+
+            String work_status;
+            if (jsonSect.getString("sect_type_attr").equals(IOSEnum.SECT_TYPE.code("虚拟区"))) {
+                work_status = IOSEnum.WORK_STATUS.code("生成");
+            } else {
+                work_status = IOSEnum.WORK_STATUS.code("未生成");
+            }
+
             JSONObject jsonSub = subList.stream()
                     .filter(row -> row.getString("container_name").equals(jsonIvt.getString("pcsn")))
                     .collect(Collectors.toList()).get(0);