From 7d83dbab58d87bef723faa3ec761a9cdf424d3fc Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sat, 6 Jul 2024 14:50:14 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=8E=BB=E9=99=A4=E4=B8=80=E6=A5=BC?= =?UTF-8?q?=E5=86=85=E5=8C=85=E9=97=B4=E6=89=80=E6=9C=89=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=8B=E5=8F=91ACS=E7=9A=84=E5=AD=90=E5=8D=B7=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java | 2 -- .../b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java | 5 +---- .../org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java | 4 +--- .../b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java | 5 ++--- .../nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java | 2 +- .../b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java | 2 +- .../b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java | 2 +- .../nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java | 8 ++------ .../org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java | 6 +----- 9 files changed, 10 insertions(+), 26 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 97e139515..ca0e66a51 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/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; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index 711ce6875..e5061c496 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/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 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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index 4cf099475..874045bba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/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 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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java index 575732654..4180e8542 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java +++ b/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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java index a56e9a773..bbdcf0c1c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java +++ b/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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java index da5754639..61c116723 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java +++ b/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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java index b11b0c375..035eea245 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java +++ b/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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index d24ceb537..dd5ab5d4c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/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()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index 45c617e97..3688e9f53 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/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())