From e73c7a41024241014ac83519ec97cb84703c6372 Mon Sep 17 00:00:00 2001 From: puxiao Date: Mon, 8 Apr 2024 18:11:52 +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 --- .../controller/base/WorkOrderExtController.java | 16 ++++++++++++++++ .../serviceimpl/base/WorkOrderExtService.java | 10 +++++++--- .../i3plus/ext/mes/pojo/model/WorkOrderQueryDto.java | 6 ++++++ .../ext/mes/pojo/model/jx/WorkOrderQueryDtoPager.java | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/WorkOrderQueryDtoPager.java 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 8bcf846..24c647f 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.api.base.IWorkOrderExtService; import cn.estsh.i3plus.ext.mes.pojo.model.*; import cn.estsh.i3plus.ext.mes.pojo.bean.MesWorkOrderExt; +import cn.estsh.i3plus.ext.mes.pojo.model.jx.WorkOrderQueryDtoPager; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.ExcelTool; @@ -132,6 +133,21 @@ public class WorkOrderExtController extends MesBaseController { } } + @PostMapping(value = "/queryMesPpMaster") + @ApiOperation(value = "生产工单分页查询") + public ResultBean geWorkOrderListPage(@RequestBody WorkOrderQueryDtoPager reportPagerModel) { + try { + + return ResultBean.success("生产工单分页查询成功") + .setListPager(workOrderExtService.getListPageByCondition(reportPagerModel.getReportModel(), reportPagerModel.getPager())) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException imppException) { + LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException); + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } @PostMapping("close") 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 e2297e5..57ad59b 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 @@ -1046,11 +1046,15 @@ 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())) + 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())) + } 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); + } 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())) { diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/WorkOrderQueryDto.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/WorkOrderQueryDto.java index 44215d9..e2deb94 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/WorkOrderQueryDto.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/WorkOrderQueryDto.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @author yumingxing @@ -23,6 +25,10 @@ public class WorkOrderQueryDto { @ApiParam("工单状态") private Integer workOrderStatus; + @ApiParam("工单状态集合") + private List workOrderStatusLst; + + @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/WorkOrderQueryDtoPager.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/WorkOrderQueryDtoPager.java new file mode 100644 index 0000000..4169f07 --- /dev/null +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/jx/WorkOrderQueryDtoPager.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.ext.mes.pojo.model.jx; + +import cn.estsh.i3plus.ext.mes.pojo.model.WorkOrderQueryDto; +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +/** + * @Description : WorkOrderQueryDtoPager + * @Reference : + * @Author : puxiao + * @CreateDate : 2024/4/3 13:18 + * @Modify: + **/ +@Data +public class WorkOrderQueryDtoPager { + private WorkOrderQueryDto reportModel; + + private Pager pager; +}