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 2c12d50..b431087 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,11 @@ import java.util.List; public interface IMesCimSeresReportService { - ListPager querySrmSunSheetJisLogByPager(Integer status, Pager pager); + ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager); void doSrmSunSheetJisNormal(List ids); - ListPager queryJisQueueLogByPager(Integer checkStatus, Pager pager); + ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, 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 259bcd8..ae06e83 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.report; import cn.estsh.i3plus.ext.mes.pcn.api.report.IMesCimSeresReportService; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.ext.mes.pcn.pojo.model.CimSeresJisQueueNormalModel; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -17,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; @Api("赛力斯报表") @@ -29,9 +29,9 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志") @GetMapping("/query-srm-sun-sheet-jis-log") - public ResultBean querySrmSunSheetJisLogByPager(Integer status, Pager pager){ + public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, pager); + ListPager queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(e); @@ -42,9 +42,10 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS单转正常", notes = "赛力斯JIS单转正常") @PostMapping("/srm-sun-sheet-jis-normal") - public ResultBean doSrmSunSheetJisNormal(@RequestBody List ids) { + public ResultBean doSrmSunSheetJisNormal(@RequestBody Long[] idArray) { try { - mesCimSeresReportService.doSrmSunSheetJisNormal(ids); + List idList = Arrays.asList(idArray); + mesCimSeresReportService.doSrmSunSheetJisNormal(idList); return ResultBean.success("执行成功"); } catch (ImppBusiException e) { return ResultBean.fail(e); @@ -55,9 +56,9 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志") @GetMapping("/query-jis-queue-log") - public ResultBean queryJisQueueLogByPager(Integer checkStatus, Pager pager){ + public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, pager); + ListPager queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(e); @@ -68,9 +69,10 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS队列转正常", notes = "赛力斯JIS队列转正常") @PostMapping("/jis-queue-normal") - public ResultBean doJisQueueNormal(@RequestBody CimSeresJisQueueNormalModel model) { + public ResultBean doJisQueueNormal(@RequestBody Long[] idArray) { try { - mesCimSeresReportService.doJisQueueNormal(model.getIds()); + List idList = Arrays.asList(idArray); + mesCimSeresReportService.doJisQueueNormal(idList); return ResultBean.success("执行成功"); } 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 e3d5ba4..d1381a9 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,9 +29,10 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { private IMesCimSeresJisQueueRepository queueJisRDao; @Override - public ListPager querySrmSunSheetJisLogByPager(Integer status, Pager pager) { + public ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringLikerPack(docNo, "docNo", packBean); DdlPreparedPack.getNumEqualPack(status, "status", packBean); DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); @@ -51,9 +52,11 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { } @Override - public ListPager queryJisQueueLogByPager(Integer checkStatus, Pager pager) { + public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, 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.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/CimSeresJisQueueNormalModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/CimSeresJisQueueNormalModel.java deleted file mode 100644 index 174f5e6..0000000 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/CimSeresJisQueueNormalModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.ext.mes.pcn.pojo.model; - -import lombok.Data; - -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : logic - * @CreateDate : 2025/3/28 23:05 - * @Modify: - **/ -@Data -public class CimSeresJisQueueNormalModel { - - private List ids; - -}