From 1b06a17cc303375de09e901d42573513d9ee1e89 Mon Sep 17 00:00:00 2001 From: siontion Date: Sun, 14 Jul 2024 16:41:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=91=20=E6=B4=BE=E5=B7=A5=E5=8D=95=E5=8F=B7=E6=94=B9?= =?UTF-8?q?=E6=88=90=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java index 90dea287..58cfbd1a 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storage/StorageMapper.java @@ -4,6 +4,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.biz.controller.admin.storage.vo.StoragePageReqVO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO; +import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.storage.StorageDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.storagemat.StorageMatDO; @@ -27,6 +28,7 @@ public interface StorageMapper extends BaseMapperX { .leftJoin(StorageMatDO.class, "a", StorageMatDO::getStockId, StorageDO::getId) .leftJoin(TaskDispatchDO.class, "b", TaskDispatchDO::getCode, StorageDO::getHeaderNo) .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, TaskDispatchDO::getProjectSubId) + .leftJoin(ProjectOrderDO.class, "s", ProjectOrderDO::getId, TaskDispatchDO::getProjectId) .leftJoin(MaterialDO.class, "d", MaterialDO::getId, ProjectOrderSubDO::getMaterialId) .leftJoin(MaterialDO.class, "f", MaterialDO::getId, StorageMatDO::getMatId) .disableSubLogicDel() @@ -40,6 +42,7 @@ public interface StorageMapper extends BaseMapperX { .eq(reqVO.getStockType() != null,StorageDO::getStockType, reqVO.getStockType()) .eq(reqVO.getStockInType() != null,StorageDO::getStockInType, reqVO.getStockInType()) .eq(reqVO.getWhId() != null,StorageDO::getWhId, reqVO.getWhId()) + .eq(!StringUtils.isEmpty(reqVO.getProjectOrderCode()),StorageDO::getProjectOrderCode,reqVO.getProjectOrderCode()) .eq(reqVO.getStatus() != null,StorageDO::getStatus, reqVO.getStatus()).distinct(); return selectPage(reqVO,query);