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="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

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());

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

@@ -120,10 +120,10 @@ public class AutoSplitTrussTask {
                 Deliverycachepointivt d1 = list.get(0);
                 Deliverycachepointivt d2 = list.get(1);
                 // 四点
-                trussTaskParam.put("point_code1", cutPoint.getTruss_point_code1());
-                trussTaskParam.put("point_code2", d1.getPoint_code());
-                trussTaskParam.put("point_code3", cutPoint.getTruss_point_code2());
-                trussTaskParam.put("point_code4", d2.getPoint_code());
+                trussTaskParam.put("point_code3", cutPoint.getTruss_point_code1());
+                trussTaskParam.put("point_code4", d1.getPoint_code());
+                trussTaskParam.put("point_code1", cutPoint.getTruss_point_code2());
+                trussTaskParam.put("point_code2", d2.getPoint_code());
                 trussTaskParam.put("vehicle_code1", cutPoint.getQzz_no1());
                 trussTaskParam.put("vehicle_code2", cutPoint.getQzz_no2());
                 trussTaskParam.put("truss_type", "8");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java

@@ -3955,10 +3955,12 @@ public class SlitterServiceImpl implements SlitterService {
                 throw new BadRequestException("两个管芯相加长度超出轴长度，请检查！");
             }
             // 判断两边选择尺寸是否一致
+            if (ObjectUtil.isNotEmpty(upLeftSizeV) && ObjectUtil.isNotEmpty(upRightSizeV)) {
                 if (!StrUtil.equals(upLeftQzzSize, upRightQzzSize)) {
                     throw new BadRequestException("同一根轴的管芯尺寸必须一致！");
                 }
             }
+        }
         // 判断是单管还是双管
         Integer paperNum = (ObjectUtil.isNotEmpty(upLeftSizeK) && ObjectUtil.isNotEmpty(upRightSizeK)) ? 2 : 1;
         List<PdmBiSlittingproductionplan> plans = new ArrayList<>();

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

@@ -47,8 +47,12 @@ 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 = "B1";
+                }else {
                     product_area = "BLK";
                 }
+            }
             if (StrUtil.isEmpty(product_area)) {
                 log.warn("区域不能为空!下发信息：" + jo.toString());
                 continue;