opt:去除一楼内包间所有任务下发ACS的子卷号

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java

@@ -53,8 +53,6 @@ public class DjqTask extends AbstractAcsTask {
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
     @Resource
-    private MzhcwTask mzhcwTask;
-    @Resource
     private TaskQueueManager taskQueueManager;
 
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java

@@ -53,9 +53,6 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
 
-    @Resource
-    private SsxDjwTask ssxDjwTask;
-
 
     @Override
     public List<AcsTaskDto> addTask() {
@@ -71,7 +68,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
                     .task_type(r.getAcs_task_type())
                     .start_device_code(r.getPoint_code1())
                     .next_device_code(r.getPoint_code2())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java

@@ -48,8 +48,6 @@ public class GzqTask extends AbstractAcsTask {
     private IschBaseTaskService taskService;
     @Resource
     private IbstIvtPackageinfoivtService packageinfoivtService;
-    @Resource
-    private MzhcwTask mzhcwTask;
 
     @Override
     public List<AcsTaskDto> addTask() {
@@ -67,7 +65,7 @@ public class GzqTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java

@@ -53,8 +53,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     private IbstIvtPackageinfoivtService packageinfoivtService;
 
 
-    @Resource
+
-    private SsxDjwTask ssxDjwTask;
 
 
     @Override
@@ -71,7 +70,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
                     .task_type(r.getAcs_task_type())
                     .start_device_code(r.getPoint_code1())
                     .next_device_code(r.getPoint_code2())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java

@@ -95,7 +95,7 @@ public class MzhcwTask extends AbstractAcsTask {
                     .next_device_code2(r.getPoint_code4())
                     //四个点任务与两个点任务类型区分
                     .agv_action_type(r.getVehicle_code2())
-                     //.vehicle_code(r.getVehicle_code())
+                     .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java

@@ -65,7 +65,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java

@@ -65,7 +65,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 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.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
@@ -51,10 +50,7 @@ import java.util.List;
 @Slf4j
 public class ZxDjwTask extends AbstractAcsTask {
 
-    @Resource
+
-    private DjqToKzjhcwTask djqToKzjhcwTask;
-    @Resource
-    private DjqTask djqTask;
     @Resource
     private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
     @Resource
@@ -84,7 +80,7 @@ public class ZxDjwTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"))
                     .interaction_json(JSON.parseObject(r.getRequest_param()))
                     .priority(r.getPriority())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-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.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
@@ -64,9 +63,6 @@ public class ZxqTask extends AbstractAcsTask {
     @Resource
     private IpdmBiSubpackagerelationService subpackageRelationService;
 
-    @Resource
-    private IPdmBiSlittingproductionplanService productionPlanService;
-
     @Resource
     private PdmBiSlittingproductionplanMapper pdmBiSlittingproductionplanMapper;
     @Resource
@@ -95,7 +91,7 @@ public class ZxqTask extends AbstractAcsTask {
                     .next_device_code(r.getPoint_code2())
                     .start_device_code2(r.getPoint_code3())
                     .next_device_code2(r.getPoint_code4())
-                    //.vehicle_code(r.getVehicle_code())
+                    .vehicle_code(r.getVehicle_code())
                     .priority(r.getPriority())
                     .remark(r.getRemark())
                     .product_area(r.getProduct_area())