From 0686beac3dd09ca44d56bf22a7bdfecc7427a62d Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 9 Jan 2023 09:58:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 15 +++++++++------
 .../service/impl/RawAssistIStorServiceImpl.java   |  6 +++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index d5a3732ac..700383863 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -57,7 +57,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      * @param string 条件
      * @returnzss
      */
-    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Override
     public Map<String, Object> receiveTaskStatusAcs(String string) {
         JSONArray array = JSONArray.parseArray(string);
@@ -129,7 +128,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return result;
     }
 
-    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Override
     public String againApply(String task_id) {
         log.info("输入参数：" + task_id);
@@ -153,13 +151,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return point_code;
     }
 
-    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Override
     public Map<String, Object> receivePointStatusFromAcs(Map<String, String> jsonObject) {
         return null;
     }
 
-    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Override
     public Map<String, Object> orderFinish(String string) {
         JSONObject orderJson = JSONObject.parseObject(string);
@@ -182,8 +178,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return result;
     }
 
-    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Override
+    @LokiLog(type = LokiLogType.ACS_TO_LMS)
     @Transactional(rollbackFor = Exception.class)
     public JSONObject apply(JSONObject whereJson) {
         String type = whereJson.getString("type");
@@ -204,6 +200,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
          *  4.出库口申请入发货区任务
          */
         if (type.equals("1")) {
+            boolean checked = true;
+            boolean auto_div = false;
             if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("ACS申请任务失败！载具不能为空");
             //通过该木箱码查询对应的分配明细
             JSONArray dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("work_status = '00' AND box_no = '" + vehicle_code + "'").getResultJSONArray(0);
@@ -221,6 +219,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 dis_map.put("sect_name",dis_row.getString("sect_name"));
                 dis_map.put("struct_id",dis_row.getString("struct_id"));
                 dis_map.put("struct_code",dis_row.getString("struct_code"));
+                if (StrUtil.isNotEmpty(dis_row.getString("struct_code"))){
+                    auto_div = true;
+                    checked = false;
+                }
                 dis_map.put("struct_name",dis_row.getString("struct_name"));
                 dis_map.put("iostorinv_id",dis_row.getString("iostorinv_id"));
                 dis_list.add(dis_map);
@@ -231,7 +233,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             map.put("tableMater", dis_list);
             map.put("point_code", device_code);
             map.put("sect_id", sect_jo.getString("sect_id"));
-            map.put("checked", true);
+            map.put("checked", checked);
+            map.put("auto_div", auto_div);
             map.put("auto_issue", "1");
             //自动分配货位并下发任务
             rawAssistIStorService.divStruct(map);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index 7d36263f5..15e18f3c3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -469,9 +469,13 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
         JSONObject whereJson2 = JSONObject.parseObject(JSON.toJSONString(whereJson));
         HashMap<String, String> map = rows.get(0);
 
+        Boolean auto_div = false;
+        if (whereJson2.containsKey("auto_div")){
+            auto_div = whereJson2.getBoolean("auto_div");
+        }
         //判断该载具是否已经分配货位或者起点
         JSONArray now_dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "17").addParam("box_no", map.get("box_no")).process().getResultJSONArray(0);
-        if (now_dis_rows.size() > 0) {
+        if (now_dis_rows.size() > 0 && !auto_div) {
             throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
         }