|
@@ -3,7 +3,6 @@ package com.sd.business.service.inventory.impl;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ruoyi.common.constant.StatusConstant;
|
|
|
-import com.ruoyi.common.core.domain.BaseIdPo;
|
|
|
import com.sd.business.entity.department.constant.DepartmentConstant;
|
|
|
import com.sd.business.entity.department.po.Department;
|
|
|
import com.sd.business.entity.inventory.dto.InventoryFinishedOrderDto;
|
|
@@ -56,9 +55,9 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
.selectAs(Department::getName, InventoryFinishedOrderVo::getDepartmentName)
|
|
|
|
|
|
.from(InventoryFinishedOrderDetail.class)
|
|
|
- .leftJoin(SkuSpec.class, SkuSpec::getId, InventoryFinishedOrderDetail::getSkuSpecId)
|
|
|
- .leftJoin(OrderInfo.class, BaseIdPo::getId, InventoryFinishedOrderDetail::getOrderInfoId)
|
|
|
- .leftJoin(Department.class, Department::getId, OrderInfo::getDepartmentId)
|
|
|
+ .leftJoin(SkuSpec.class, InventoryFinishedOrderDetail::getSkuSpecId)
|
|
|
+ .leftJoin(OrderInfo.class, InventoryFinishedOrderDetail::getOrderInfoId)
|
|
|
+ .leftJoin(Department.class, OrderInfo::getDepartmentId)
|
|
|
|
|
|
.orderByDesc(InventoryFinishedOrderDetail::getId)
|
|
|
.like(InventoryFinishedOrderDetail::getCode, dto.getCode())
|
|
@@ -69,7 +68,7 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
.like(OrderInfo::getCode, dto.getOrderCode())
|
|
|
.like(OrderInfo::getWlnCode, dto.getOrderWlnCode())
|
|
|
|
|
|
- .eq("d", Department::getId, dto.getDepartmentId())
|
|
|
+ .eq(Department::getId, dto.getDepartmentId())
|
|
|
.page(dto);
|
|
|
|
|
|
return page;
|