From 98df229655c2ce1ed9fa093219335344188c43a9 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 31 Jul 2026 10:53:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=8C=E6=9C=9F=E5=8F=91=E8=B4=A7AGV?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BANDC=E8=B0=83=E5=BA=A6=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml    | 4 ++--
 .../main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java    | 3 ++-
 .../src/main/java/org/nl/wms/sch/AcsUtil.java               | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
index caa71fa42..74e2328ae 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
@@ -36,8 +36,8 @@
             AND point.region_id= #{region_id}
         </if>
 
-        <if test="sale_order_name != null and sale_order_name != ''">
-            AND sub.sale_order_name= #{sale_order_name}
+        <if test="box_type != null and box_type != ''">
+            AND sub.box_type= #{box_type}
         </if>
 
         GROUP BY point.row_num
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
index 43980bdaf..26090bd7a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
@@ -99,7 +99,7 @@ public class TwoSendOutTask extends AbstractAcsTask {
                     .vehicle_code(json.getString("vehicle_code"))
                     .priority(json.getString("priority"))
                     .class_type(json.getString("task_type"))
-                    .agv_system_type("3")
+                    .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("2楼1区域AGV系统"))
                     .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"))
                     .dtl_type(String.valueOf(dtl_type))
                     .route_plan_code(getRoutePlanCode(json.getString("point_code1")))
@@ -199,6 +199,7 @@ public class TwoSendOutTask extends AbstractAcsTask {
         json.put("point_code2", form.getString("point_code2"));
         json.put("point_code4", form.getString("point_code4"));
         json.put("vehicle_code", form.getString("vehicle_code"));
+        json.put("acs_task_type", "3");
         json.put("handle_class", THIS_CLASS);
         json.put("create_id", SecurityUtils.getCurrentUserId());
         json.put("create_name", SecurityUtils.getCurrentUsername());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
index 19497e755..bbfa2c991 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
@@ -47,7 +47,11 @@ public class AcsUtil {
                 product_area = "LK";
             }
             if (jo.containsKey("class_type") && jo.getString("class_type").contains("0107")) {
-                product_area = "BLK";
+                if (jo.getString("class_type").equals("010708")){
+                    product_area = "B1";
+                }else {
+                    product_area = "BLK";
+                }
             }
             if (StrUtil.isEmpty(product_area)) {
                 log.warn("区域不能为空!下发信息：" + jo.toString());