From c75148580af0e52e3996d0a93286bd06bc45c8c9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 12 Jul 2024 23:46:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A5=97=E8=BD=B4=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=89=8B=E6=8C=81=E6=B0=94=E8=83=80?= =?UTF-8?q?=E8=BD=B4=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/BstIvtCutpointivtMapper.xml | 1 + .../pda/controller/SlitterPdaController.java | 8 ++++ .../PdmBiSlittingproductionplanMapper.xml | 3 +- .../tasks/slitter/service/SlitterService.java | 7 ++++ .../service/impl/SlitterServiceImpl.java | 41 +++++++++++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index 0cb047ee6..834a66c9d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -32,6 +32,7 @@ LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 OR pp.qzzno = bc.qzz_no2 WHERE bc.point_type = #{type} + AND IFNULL(pp.qzzno,'') ]]> '' AND pp.qzz_size = #{size} AND pp.qzz_generation = #{generation} 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 c46d61be7..99f2ea9f5 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 @@ -100,4 +100,12 @@ public class SlitterPdaController { public ResponseEntity shaftMaintenanceInventory(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterDevices.shaftMaintenanceInventory(param), HttpStatus.OK); } + + + @PostMapping("/toShaftBinding") + @Log("气胀轴绑定") + @SaIgnore + public ResponseEntity toShaftBinding(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.toShaftBinding(param), HttpStatus.OK); + } } 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 a64c2ba45..0fc5643aa 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 @@ -6,7 +6,7 @@ resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto"> SELECT p.resource_name, - IF(LENGTH(p.parent_container_name) > 0, p.parent_container_name, p.container_name) AS parent_container_name, + p.parent_container_name, p.split_group, p.up_or_down, p.qzz_size, @@ -70,7 +70,6 @@ GROUP BY p.resource_name, p.parent_container_name, - p.container_name, p.split_group, p.up_or_down, p.qzz_size, 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 f97fdee52..489ab4a85 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 @@ -186,4 +186,11 @@ public interface SlitterService { * @return / */ JSONObject shaftMaintenanceInventory(JSONObject param); + + /** + * 气胀轴绑定 + * @param param / + * @return / + */ + JSONObject toShaftBinding(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 fdc6f501f..6ef119a9d 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 @@ -1171,4 +1171,45 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "气胀轴库设置成功!"); return res; } + + @Override + public JSONObject toShaftBinding(JSONObject param) { + // param : container_name, point_code + 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 + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！"); + } + BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false); + PdmBiSlittingproductionplan demoPlan = plans.get(0); + String resourceName = demoPlan.getResource_name(); + // 创建新的气胀轴编码 + String qzzNo = resourceName.substring(0, 2) + + resourceName.substring(resourceName.length() - 2) + + demoPlan.getSplit_group() + + TaskUtils.getDateTime("MMddHHmmss") + "-" + + demoPlan.getUp_or_down(); + plans.forEach(p -> { + p.setQzzno(qzzNo); + p.setStatus("03"); + TaskUtils.updateOptMessageBySlitterPlan(p); + }); + if (pointCode1.endsWith("A")) { + pointCode.setQzz_no1(qzzNo); + } else { + pointCode.setQzz_no2(qzzNo); + } + pointCode.setPoint_status("3"); + slittingproductionplanService.updateBatchById(plans); + bcutpointivtService.updateById(pointCode); + JSONObject res = new JSONObject(); + res.put("status", HttpStatus.HTTP_OK); + res.put("message", "气胀轴绑定成功!"); + return res; + } }