fix: 防止禁用点位空指针

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="box_type != null and box_type != ''">
+        <if test="sale_order_name != null and sale_order_name != ''">
-            AND sub.box_type= #{box_type}
+            AND sub.sale_order_name= #{sale_order_name}
         </if>
 
         GROUP BY point.row_num

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(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("2楼1区域AGV系统"))
+                    .agv_system_type("3")
                     .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"))
                     .dtl_type(String.valueOf(dtl_type))
                     .route_plan_code(getRoutePlanCode(json.getString("point_code1")))
@@ -199,7 +199,6 @@ 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());

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -938,7 +938,7 @@ public class AutoCallAirShaftTask extends Prun {
                         .eq(BstIvtShafttubeivt::getPoint_location, empty.getPoint_location())
                         .eq(BstIvtShafttubeivt::getPoint_type, empty.getPoint_type())
                         .eq(BstIvtShafttubeivt::getIs_used, "1"));
-                if (ObjectUtil.isNotEmpty(one.getPlan()) && "2".equals(one.getPlan())) {
+                if (ObjectUtil.isNotEmpty(one) && ObjectUtil.isNotEmpty(one.getPlan()) && "2".equals(one.getPlan())) {
                     if (qzzSize.equals(one.getQzz_size()) && "6".equals(qzzSize)) {
                         judgment2 = (qzzCache.size() - 1) > 0;
                     }

lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java

@@ -47,11 +47,7 @@ public class AcsUtil {
                 product_area = "LK";
             }
             if (jo.containsKey("class_type") && jo.getString("class_type").contains("0107")) {
-                if (jo.getString("class_type").equals("010708")){
+                product_area = "BLK";
-                    product_area = "B1";
-                }else {
-                    product_area = "BLK";
-                }
             }
             if (StrUtil.isEmpty(product_area)) {
                 log.warn("区域不能为空!下发信息：" + jo.toString());