From e23b64122aff98cad30cf52551f20821b4fdccb7 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 20 Jul 2024 16:48:55 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E6=89=8B=E6=8C=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E4=BD=8D=E7=BD=AE=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/controller/SlitterPdaController.java | 6 +++ .../IPdmBiSlittingproductionplanService.java | 7 +++ ...dmBiSlittingproductionplanServiceImpl.java | 8 +++- .../tasks/slitter/service/SlitterService.java | 7 +++ .../service/impl/SlitterServiceImpl.java | 48 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) 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 e35481c4c..a1c0c2081 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 @@ -133,4 +133,10 @@ public class SlitterPdaController { public ResponseEntity querySlitterDeviceSubVolumeInfos(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterDevices.querySlitterDeviceSubVolumeInfos(param), HttpStatus.OK); } + @PostMapping("/queryCacheDownSubVolumeInfos") + @Log("手持查询暂存位置的子卷数据") + @SaIgnore + public ResponseEntity queryCacheDownSubVolumeInfos(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.queryCacheDownSubVolumeInfos(param), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 025256256..2999f2835 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -106,4 +106,11 @@ public interface IPdmBiSlittingproductionplanService extends IService getByQzzNoByStatus(String qzzno, String status); + + /** + * 通过气胀轴编码获取分切数据 + * @param qzzno / + * @return / + */ + List getByQzzNoByNoStatus(String qzzno); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index c7cd5f1a2..bcc6bba3e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -163,5 +163,11 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl getByQzzNoByNoStatus(String qzzNo) { + LambdaQueryWrapper lam = new QueryWrapper().lambda(); + lam.eq(PdmBiSlittingproductionplan::getQzzno, qzzNo) + .eq(PdmBiSlittingproductionplan::getIs_delete, "0"); + return pdmBiSlittingproductionplanMapper.selectList(lam); + } } 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 9eafbb90f..c7503cfeb 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 @@ -221,4 +221,11 @@ public interface SlitterService { * @return / */ JSONObject querySlitterDeviceSubVolumeInfos(JSONObject param); + + /** + * 手持查询暂存位置的子卷数据 + * @param param / + * @return / + */ + JSONObject queryCacheDownSubVolumeInfos(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 242a9f3c9..db7e462bf 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 @@ -1406,4 +1406,52 @@ public class SlitterServiceImpl implements SlitterService { data.put("msg", msg); return res; } + + @Override + public JSONObject queryCacheDownSubVolumeInfos(JSONObject param) { + // param: point_code + log.info("手持查询暂存位置的数据：{}", param); + JSONObject res = new JSONObject(); + JSONObject data = new JSONObject(); + res.put("status", HttpStatus.HTTP_OK); + res.put("data", data); + String pointCode = param.getString("point_code"); + BstIvtCutpointivt point = bcutpointivtService.getPintByAgvCode(pointCode, false); + if (ObjectUtil.isEmpty(point)) { + throw new BadRequestException("只能选择B1,B2,B3,B4区域的暂存位"); + } + if (ObjectUtil.isEmpty(point.getQzz_no1())) { + data.put("a_point", "暂无子卷信息"); + } else { + List byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(point.getQzz_no1()); + if (byQzzNo.size() == 0) { + data.put("a_point", "对应的分切计划不存在!"); + } else { + String collect = byQzzNo + .stream() + .map(PdmBiSlittingproductionplan::getContainer_name) + .collect(Collectors.joining(",")); + data.put("a_point", collect); + } + } + if (ObjectUtil.isEmpty(point.getQzz_no2())) { + data.put("b_point", "暂无子卷信息"); + } else { + List byQzzNo = slittingproductionplanService.getByQzzNoByNoStatus(point.getQzz_no2()); + if (byQzzNo.size() == 0) { + data.put("b_point", "对应的分切计划不存在!"); + } else { + String collect = byQzzNo + .stream() + .map(PdmBiSlittingproductionplan::getContainer_name) + .collect(Collectors.joining(",")); + data.put("b_point", collect); + } + } + data.put("status", "1".equals(point.getPoint_status()) + ? "空位" : "2".equals(point.getPoint_status()) + ? "有气胀轴" : "3".equals(point.getPoint_status()) + ? "有子卷" : "-"); + return res; + } }