From 7cc05f616ff1532cbb8feb0f3d86038414475265 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Thu, 29 May 2025 15:01:49 +0800 Subject: [PATCH] =?UTF-8?q?47241=20PCN=EF=BC=9A=E8=B5=9B=E5=8A=9B=E6=96=AF?= =?UTF-8?q?jis=E9=98=9F=E5=88=97=E6=8E=A5=E6=94=B6=E5=92=8C=E8=B5=9B?= =?UTF-8?q?=E5=8A=9B=E6=96=AFJIS=E5=8D=95=E6=8E=A5=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=8C=89=E9=92=AE=E9=9C=80=E8=A6=81=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/api/report/IMesCimSeresReportService.java | 4 ++++ .../report/MesCimSeresReportController.java | 28 ++++++++++++++++++++++ .../report/MesCimSeresReportServiceImpl.java | 28 ++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java index a6193bc..1c90f39 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java @@ -14,9 +14,13 @@ public interface IMesCimSeresReportService { void doSrmSunSheetJisNormal(List ids); + void doSrmSunSheetJisCancel(List ids); + ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, String partClassCode, String partClassName, Pager pager); void doJisQueueNormal(List ids); + void doJisQueueCancel(List ids); + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java index 377e176..62f1390 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java @@ -56,6 +56,20 @@ public class MesCimSeresReportController { } } + @ApiOperation(value = "赛力斯JIS单-取消", notes = "赛力斯JIS单-取消") + @PostMapping("/srm-sun-sheet-jis-cancel") + public ResultBean doSrmSunSheetJisCancel(@RequestBody Long[] idArray) { + try { + List idList = Arrays.asList(idArray); + mesCimSeresReportService.doSrmSunSheetJisCancel(idList); + return ResultBean.success("执行成功"); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志") @GetMapping("/query-jis-queue-log") public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, @@ -86,4 +100,18 @@ public class MesCimSeresReportController { } } + @ApiOperation(value = "赛力斯JIS队列-取消", notes = "赛力斯JIS队列-取消") + @PostMapping("/jis-queue-cancel") + public ResultBean doJisQueueCancel(@RequestBody Long[] idArray) { + try { + List idList = Arrays.asList(idArray); + mesCimSeresReportService.doJisQueueCancel(idList); + return ResultBean.success("执行成功"); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java index 91aee5d..b71dd0b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java @@ -56,6 +56,20 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { } @Override + public void doSrmSunSheetJisCancel(List ids) { + final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); + final String username = AuthUtil.getSessionUser().getUserName(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(ids, "id", packBean); + + runSheetJisRDao.updateByProperties( + new String[]{"isValid", "isDeleted", "modifyUser", "modifyDatetime"}, + new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + username, TimeTool.getNowTime(true)}, + packBean); + } + + @Override public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, String partClassCode, String partClassName, Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); @@ -82,4 +96,18 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { queueJisRDao.updateByProperties(new String[]{"checkStatus","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean); } + @Override + public void doJisQueueCancel(List ids) { + final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); + final String username = AuthUtil.getSessionUser().getUserName(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(ids, "id", packBean); + + queueJisRDao.updateByProperties( + new String[]{"isValid", "isDeleted", "modifyUser", "modifyDatetime"}, + new Object[]{CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + username, TimeTool.getNowTime(true)}, + packBean); + } + }