diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 72078d567..a1cc2a66e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -102,7 +102,8 @@ public class DistributionStockupAppController extends BladeController { DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); map.put("consignee",reservationEntity.getConsignee()); - map.put("goodsAreaName",reservationEntity.getGoodsAreaName()); + String stockupArea = distributionStockupService.selectStockupAreaByReservationId(reservationEntity.getId()); + map.put("goodsAreaName",stockupArea); if(orderStatus.equals(1)) { //查询客户订单对应的 List list = distributionStockupService.selectStockupOrderList(stockupDTO); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 2aff5b83e..a1a2f4696 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -104,7 +104,7 @@ ldsl.storage_location warehouseArea, ldsl.tray_name trays, ldsl.sku sku, - ldsl.unit unit, + ldsl.cargo_unit unit, count(s.id) scanNum from logpm_distribution_reservation ldr left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0 @@ -120,7 +120,7 @@ ldsl.storage_location, ldsl.tray_name, ldsl.sku, - ldsl.unit + ldsl.cargo_unit diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 9730c3be9..039b50955 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -28,7 +28,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * 备货信息表 Mapper 接口 @@ -111,4 +110,5 @@ public interface DistributionStockupMapper extends BaseMapper + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index a594e5b28..16bba6866 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -100,4 +100,5 @@ public interface IDistributionStockupService extends BaseService createPackageCode(Long reservationId, Long stockListId, Integer packageNum); + String selectStockupAreaByReservationId(Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index d46b347e1..f4af41fc9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -432,4 +432,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl