From 3e3a129372ab772da6be7d73437162e44b3f6259 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 15 Jul 2024 14:25:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E6=B7=BB=E5=8A=A0=E5=A5=97=E6=8B=94?= =?UTF-8?q?=E8=BD=B4=E4=B8=9A=E5=8A=A1=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/controller/SlitterPdaController.java | 7 +++++++ .../slitter/auto/AutoCallAirShaftTask.java | 7 +++++-- .../tasks/slitter/service/SlitterService.java | 7 +++++++ .../service/impl/SlitterServiceImpl.java | 20 +++++++++++++++++++ 4 files changed, 39 insertions(+), 2 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 99f2ea9f5..7b1119286 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 @@ -108,4 +108,11 @@ public class SlitterPdaController { public ResponseEntity toShaftBinding(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterDevices.toShaftBinding(param), HttpStatus.OK); } + + @PostMapping("/querySlitterSubVolumeInfo") + @Log("查询分切机上的子卷信息") + @SaIgnore + public ResponseEntity querySlitterSubVolumeInfo(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.querySlitterSubVolumeInfo(param), HttpStatus.OK); + } } 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 19dacb3ab..0c9dd2dd3 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 @@ -149,6 +149,7 @@ public class AutoCallAirShaftTask { if (planDto == null) { return; } + log.info("此时获取的分切计划dto: {}", planDto); // 获取分切计划dto中对应的需要套轴的分切计划 最多两个计划 List needPlans = slittingproductionplanService.list(new LambdaQueryWrapper() .eq(PdmBiSlittingproductionplan::getResource_name, planDto.getResource_name()) @@ -167,6 +168,7 @@ public class AutoCallAirShaftTask { .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO) .eq(PdmBiSlittingproductionplan::getIs_paper_ok, SlitterConstant.SLITTER_YES)); } + log.info("通过dto获取的分切计划：{}", needPlans); // 获取其中一条 PdmBiSlittingproductionplan needPlan = needPlans.get(0); String qzzSize = needPlan.getQzz_size(); @@ -370,7 +372,8 @@ public class AutoCallAirShaftTask { acsQzz.put("value", "1"); acsQzz.put("product_area", SlitterConstant.SLITTER_TASK_AREA); acsParam.add(acsQzz); - wmsToAcsService.action(acsParam); + JSONObject action = wmsToAcsService.action(acsParam); + log.info("下发给ACS写信号出气涨轴返回参数：{}", action); } } @@ -530,7 +533,7 @@ public class AutoCallAirShaftTask { return true; } } - log.info("检查是否有同母卷不允许套轴：{}", dto); + log.info("检查有同母卷不允许套轴：{}", dto); // 有就返回true return false; } 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 489ab4a85..191fb7441 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 @@ -193,4 +193,11 @@ public interface SlitterService { * @return / */ JSONObject toShaftBinding(JSONObject param); + + /** + * 查询分切机上的子卷信息 + * @param param / + * @return / + */ + JSONObject querySlitterSubVolumeInfo(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 fc2e32723..9e8691a79 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 @@ -974,6 +974,10 @@ public class SlitterServiceImpl implements SlitterService { // 如果是没货 throw new BadRequestException("点位：" + point.getPoint_code() + "检测无货，请确保任务执行完毕后触发！"); } + if (ObjectUtil.equals(point.getPoint_status(), "2")) { + // 如果是没货 + throw new BadRequestException("点位：" + point.getPoint_code() + "检测空气胀轴，请确保下卷任务是否完毕后触发！"); + } List areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1", "1", "0", "2"); if (areaEmptyNotTaskPoint.size() == 0) { @@ -1213,4 +1217,20 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "气胀轴绑定成功!"); return res; } + + @Override + public JSONObject querySlitterSubVolumeInfo(JSONObject param) { + // param: point_code, container_name（多个用','隔开） + String containerName = param.getString("container_name"); + String pointCode1 = param.getString("point_code"); + if (ObjectUtil.isEmpty(containerName)) { + throw new BadRequestException("子卷号不能为空!"); + } + List collect = Arrays.stream(containerName.split(",")).collect(Collectors.toList()); + List plans = slittingproductionplanService.getByContainerNames(collect); + if (plans.size() == 0) { + throw new BadRequestException("子卷号：[" + containerName + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！"); + } + return null; + } }