|
|
|
@ -5,9 +5,17 @@ import java.util.*;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.*;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 入/出库 Mapper
|
|
|
|
@ -18,26 +26,43 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.*;
|
|
|
|
|
public interface StorageMapper extends BaseMapperX<StorageDO> {
|
|
|
|
|
|
|
|
|
|
default PageResult<StorageDO> selectPage(StoragePageReqVO reqVO) {
|
|
|
|
|
return selectPage(reqVO, new LambdaQueryWrapperX<StorageDO>()
|
|
|
|
|
.eqIfPresent(StorageDO::getStockType, reqVO.getStockType())
|
|
|
|
|
.eqIfPresent(StorageDO::getStockInType, reqVO.getStockInType())
|
|
|
|
|
.eqIfPresent(StorageDO::getStockOutType, reqVO.getStockOutType())
|
|
|
|
|
.eqIfPresent(StorageDO::getStockNo, reqVO.getStockNo())
|
|
|
|
|
.eqIfPresent(StorageDO::getHeaderNo, reqVO.getHeaderNo())
|
|
|
|
|
.eqIfPresent(StorageDO::getDescription, reqVO.getDescription())
|
|
|
|
|
.eqIfPresent(StorageDO::getStatus, reqVO.getStatus())
|
|
|
|
|
.eqIfPresent(StorageDO::getWhId, reqVO.getWhId())
|
|
|
|
|
.eqIfPresent(StorageDO::getCreator, reqVO.getCreator())
|
|
|
|
|
.betweenIfPresent(StorageDO::getCreateTime, reqVO.getCreateTime())
|
|
|
|
|
.eqIfPresent(StorageDO::getUpdater, reqVO.getUpdater())
|
|
|
|
|
.betweenIfPresent(StorageDO::getUpdateTime, reqVO.getUpdateTime())
|
|
|
|
|
.eqIfPresent(StorageDO::getKeeper, reqVO.getKeeper())
|
|
|
|
|
.betweenIfPresent(StorageDO::getKeeperTime, reqVO.getKeeperTime())
|
|
|
|
|
.eqIfPresent(StorageDO::getOutbound, reqVO.getOutbound())
|
|
|
|
|
.betweenIfPresent(StorageDO::getOutboundTime, reqVO.getOutboundTime())
|
|
|
|
|
.eqIfPresent(StorageDO::getCancel, reqVO.getCancel())
|
|
|
|
|
.betweenIfPresent(StorageDO::getCancelTime, reqVO.getCancelTime())
|
|
|
|
|
.orderByDesc(StorageDO::getId));
|
|
|
|
|
MPJLambdaWrapper<StorageDO> query = new MPJLambdaWrapper<>();
|
|
|
|
|
query.selectAll(StorageDO.class)
|
|
|
|
|
.select("mat.code as matNo", "mat.name as matName")
|
|
|
|
|
.leftJoin(StorageMatDO.class, "sm", StorageMatDO::getStockId, StorageDO::getId)
|
|
|
|
|
.leftJoin(MaterialDO.class, "mat", MaterialDO::getId, StorageMatDO::getMatId)
|
|
|
|
|
.orderByDesc(StorageDO::getId);
|
|
|
|
|
|
|
|
|
|
query.like(!StringUtils.isEmpty(reqVO.getMatNo()), "mat.code", reqVO.getMatNo())
|
|
|
|
|
.like(!StringUtils.isEmpty(reqVO.getMatName()), "mat.name", reqVO.getMatName())
|
|
|
|
|
.like(!StringUtils.isEmpty(reqVO.getStockNo()),StorageDO::getStockNo, reqVO.getStockNo())
|
|
|
|
|
.like(!StringUtils.isEmpty(reqVO.getHeaderNo()),StorageDO::getHeaderNo, reqVO.getHeaderNo())
|
|
|
|
|
.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(reqVO.getStatus() != null,StorageDO::getStatus, reqVO.getStatus());
|
|
|
|
|
|
|
|
|
|
return selectPage(reqVO,query);
|
|
|
|
|
// return selectPage(reqVO, new LambdaQueryWrapperX<StorageDO>()
|
|
|
|
|
// .eqIfPresent(StorageDO::getStockType, reqVO.getStockType())
|
|
|
|
|
// .eqIfPresent(StorageDO::getStockInType, reqVO.getStockInType())
|
|
|
|
|
// .eqIfPresent(StorageDO::getStockOutType, reqVO.getStockOutType())
|
|
|
|
|
// .eqIfPresent(StorageDO::getStockNo, reqVO.getStockNo())
|
|
|
|
|
// .eqIfPresent(StorageDO::getHeaderNo, reqVO.getHeaderNo())
|
|
|
|
|
// .eqIfPresent(StorageDO::getDescription, reqVO.getDescription())
|
|
|
|
|
// .eqIfPresent(StorageDO::getStatus, reqVO.getStatus())
|
|
|
|
|
// .eqIfPresent(StorageDO::getWhId, reqVO.getWhId())
|
|
|
|
|
// .eqIfPresent(StorageDO::getCreator, reqVO.getCreator())
|
|
|
|
|
// .betweenIfPresent(StorageDO::getCreateTime, reqVO.getCreateTime())
|
|
|
|
|
// .eqIfPresent(StorageDO::getUpdater, reqVO.getUpdater())
|
|
|
|
|
// .betweenIfPresent(StorageDO::getUpdateTime, reqVO.getUpdateTime())
|
|
|
|
|
// .eqIfPresent(StorageDO::getKeeper, reqVO.getKeeper())
|
|
|
|
|
// .betweenIfPresent(StorageDO::getKeeperTime, reqVO.getKeeperTime())
|
|
|
|
|
// .eqIfPresent(StorageDO::getOutbound, reqVO.getOutbound())
|
|
|
|
|
// .betweenIfPresent(StorageDO::getOutboundTime, reqVO.getOutboundTime())
|
|
|
|
|
// .eqIfPresent(StorageDO::getCancel, reqVO.getCancel())
|
|
|
|
|
// .betweenIfPresent(StorageDO::getCancelTime, reqVO.getCancelTime())
|
|
|
|
|
// .orderByDesc(StorageDO::getId));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|