From 4af1337a7f890742660e13b4c2d47c7917bb24d1 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 5 Mar 2025 19:23:18 +0800 Subject: [PATCH] =?UTF-8?q?45455=20=E8=A3=81=E7=89=87=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8E=A7=E5=88=B6=EF=BC=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=95=B0=E9=87=8F=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesWorkOrderService.java | 2 ++ .../controller/base/MesWorkOrderController.java | 25 ++++++++++++++++++++++ .../serviceimpl/base/MesWorkOrderService.java | 10 ++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java index 8751358..6f0fd9f 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardReqModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardResModel; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -80,4 +81,5 @@ public interface IMesWorkOrderService extends IBaseMesService { @ApiOperation(value = "根据工单状态改变--关闭拉动但") void doCloseKittingOrder(MesWorkOrder mesWorkOrder,String userName); + void setBean(MesWorkOrder bean, DdlPackBean packBean); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java index 6c68dea..6485d44 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.MesExcelTool; import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -248,5 +249,29 @@ public class MesWorkOrderController extends BaseMesController { } } + /** + * 查询信息 分页 + 组合 + * + * @param bean + * @param pager + * @return + */ + @GetMapping(value = "/order/query") + @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能") + public ResultBean queryByPager(MesWorkOrder bean, Pager pager) { + try { + bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + //bean.setOrganizeCode("ck01"); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + mesWorkOrderService.setBean(bean, packBean); + ListPager listPager = getBaseService().queryPagerWhere(pager, packBean); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setListPager(listPager); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 5ba6f4c..8640ae7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -342,12 +342,20 @@ public class MesWorkOrderService extends BaseMesService implements } } } + public void setBean(MesWorkOrder bean, DdlPackBean packBean) { + setPackQueryBean(bean, packBean); + } + @Override protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean); DdlPreparedPack.getStringLikerPack(bean.getPartName(), MesExtConstWords.PART_NAME, packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), MesExtConstWords.CREATE_USER, packBean); - DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean); + String partNo = bean.getPartNo(); + if (!StringUtil.isEmpty(partNo)) { + List partNoList = Arrays.asList(partNo.split(",")); + DdlPreparedPack.getInPackList(partNoList, MesExtConstWords.PART_NO, packBean); + } DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), MesExtConstWords.CUST_PART_NO, packBean); DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean); DdlPreparedPack.getStringLikerPack(bean.getVinCode(), MesExtConstWords.VIN_CODE, packBean);