From a39f704e364f6c5e5c047932cc7a0407423db068 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Tue, 22 Apr 2025 12:34:41 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/PdmBiSlittingproductionplanMapper.xml | 5 +++++ .../b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 6 +++--- .../tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java | 4 ++++ .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index c176560d0..a06ebfdcb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -202,6 +202,7 @@ p.parent_container_name, p.split_group, p.up_or_down, + p.manufacture_sort, p.qzz_size, p.qzz_generation, MIN(p.start_time) AS start_time @@ -221,7 +222,11 @@ p.parent_container_name, p.split_group, p.up_or_down, + p.manufacture_sort, p.qzz_size, p.qzz_generation + order by p.qzz_size, + p.manufacture_sort desc, + p.start_time diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index d75fcdaa1..bb9c8fb74 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -139,13 +139,13 @@ public class AutoCallAirShaftTask { Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue()); // 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑 // List planAll = slittingproductionplanService.getAllCutPlan(integer); - List planAllNoSort = slittingproductionplanService.getAllCutPlan2(integer); + List planAll = slittingproductionplanService.getAllCutPlan2(integer); // 排序 - List planAll = planAllNoSort.stream() + /* List planAll = planAllNoSort.stream() .sorted(Comparator.comparing( dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER) )) - .collect(Collectors.toList()); + .collect(Collectors.toList());*/ // 过滤 String value = paramObj.getValue(); List prefixList = Arrays.asList(value.split("[，,]")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java index 9629ebd41..231444f07 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java @@ -33,6 +33,10 @@ public class SlitterPlanDistinctDto { * 气胀轴尺寸 */ private String qzz_size; + /** + * 生产顺序 + */ + private String manufacture_sort; /** * 气胀轴代数 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index b5b58b4da..5c8df0226 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -2215,9 +2215,15 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "加急失败,当前计划正在套轴!"); return res; } + if(!"P1".equals(plan.getManufacture_sort())){ + res.put("status", HttpStatus.HTTP_OK); + res.put("message", "加急失败,当前计划已加急过一次!"); + return res; + } //更新套轴计划开始时间为当前时间 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper(); updateWrapper.set(PdmBiSlittingproductionplan::getStart_time, DateUtil.now()) + .set(PdmBiSlittingproductionplan::getManufacture_sort, "P2") .eq(PdmBiSlittingproductionplan::getWorkorder_id, workorder_id) .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO); //判断更新是否成功