From 7855af58a4e9f0451640f58191f8c51e41f3e420 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Thu, 10 Apr 2025 16:36:19 +0800 Subject: [PATCH] =?UTF-8?q?46141=20PCN=EF=BC=9A=E8=B5=9B=E5=8A=9B=E6=96=AF?= =?UTF-8?q?JIS=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=A5=E5=BF=97=E5=92=8C?= =?UTF-8?q?=E8=B5=9B=E5=8A=9B=E6=96=AFJIS=E9=98=9F=E5=88=97=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/report/IMesCimSeresReportService.java | 6 ++++-- .../controller/report/MesCimSeresReportController.java | 13 +++++++++---- .../serviceimpl/report/MesCimSeresReportServiceImpl.java | 11 +++++++++-- 3 files changed, 22 insertions(+), 8 deletions(-) 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 b431087..a6193bc 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 @@ -9,11 +9,13 @@ import java.util.List; public interface IMesCimSeresReportService { - ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager); + ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, + String partClassCode, String partClassName, Pager pager); void doSrmSunSheetJisNormal(List ids); - ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager); + ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager); void doJisQueueNormal(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 ae06e83..377e176 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 @@ -29,9 +29,11 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志") @GetMapping("/query-srm-sun-sheet-jis-log") - public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager){ + public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, String partClassCode, + String partClassName, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, pager); + ListPager queryResultListPager = + mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, partClassCode, partClassName, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(e); @@ -56,9 +58,12 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志") @GetMapping("/query-jis-queue-log") - public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager){ + public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, pager); + ListPager queryResultListPager = + mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, partClassCode, + partClassName, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(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 d1381a9..91aee5d 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 @@ -29,11 +29,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { private IMesCimSeresJisQueueRepository queueJisRDao; @Override - public ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager) { + public ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, + String partClassCode, String partClassName, + Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringLikerPack(docNo, "docNo", packBean); DdlPreparedPack.getNumEqualPack(status, "status", packBean); + DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean); + DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean); DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); pager = PagerHelper.getPager(pager, runSheetJisRDao.findByHqlWhereCount(packBean)); @@ -52,12 +56,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { } @Override - public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager) { + public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringLikerPack(vin, "vin", packBean); DdlPreparedPack.getStringLikerPack(materielCode, "materielCode", packBean); DdlPreparedPack.getNumEqualPack(checkStatus, "checkStatus", packBean); + DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean); + DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean); DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); pager = PagerHelper.getPager(pager, queueJisRDao.findByHqlWhereCount(packBean));