From 473241c84e826633d486386f2d662f18690bb0e6 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 13 Mar 2025 21:25:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=992?= =?UTF-8?q?=20fix:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E6=A0=A1=E9=AA=8C=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?05=E7=8A=B6=E6=80=81=20fix=EF=BC=9A=E5=88=86=E5=88=87=E6=A1=81?= =?UTF-8?q?=E6=9E=B6=E5=81=9A=E5=AE=8C=E4=BB=BB=E5=8A=A1=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=B1=E8=B4=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/controller/SlitterPdaController.java | 7 ++++ .../tasks/slitter/SlitterDownTrussTask.java | 42 ++++++++++--------- .../tasks/slitter/mapper/SlitterMapper.xml | 3 +- .../tasks/slitter/service/SlitterService.java | 7 ++++ .../service/impl/SlitterServiceImpl.java | 25 ++++++----- 5 files changed, 51 insertions(+), 33 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java index 373db2c5f..64de351b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java @@ -40,6 +40,13 @@ public class SlitterPdaController { return new ResponseEntity<>(slitterDevices.downRolls(param), HttpStatus.OK); } + @PostMapping("/downRolls2") + @Log("下卷2") + @SaIgnore + public ResponseEntity downRolls2(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.downRolls2(param), HttpStatus.OK); + } + @PostMapping("/moveVehicle") @Log("搬运废箔斗") @SaIgnore diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 56ef64e9f..bc3665af3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -141,26 +141,28 @@ public class SlitterDownTrussTask extends AbstractAcsTask { log.info("即将上卷的气胀轴编码数据：{}", upQzzNos); if (upQzzNos.size() > 0) { List plans = slittingproductionplanService.getByQzzNos(upQzzNos); - PdmBiSlittingproductionplan pp = plans.get(0); - // 需要把重量记录到分切机上 - point1.setRemark(SlitterTaskUtil.getPaperWeightStr(plans)); - if (pp.getContainer_name().contains("虚拟")) { - // 如果是虚拟卷，需要执行删除标记，并且清空数据 - // 将分切计划删除，设备禁用 - plans.forEach(p1 -> { - p1.setIs_delete("1"); - p1.setQzzno(""); - p1.setUpdate_time(DateUtil.now()); - p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); - p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); - }); - slittingproductionplanService.updateBatchById(plans); - // 设备禁用 - point1.setUp_qzzno(""); - point1.setDown_qzzno(""); - } else { - slittingproductionplanService.update(p, new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); + if (plans.size() > 0) { + PdmBiSlittingproductionplan pp = plans.get(0); + // 需要把重量记录到分切机上 + point1.setRemark(SlitterTaskUtil.getPaperWeightStr(plans)); + if (pp.getContainer_name().contains("虚拟")) { + // 如果是虚拟卷，需要执行删除标记，并且清空数据 + // 将分切计划删除，设备禁用 + plans.forEach(p1 -> { + p1.setIs_delete("1"); + p1.setQzzno(""); + p1.setUpdate_time(DateUtil.now()); + p1.setUpdate_optname(SecurityUtils.getCurrentNickName()); + p1.setUpdate_optid(SecurityUtils.getCurrentUserId()); + }); + slittingproductionplanService.updateBatchById(plans); + // 设备禁用 + point1.setUp_qzzno(""); + point1.setDown_qzzno(""); + } else { + slittingproductionplanService.update(p, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); + } } } point1.setUpdate_optid(3L); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index c53beff9c..7c17e0751 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -146,7 +146,6 @@ p.split_group, p.up_or_down, p.qzz_size, - p.`status`, p.qzz_generation, MIN(p.start_time) AS start_time FROM @@ -168,6 +167,6 @@ p.qzz_size, p.qzz_generation ORDER BY - start_time DESC, `status` + start_time DESC diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java index 194302f36..1c2923c5c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java @@ -313,4 +313,11 @@ public interface SlitterService { * @return */ List showManualView(JSONObject param); + + /** + * 子卷下料2 + * @param param + * @return + */ + JSONObject downRolls2(JSONObject param); } 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 765002c5e..ad1b9c275 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 @@ -487,12 +487,11 @@ public class SlitterServiceImpl implements SlitterService { log.error("子卷参数不能为空！"); throw new BadRequestException("子卷参数不能为空！"); } - // 获取分切计划，最多4个需要出站的任务 + // 获取分切计划，最多4个需要出站的任务 (不在校验05状态) List currentPlans = slittingproductionplanService.list( new LambdaQueryWrapper() .in(PdmBiSlittingproductionplan::getContainer_name, containerList) - .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO) - .eq(PdmBiSlittingproductionplan::getStatus, "05")); + .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); if (currentPlans.size() == 0) { log.error("当前子卷已经出卷或者不存在！"); throw new BadRequestException("当前子卷已经出卷或者不存在！"); @@ -515,14 +514,6 @@ public class SlitterServiceImpl implements SlitterService { } String area = device.getProduct_area(); // 获取当前分切机的下一组分切计划(最多四条分切计划) - // hint: 获取到的分切可能是不同组的但具有一定时间顺序 -// List timePlans = slittingproductionplanService.list( -// new LambdaQueryWrapper() -// .eq(PdmBiSlittingproductionplan::getResource_name, actualDeviceCode) -// .eq(PdmBiSlittingproductionplan::getStatus, "03") -// .eq(PdmBiSlittingproductionplan::getIs_delete, "0") -// .orderByAsc(PdmBiSlittingproductionplan::getUpdate_time)); -// log.info("获取下一组分切计划(可能存在脏数据)：{}", timePlans); // 寻找备好轴的对接点位 List cutPointList = slitterMapper.getReadyShaftPoint(actualDeviceCode); // 任务参数 @@ -2118,4 +2109,16 @@ public class SlitterServiceImpl implements SlitterService { public List showManualView(JSONObject param) { return slitterMapper.showManualView(); } + + @Override + public JSONObject downRolls2(JSONObject param) { + log.info("下卷2的输入参数为：{}", param); + // param: device_code, container + String device_code = param.getString("device_code"); + List tasks = taskService.checkHaveTask(device_code); + if (tasks.size() > 0) { + throw new BadRequestException("分切机" + device_code + " 已经有存在的任务"); + } + return mesSlittingMachineSendMaterial(param); + } }