From 38e3302e409cfd951b31b1f0ea562917f523e056 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Sat, 25 May 2024 15:47:06 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java   | 1 -
 .../org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java    | 4 ++--
 .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
index 4ebe9c900..8ab67c07f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
@@ -76,7 +76,6 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
 
             map.put("task_status", TaskStatusEnum.EXECUTING.getCode());
         }
-
         // 完成
         if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
index 8ff13657c..53d4d63b3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
@@ -171,7 +171,7 @@ public class MzhcwTask extends AbstractAcsTask {
             //                gzqTask.createTask(toDjqTask);
             //            }
             //4.创建空载具到输送线任务
-            if (schBaseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))) {
+         //   if (schBaseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"))) {
                 List<BstIvtPackageinfoivt> kzjPointList = bstIvtPackageinfoivtList.stream()
                         .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位").equals(r.getPoint_status())
                                 && PackageInfoIvtEnum.IVT_STATUS.code("空载具").equals(r.getIvt_status())).collect(Collectors.toList());
@@ -229,7 +229,7 @@ public class MzhcwTask extends AbstractAcsTask {
                             kzjhcwTask.createTask(toKzjhcwTask);
                         }
                     }
-                }
+                //}
             }
         }
         // 取消
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 e3f8d106d..cdd7d1113 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
@@ -1887,7 +1887,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     // 6-退货入库
                     whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库"));
                     whereJson.put("box_no", whereJson.getString("material_barcode"));
-                    JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status = '0'").getResultJSONArray(0);
+                    JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0);
                     if (ObjectUtil.isEmpty(resultJSONArray)) {
                         throw new BadRequestException("未查询到子卷包装信息!");
                     }
@@ -2182,7 +2182,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         String device_code = param.getString("device_code");
         String material_barcode = param.getString("material_barcode");
         String vehicle_code = param.getString("vehicle_code");
-
         if (device_code.equals("RK1018")) {
             JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(vehicle_info)) {
@@ -2211,6 +2210,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("heightLevel", height);
+        jsonObject.put("status", HttpStatus.OK.value());
         return jsonObject;
     }
 }