diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index a0517a9de..f4060953d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -31,5 +31,6 @@ public class DistributionStockupStockListVO implements Serializable { private Boolean trayLean;//整托状态 private Integer unpack;//是否拆包 0 没有 1 拆了 + private String sourceType;//是否拆包 1 订单 2导入 } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index eff73905c..a8cb46aa4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -240,6 +240,7 @@ ldst.cargo_unit cargoUnit, ldst.tray_name trayName, ldst.unpack unpack, + ldst.source_type sourceType, count(ldss.id) realNum, CASE WHEN ldst.source_type = '2' THEN @@ -265,7 +266,7 @@ where ldrs.reservation_id = #{reservationId} and ldrs.is_deleted = 0 group by ldst.id, ldst.storage_location, ldst.description_goods, ldst.sku,ldrs.id, - ldst.cargo_norms, ldrs.reservation_num, ldst.cargo_unit, ldst.tray_name, ldst.unpack + ldst.cargo_norms, ldrs.reservation_num, ldst.cargo_unit, ldst.tray_name, ldst.source_type