Merge remote-tracking branch 'origin/b_lms' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml

@@ -65,8 +65,8 @@
         AND p.is_child_tz_ok = '0'
         AND p.is_paper_ok = '1'
         AND p.is_delete = '0'
-        AND p.up_or_down IS NOT NULL
-        AND p.left_or_right IS NOT NULL
+        AND IFNULL(p.up_or_down,'') <![CDATA[ <> ]]> ''
+        AND IFNULL(p.left_or_right,'') <![CDATA[ <> ]]> ''
         GROUP BY
             p.resource_name,
             p.parent_container_name,

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

@@ -15,6 +15,8 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
+import org.nl.b_lms.sch.task.dao.SchBaseTask;
+import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.slitter.StockAreaCallTubeTask;
 import org.nl.b_lms.sch.tasks.slitter.StockAreaSendVehicleTask;
 import org.nl.b_lms.sch.tasks.slitter.TrussCallAirShaftTask;
@@ -32,8 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.*;
 
@@ -70,6 +74,8 @@ public class AutoCallAirShaftTask {
     private StockAreaCallTubeTask stockAreaCallTubeTask;
     @Autowired
     private IMdPbPapervehicleService mdPbPapervehicleService;
+    @Autowired
+    private IschBaseTaskService taskService;
 
     /**
      * hint: 目前只是考虑了上区域
@@ -82,6 +88,7 @@ public class AutoCallAirShaftTask {
      */
     @Transactional(rollbackFor = Exception.class)
     public void run() {
+        log.info(this.getClass().getName() + "开始执行...");
         // 1、获取空的插拔轴位(无任务)
         List<BstIvtShafttubeivt> emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2",
                 "0", "0");
@@ -92,7 +99,7 @@ public class AutoCallAirShaftTask {
             // 2、获取分切计划数据 校验代数
             List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan();
             List<SlitterPlanDistinctDto> plans = planAll.stream()
-                    .filter(p -> p.getResource_name().startsWith("B")).collect(Collectors.toList());
+                    .filter(p -> p.getResource_name().startsWith("B6")).collect(Collectors.toList());
             if (plans.size() == 0) {
                 // 如果不需要套轴，就只做拔轴
                 makePullShaft(empty, specification);
@@ -445,7 +452,27 @@ public class AutoCallAirShaftTask {
         trussCallAirShaftTask.createTask(param);
     }
 
+    /**
+     * 检查是否有同设备的任务
+     * @param dto
+     * @return
+     */
     public boolean checkHasTask(SlitterPlanDistinctDto dto) {
+        // 同设备，同母卷，同组别的任务
+
+        // 桁架也需要校验
+        return false;
+    }
+
+    /**
+     * 检查是否有同母卷，不同组的点位数据
+     * @param dto
+     * @return
+     */
+    public boolean checkComputationPoint(SlitterPlanDistinctDto dto) {
+        // 同设备，同母卷，同组别的点位
+
+        // 有就返回true
         return false;
     }
 

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

@@ -123,7 +123,7 @@ public class AutoSendAirShaftAgvTask {
                     param.put("point_code2", endPoint.getPoint_code());
                     param.put("vehicle_code1", cutPoint.getQzz_no1());
                     param.put("vehicle_code2", cutPoint.getQzz_no2());
-                    param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位"));
+                    param.put("task_type", SlitterEnum.TASK_TYPE.code("送气胀轴到分切机任务"));
                     param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
                     sendAirShaftAgvTask.createTask(param);
                 } else {

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java

@@ -22,7 +22,7 @@ public enum SlitterEnum {
     TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803"
             , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807"
             , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811"
-    , "套轴异常处理桁架任务", "010812"));
+    , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813"));
     private Map<String, String> code;
 
     public String code(String desc) {