diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java index acb75becb..4822d00ab 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListNodeVO.java @@ -59,6 +59,9 @@ public class DistributionParcelListNodeVO { //数量 private Integer quantity; + //订单自编码 + private String waybillNumber; + //订单自编码 private String orderCode; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index ba0d3c684..21bf99be3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1104,8 +1104,11 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldpl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, lwugl.create_time AS nodeTime, lwugl.create_user AS nodeControlsUserId, + lwga.qr_code AS allocationName, + '' AS trayName, CASE lwugl.binding_type WHEN 1 THEN '上架操作' ELSE '下架操作' @@ -1129,8 +1132,11 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldpl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, lwtgl.create_time AS nodeTime, lwtgl.create_user AS nodeControlsUserId, + '' AS allocationName, + lwt.pallet_name AS trayName, CASE lwtgl.binding_type WHEN 1 THEN '打托操作' ELSE '解托操作' @@ -1155,6 +1161,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldpl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldrp.create_time AS nodeTime, ldrp.create_user AS nodeControlsUserId, '计划配送' AS nodeName, @@ -1184,6 +1191,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldpl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldrp.create_time AS nodeTime, ldrp.create_user AS nodeControlsUserId, '配送取消' AS nodeName, @@ -1214,6 +1222,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, lddl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldl.scan_time AS nodeTime, ldl.scan_user AS nodeControlsUserName, ldl.create_user AS nodeControlsUserId, @@ -1241,6 +1250,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, lddl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldl.update_time AS nodeTime, ldl.update_user AS nodeControlsUserId, IF(lwrs.id is not null,'滞留扫描','装车取消') AS nodeName, @@ -1261,6 +1271,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, lddl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldl.signing_time AS nodeTime, ldl.signing_user AS nodeControlsUserName, ldl.signing_user_id AS nodeControlsUserId, @@ -1281,6 +1292,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldpl.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, lds.create_user AS nodeControlsUserId, lds.create_time AS nodeTime, '备货扫描' AS nodeName, @@ -1301,6 +1313,7 @@ ldpl.warehouse_id AS warehouseId, ldpl.quantity AS quantity, ldla.train_number AS tranNumber, + ldpl.waybill_number AS waybillNumber, ldla.auditing_user AS nodeControlsUserName, ldla.update_user AS nodeControlsUserId, ldla.auditing_time AS nodeTime, @@ -1310,7 +1323,7 @@ logpm_distribution_loadscan_abnormal AS ldla LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id WHERE - ldla.package_code = #{orderPackageCode} AND ldpl.warehouse_id = #{warehouseId} + ldla.package_code = #{orderPackageCode} AND ldpl.warehouse_id = #{warehouseId} AND ldla.auditing_status = 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index fa8bdc364..0eccbf572 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -958,6 +958,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl