feat(wms): 完善物料卷VO结构并优化运单查询排序
- 在WmsMaterialCoilVo中新增actualWarehouse字段存储仓库信息 - 为WmsMaterialCoilVo补充WmsActualWarehouse导入声明 - 在物料卷服务实现中设置仓库名称和实际仓库信息 - 为运单查询条件添加按创建时间降序排列功能
This commit is contained in:
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
|||||||
import com.klp.common.annotation.ExcelDictFormat;
|
import com.klp.common.annotation.ExcelDictFormat;
|
||||||
import com.klp.common.convert.ExcelDictConvert;
|
import com.klp.common.convert.ExcelDictConvert;
|
||||||
import com.klp.common.core.domain.BaseEntity;
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
|
import com.klp.domain.WmsActualWarehouse;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -136,6 +137,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private WmsWarehouseVo nextWarehouse;
|
private WmsWarehouseVo nextWarehouse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 仓库信息
|
||||||
|
*/
|
||||||
|
private WmsActualWarehouseVo actualWarehouse;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 二维码信息
|
* 二维码信息
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
|
|||||||
qw.eq(bo.getStatus() != null, "wd.status", bo.getStatus());
|
qw.eq(bo.getStatus() != null, "wd.status", bo.getStatus());
|
||||||
// 逻辑删除
|
// 逻辑删除
|
||||||
qw.eq("wd.del_flag", 0);
|
qw.eq("wd.del_flag", 0);
|
||||||
|
qw.orderByDesc("wd.create_time");
|
||||||
return qw;
|
return qw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -246,6 +246,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
if (vo.getWarehouseId() != null) {
|
if (vo.getWarehouseId() != null) {
|
||||||
WmsWarehouseVo warehouse = warehouseService.queryById(vo.getWarehouseId());
|
WmsWarehouseVo warehouse = warehouseService.queryById(vo.getWarehouseId());
|
||||||
vo.setWarehouse(warehouse);
|
vo.setWarehouse(warehouse);
|
||||||
|
vo.setWarehouseName(warehouse.getWarehouseName());
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询下一库区信息
|
// 查询下一库区信息
|
||||||
@@ -259,6 +260,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
WmsActualWarehouseVo actualWarehouse = actualWarehouseService.queryById(vo.getActualWarehouseId());
|
WmsActualWarehouseVo actualWarehouse = actualWarehouseService.queryById(vo.getActualWarehouseId());
|
||||||
if (actualWarehouse != null) {
|
if (actualWarehouse != null) {
|
||||||
vo.setActualWarehouseName(actualWarehouse.getActualWarehouseName());
|
vo.setActualWarehouseName(actualWarehouse.getActualWarehouseName());
|
||||||
|
vo.setActualWarehouse(actualWarehouse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user