From de9e24bf05b6ac034837231e85abf7a5af122386 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 18 Jul 2024 18:48:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=AD=90=E5=8D=B7=E5=A5=97=E8=BD=B4=E5=8F=AF=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E6=8B=A9=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=B0=94?= =?UTF-8?q?=E8=83=80=E8=BD=B4=E5=BA=93=E5=87=BA=E8=BD=B4API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SlitterServiceImpl.java | 26 ++++++++++++------- .../wms/ext/acs/rest/AcsToWmsController.java | 7 +++++ .../wms/ext/acs/service/AcsToWmsService.java | 7 +++++ .../acs/service/impl/AcsToWmsServiceImpl.java | 5 ++++ 4 files changed, 35 insertions(+), 10 deletions(-) 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 756e7befa..12f360eb4 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 @@ -870,26 +870,32 @@ public class SlitterServiceImpl implements SlitterService { public JSONObject doInitShaftPoint(JSONObject param) { log.info("手持穿拔轴初始化参数：{}", param); String pointCode = param.getString("point_code"); + String isAgainTz = param.getString("is_again_tz"); + if (ObjectUtil.isEmpty(isAgainTz)) { + isAgainTz = SlitterConstant.SLITTER_YES; + } // 手持按钮：穿拔轴初始化 //1、判断当前点位不能存在其他任务 List taskList = taskService.checkHaveTask(pointCode); if (taskList.size() > 0) { throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的任务!"); } - //2、把当前点位上子卷号对应的is_paper_ok改为1 BstIvtShafttubeivt shaftPoint = shafttubeivtService.getByPointCode(pointCode, false); if (SlitterConstant.SLITTER_NO.equals(shaftPoint.getHave_qzz())) { throw new BadRequestException("点位不存在气胀轴信息，无需初始化!"); } - List containers = Stream.of(shaftPoint.getContainer_name1(), shaftPoint.getContainer_name2()) - .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); - LambdaUpdateWrapper upPlanLam = new LambdaUpdateWrapper<>(); - upPlanLam.set(PdmBiSlittingproductionplan::getIs_paper_ok, "1") - .set(PdmBiSlittingproductionplan::getUpdate_optid, SecurityUtils.getCurrentUserId()) - .set(PdmBiSlittingproductionplan::getUpdate_optname, SecurityUtils.getCurrentUsername()) - .set(PdmBiSlittingproductionplan::getUpdate_time, DateUtil.now()) - .in(PdmBiSlittingproductionplan::getContainer_name, containers); - slittingproductionplanService.update(upPlanLam); + if (SlitterConstant.SLITTER_YES.equals(isAgainTz)) { + //2、把当前点位上子卷号对应的is_paper_ok改为1 + List containers = Stream.of(shaftPoint.getContainer_name1(), shaftPoint.getContainer_name2()) + .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); + LambdaUpdateWrapper upPlanLam = new LambdaUpdateWrapper<>(); + upPlanLam.set(PdmBiSlittingproductionplan::getIs_paper_ok, "1") + .set(PdmBiSlittingproductionplan::getUpdate_optid, SecurityUtils.getCurrentUserId()) + .set(PdmBiSlittingproductionplan::getUpdate_optname, SecurityUtils.getCurrentUsername()) + .set(PdmBiSlittingproductionplan::getUpdate_time, DateUtil.now()) + .in(PdmBiSlittingproductionplan::getContainer_name, containers); + slittingproductionplanService.update(upPlanLam); + } //3、清空当前穿拔轴点位的库存信息 shaftPoint.setHave_qzz(SlitterConstant.SLITTER_NO); shaftPoint.setTube_code1(""); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 143aa0817..93af39b5c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -217,4 +217,11 @@ public class AcsToWmsController { public ResponseEntity getBoxInfo(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.getBoxInfo(param), HttpStatus.OK); } + + @PostMapping("/acsCallShaftFromCache") + @Log(value = "二期ACS请求出轴", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity acsCallShaftFromCache(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.acsCallShaftFromCache(param), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index b354234b2..5ac42e520 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -209,4 +209,11 @@ public interface AcsToWmsService { * @return / */ JSONObject actionFinishRequest2(JSONObject param); + + /** + * 二期ACS请求出轴 + * @param param / + * @return / + */ + JSONObject acsCallShaftFromCache(JSONObject param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 9eaa9a593..5dd834067 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -2530,4 +2530,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public JSONObject actionFinishRequest2(JSONObject param) { return slitterService.acsActionFinishRequestToRelease(param); } + + @Override + public JSONObject acsCallShaftFromCache(JSONObject param) { + return slitterService.acsCallShaftFromCache(param); + } }