|
|
|
@ -5,9 +5,11 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.query.MPJLambdaWrapperX;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.material.vo.MaterialPageReqVO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.storagelog.vo.StorageNowAllReqVO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.tplusstorageout.vo.TplusStorageOutPageReqVO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.material.MaterialDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.procedure.ProcedureDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.storage.StorageDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.supplier.SupplierDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.tpluslasteststock.TplusLastestStockDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.tplusstorageout.TplusStorageOutDO;
|
|
|
|
@ -94,4 +96,36 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
|
|
|
|
|
|
|
|
|
|
return selectPage(reqVO, query);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default PageResult<MaterialDO> selectStorageCheckMatAllData(StorageNowAllReqVO queryReqVO){
|
|
|
|
|
MPJLambdaWrapper<MaterialDO> query = new MPJLambdaWrapper<>();
|
|
|
|
|
query.selectAll(MaterialDO.class)
|
|
|
|
|
.select("t.code as mat_code,t.name as mat_name")
|
|
|
|
|
.select("t.spec as mat_spec,t.brand as mat_brand")
|
|
|
|
|
.select("ifNull(a.lot_no,'') as lot_no,t.short_name")
|
|
|
|
|
// .select("material_type as mat_type")
|
|
|
|
|
// .select("unit as mat_unit")
|
|
|
|
|
.select("b.label as mat_type")
|
|
|
|
|
.select("c.label as mat_unit")
|
|
|
|
|
.select("ifNull(a.wh_id,'') as wh_id")
|
|
|
|
|
.select("ifNull(a.wh_name,'') as wh_name")
|
|
|
|
|
.select("ifNull(a.rg_id,'') as rg_id")
|
|
|
|
|
.select("ifNull(a.rg_name,'') as rg_name")
|
|
|
|
|
.select("ifNull(a.pn_id,'') as pn_id")
|
|
|
|
|
.select("ifNull(a.pn_name,'') as pn_name")
|
|
|
|
|
.select("ifNull(a.storage_ok_qty,0) as storage_ok_qty")
|
|
|
|
|
.leftJoin("(select * from v_storage_material_now where wh_id="+queryReqVO.getWhId()+") as a on a.id=t.id")
|
|
|
|
|
.leftJoin("system_dict_data as b on b.value=t.material_type and b.dict_type='biz_material_type'")
|
|
|
|
|
.leftJoin("system_dict_data as c on c.value=t.material_type and c.dict_type='biz_material_unit'")
|
|
|
|
|
.orderByDesc(MaterialDO::getCode);
|
|
|
|
|
query.like(!StringUtils.isEmpty(queryReqVO.getMatSpec()),MaterialDO::getSpec,queryReqVO.getMatSpec())
|
|
|
|
|
.eq(queryReqVO.getMatType()!=null,MaterialDO::getMaterialType,queryReqVO.getMatType())
|
|
|
|
|
.apply(!StringUtils.isEmpty(queryReqVO.getMatCode()),"(t.name like {0} or t.name like {0})","%"+queryReqVO.getMatCode()+"%")
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return selectPage(queryReqVO,query);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|