Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

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<StorageDO> {
                 .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<StorageDO> {
                 .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);