diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index 683d1dd5..5163b2c6 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import com.klp.common.core.domain.BaseEntity; +import com.klp.domain.WmsActualWarehouse; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @@ -136,6 +137,11 @@ public class WmsMaterialCoilVo extends BaseEntity { */ private WmsWarehouseVo nextWarehouse; + /** + * 仓库信息 + */ + private WmsActualWarehouseVo actualWarehouse; + /** * 二维码信息 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java index 1dffc81d..1bf5904e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java @@ -82,6 +82,7 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService qw.eq(bo.getStatus() != null, "wd.status", bo.getStatus()); // 逻辑删除 qw.eq("wd.del_flag", 0); + qw.orderByDesc("wd.create_time"); return qw; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 6575ea58..2823937c 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -246,6 +246,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (vo.getWarehouseId() != null) { WmsWarehouseVo warehouse = warehouseService.queryById(vo.getWarehouseId()); vo.setWarehouse(warehouse); + vo.setWarehouseName(warehouse.getWarehouseName()); } // 查询下一库区信息 @@ -259,6 +260,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { WmsActualWarehouseVo actualWarehouse = actualWarehouseService.queryById(vo.getActualWarehouseId()); if (actualWarehouse != null) { vo.setActualWarehouseName(actualWarehouse.getActualWarehouseName()); + vo.setActualWarehouse(actualWarehouse); } }