From 0ab59667fceddd851c877b6939eda1a70b9e3c01 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 15 Mar 2025 07:02:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=8C=81=E5=88=86=E5=88=87?= =?UTF-8?q?=E4=B8=8A=E6=96=99=E6=9E=B6=E7=A9=BA=E8=BD=B4=E6=9C=89=E6=97=A0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/controller/SlitterPdaController.java | 12 +++++ .../tasks/slitter/service/SlitterService.java | 14 ++++++ .../service/impl/SlitterServiceImpl.java | 44 ++++++++++++++++++- 3 files changed, 69 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 64de351b0..2a6971855 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 @@ -213,4 +213,16 @@ public class SlitterPdaController { public ResponseEntity showManualView(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterDevices.showManualView(param), HttpStatus.OK); } + @PostMapping("/rollCacheManage") + @Log("母卷暂存架子管理") + @SaIgnore + public ResponseEntity rollCacheManage(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.rollCacheManage(param), HttpStatus.OK); + } + @PostMapping("/rollCacheManageTip") + @Log("母卷暂存架子管理提示") + @SaIgnore + public ResponseEntity rollCacheManageTip(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.rollCacheManageTip(param), HttpStatus.OK); + } } 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 1c2923c5c..52abf16c0 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 @@ -320,4 +320,18 @@ public interface SlitterService { * @return */ JSONObject downRolls2(JSONObject param); + + /** + * 母卷暂存架管理 + * @param param + * @return + */ + JSONObject rollCacheManage(JSONObject param); + + /** + * 母卷暂存管理提示 + * @param param + * @return + */ + JSONObject rollCacheManageTip(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 08b901064..232ba38d0 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 @@ -30,6 +30,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; +import org.nl.b_lms.sch.point.dao.StIvtCoolregionio; import org.nl.b_lms.sch.point.dao.StIvtCutpointivt; import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; @@ -61,7 +62,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -2121,4 +2121,46 @@ public class SlitterServiceImpl implements SlitterService { } return mesSlittingMachineSendMaterial(param); } + + @Override + public JSONObject rollCacheManage(JSONObject param) { + // param: point_code、flag（1：无空轴，2：有空轴） + String pointCode = param.getString("point_code"); + String flag = param.getString("flag"); + WQLObject coolTab = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject cool_jo = coolTab + .query("full_point_code = '" + pointCode + "' or empty_point_code = '" + pointCode + "'") + .uniqueResult(0); + if (ObjectUtil.isEmpty(cool_jo)) { + throw new BadRequestException("该暂存架不存在!"); + } + cool_jo.put("empty_point_status", "1".equals(flag) ? "01" : "02"); + cool_jo.put("update_optid", SecurityUtils.getCurrentUserId()); + cool_jo.put("update_optname", SecurityUtils.getCurrentNickName()); + cool_jo.put("update_time", DateUtil.now()); + coolTab.update(cool_jo); + JSONObject res = new JSONObject(); + res.put("status", HttpStatus.HTTP_OK); + res.put("message", "点位更新成功!"); + return res; + } + + @Override + public JSONObject rollCacheManageTip(JSONObject param) { + // param: point_code + String pointCode = param.getString("point_code"); + JSONObject res = new JSONObject(); + JSONObject data = new JSONObject(); + WQLObject coolTab = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject cool_jo = coolTab + .query("full_point_code = '" + pointCode + "' or empty_point_code = '" + pointCode + "'") + .uniqueResult(0); + if (ObjectUtil.isEmpty(cool_jo)) { + throw new BadRequestException("该暂存架不存在!"); + } + data.put("msg", "该位置 " + ("01".equals(cool_jo.getString("empty_point_status")) ? "没有空轴" : "有空轴")); + res.put("status", HttpStatus.HTTP_OK); + res.put("data", data); + return res; + } }