diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java index 9e25450bf..46391d5f7 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java @@ -104,6 +104,11 @@ public class WarehouseParcelListVO extends WarehouseParcelListEntity { */ private String positionCode; + /** + * 所在库位 + */ + private String mallName; + /** * 是否窜货 0否 1是 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 5a262afae..ab5139983 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -117,10 +117,12 @@ lwga.layer_num layerNum, lwtg.create_time operateTime, lwtg.create_user operateUser, - lwtg.is_fleeing isFleeing + lwtg.is_fleeing isFleeing, + ldsa.mall_name FROM logpm_warehouse_tray_goods lwtg JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id + JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id = ldsa.id left join ( logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id = lwga.id ) on lwug.association_id = ldpl.id ldpl.is_deleted = 0 and lwtg.is_deleted = 0 and lwtg.association_type = 3 and lwtg.tray_id = #{param.id} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 486601212..9c4fe7ed9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -1320,6 +1320,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl