|
|
|
|
@ -12,6 +12,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
|
|
import org.dromara.wms.domain.BaseMaterialCategory;
|
|
|
|
|
import org.dromara.wms.domain.WmsBaseCustomer;
|
|
|
|
|
import org.dromara.wms.domain.WmsBaseWarehouse;
|
|
|
|
|
import org.dromara.wms.domain.WmsOutstockOrder;
|
|
|
|
|
import org.dromara.wms.domain.bo.WmsOutstockOrderBo;
|
|
|
|
|
@ -86,9 +87,13 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
|
|
|
|
|
// 关联表查询物料大类名称
|
|
|
|
|
.select(BaseMaterialCategory::getMaterialCategoryName)
|
|
|
|
|
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId)
|
|
|
|
|
|
|
|
|
|
// 关联表查询仓库名称
|
|
|
|
|
.select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName)
|
|
|
|
|
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId);
|
|
|
|
|
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId)
|
|
|
|
|
//关联查询客户名称
|
|
|
|
|
.select(WmsBaseCustomer::getCustomerName)
|
|
|
|
|
.leftJoin(WmsBaseCustomer.class, WmsBaseCustomer::getCustomerId, WmsOutstockOrder::getCustomerId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
|
|
|
|
|
lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());
|
|
|
|
|
|