opt：套轴、B2入烘箱

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

@@ -506,6 +506,7 @@ public class AutoCallAirShaftTask extends Prun {
      * @param needPlans 当前能套轴的计划
      */
     public void skipTheSameTubePlans(List<PdmBiSlittingproductionplan> needPlans) {
+        log.info("批量将AGV搬运的管芯设置95状态...");
         stepErrorInfo.add("批量将AGV搬运的管芯设置95状态...");
         List<String> tubes = needPlans.stream().map(plan -> {
             if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
@@ -803,6 +804,10 @@ public class AutoCallAirShaftTask extends Prun {
      */
     private Boolean toAcsOutShaft(List<PdmBiSlittingproductionplan> needPlans, List<SlitterPlanDistinctDto> plans, String qzzSize,  String location, BstIvtShafttubeivt empty) {
         Integer movePaperTube = toCallAgvMovePaperTube(needPlans, location, empty, plans);
+        if (movePaperTube == 2) {
+            log.info("跳过，无法更换托盘。");
+            return false;
+        }
         if (movePaperTube != 0) {
             skipTheSameTubePlans(needPlans);
             return false;

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -277,7 +277,7 @@ public class BakingServiceImpl implements BakingService {
                 JSONObject map = new JSONObject();
                 map.put("flag", "1");
                 if (product_area.equals("B2")) {
-                    map.put("flag", "302");
+                    map.put("flag", "303");
                 }
                 map.put("reging_id", reging_id);
                 map.put("point_location", point_location);
@@ -286,7 +286,7 @@ public class BakingServiceImpl implements BakingService {
 
                 JSONObject point_code2_jo = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
                 if (ObjectUtil.isEmpty(point_code2_jo)) {
-                    throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位！");
+                    throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位（可能被占用，请稍后再试）！");
                 }
                 /*if (ObjectUtil.isEmpty(pointArr)) {
                     if (StrUtil.equals(point_location, "0")) map.put("point_location", "1");

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql

@@ -294,6 +294,41 @@
     		ENDQUERY
     	ENDIF
 
+    	IF 输入.flag = "303"
+    	    QUERY
+    	        SELECT
+                	*
+                FROM
+                	sch_base_point p
+                WHERE
+                	p.is_delete = '0'
+                	AND p.is_used = '1'
+                	OPTION 输入.reging_id <> ""
+                        p.region_id = 输入.reging_id
+                    ENDOPTION
+                    OPTION 输入.point_type <> ""
+                        p.point_type = 输入.point_type
+                    ENDOPTION
+                	AND p.point_type = '4'
+                	AND p.point_status = '1'
+                	AND 0 = (
+                	SELECT
+                		COUNT(*)
+                	FROM
+                		sch_base_task t
+                	WHERE
+                		t.task_status < '07'
+                		AND (
+                			t.point_code1 = p.point_code
+                			OR t.point_code2 = p.point_code
+                			OR t.point_code3 = p.point_code
+                			OR t.point_code4 = p.point_code
+                		)
+                	AND t.is_delete = '0')
+                ENDSELECT
+    	    ENDQUERY
+    	ENDIF
+
     	IF 输入.flag = "302"
             QUERY
                 SELECT