|
|
@ -8,6 +8,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.enums.YesOrNoEnum;
|
|
|
|
import com.chanko.yunxi.mes.module.heli.enums.YesOrNoEnum;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
@ -37,6 +38,10 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
|
|
|
|
.eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
|
|
|
|
.eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
|
|
|
|
.eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart());
|
|
|
|
.eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(reqVO.getCodeAndName())){
|
|
|
|
|
|
|
|
query.like(MaterialDO::getName, reqVO.getName()).or().like(MaterialDO::getCode, reqVO.getCode());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return selectPage(reqVO, query);
|
|
|
|
return selectPage(reqVO, query);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|