From 69ccbf067f6580d3404c72e195e128856f989f87 Mon Sep 17 00:00:00 2001 From: puxiao Date: Mon, 8 Apr 2024 20:53:13 +0800 Subject: [PATCH] =?UTF-8?q?Finish=20Task#6320=2023032-=E9=83=A8=E5=93=81?= =?UTF-8?q?=E6=8A=A5=E7=BC=BA=E6=8A=A5=E8=A1=A8=20PCR-20240322?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IWorkOrderExtService.java | 4 +++- .../controller/base/WorkOrderExtController.java | 4 ++-- .../serviceimpl/base/WorkOrderExtService.java | 25 ++++++++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IWorkOrderExtService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IWorkOrderExtService.java index 982ad67..b92948b 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IWorkOrderExtService.java @@ -52,7 +52,9 @@ public interface IWorkOrderExtService { * @param pager 分页参数 * @return 生产工单 分页数据 */ - ListPager getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager); + ListPager getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, + Pager pager, + boolean filterWorkOrderStatusLst); /** diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/WorkOrderExtController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/WorkOrderExtController.java index 24c647f..a6996e6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/WorkOrderExtController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/WorkOrderExtController.java @@ -123,7 +123,7 @@ public class WorkOrderExtController extends MesBaseController { // 生产工单分页列表 return ResultBean.success("生产工单分页查询成功") - .setListPager(workOrderExtService.getListPageByCondition(workOrderQueryDto, pager)) + .setListPager(workOrderExtService.getListPageByCondition(workOrderQueryDto, pager,false)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException imppException) { LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); @@ -139,7 +139,7 @@ public class WorkOrderExtController extends MesBaseController { try { return ResultBean.success("生产工单分页查询成功") - .setListPager(workOrderExtService.getListPageByCondition(reportPagerModel.getReportModel(), reportPagerModel.getPager())) + .setListPager(workOrderExtService.getListPageByCondition(reportPagerModel.getReportModel(), reportPagerModel.getPager(),true)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException imppException) { LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java index 57ad59b..e4180b5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java @@ -1036,7 +1036,8 @@ public class WorkOrderExtService implements IWorkOrderExtService { * @return {@link ListPager} */ @Override - public ListPager getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager) { + public ListPager getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager, + boolean filterWorkOrderStatusLst) { String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); if (!ObjectUtils.isEmpty(workOrderQueryDto)) { @@ -1046,15 +1047,21 @@ public class WorkOrderExtService implements IWorkOrderExtService { DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getPartNo(), MesExtConstWords.PART_NO, ddlPackBean); DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getCreateUser(), MesExtConstWords.CREATE_USER, ddlPackBean); DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getErpWarehouse(), MesExtConstWords.ERP_WARE_HOUSE, ddlPackBean); - if (!StringUtils.isEmpty(workOrderQueryDto.getWorkOrderStatus())) { - DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean); - } else if (StringUtils.isEmpty(workOrderQueryDto.getIsHasDel()) || !workOrderQueryDto.getIsHasDel().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) { - DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.WORK_ORDER_STATUS.REMOVE.getValue(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean); - } - if(!CollectionUtils.isEmpty(workOrderQueryDto.getWorkOrderStatusLst())) { - DdlPreparedPack.getInPackList(workOrderQueryDto.getWorkOrderStatusLst(), - MesExtConstWords.WORK_ORDER_STATUS,ddlPackBean); + + if(filterWorkOrderStatusLst) { + if(!CollectionUtils.isEmpty(workOrderQueryDto.getWorkOrderStatusLst())) { + DdlPreparedPack.getInPackList(workOrderQueryDto.getWorkOrderStatusLst(), + MesExtConstWords.WORK_ORDER_STATUS,ddlPackBean); + } + } else { + if (!StringUtils.isEmpty(workOrderQueryDto.getWorkOrderStatus())) { + DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean); + } else if (StringUtils.isEmpty(workOrderQueryDto.getIsHasDel()) || + !workOrderQueryDto.getIsHasDel().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) { + DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.WORK_ORDER_STATUS.REMOVE.getValue(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean); + } } + DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderType(), MesExtConstWords.WORK_ORDER_TYPE, ddlPackBean); DdlPreparedPack.getIsNotNull(MesExtConstWords.WORK_CENTER_CODE, ddlPackBean); if (!StringUtils.isEmpty(workOrderQueryDto.getStartTimeStart()) || !StringUtils.isEmpty(workOrderQueryDto.getStartTimeEnd())) {