Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -2027,6 +2027,8 @@
 			ldpl.quantity AS retentionQuantity,
 			1 AS conditions,
             ldpl.waybill_number AS waybillNumber,
+            ldpl.material_name AS materialName,
+            ldpl.material_code AS materialNumber,
             ldpl.waybill_id AS waybillId,
             ldpl.order_package_status AS orderPackageStatus,
             ldpl.warehouse_id AS warehouseId,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -351,7 +351,10 @@
         (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stock_list_status != 2 AND FIND_IN_SET(aldrs.stocklist_id,t.aaa)) AS realNum,
         (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2  AND FIND_IN_SET(newldrs.stocklist_id,t.aaa))
         AS planNum,
-        concat(ifnull(t1.allocation_ids,''),if(t1.allocation_ids is not null,',',''), ifnull(t2.allocation_ids,'')) allocations
+        CASE ldslNew.source_type
+        WHEN 1 THEN t1.allocation_ids
+        ELSE  t2.allocation_ids
+        END allocations
         FROM
         (
         SELECT

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -6009,6 +6009,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							retentionScanVo.setConditions(1);
 							retentionScanVo.setScanType(1);
 							retentionScanVo.setRetentionQuantity(1);
+							retentionScanVo.setRetentionQuantity(1);
 							retentionScanVo.setOrderPackageId(distributionLoadscanEntity.getPackageId());
 							//查询包件
 							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanEntity.getPackageId());
@@ -6016,6 +6017,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							retentionScanVo.setOrderPackageStatus(parcelListEntity.getOrderPackageStatus());
 							retentionScanVo.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
 							retentionScanVo.setWaybillNumber(parcelListEntity.getWaybillNumber());
+							retentionScanVo.setMaterialName(parcelListEntity.getMaterialName());
+							retentionScanVo.setMaterialNumber(parcelListEntity.getMaterialCode());
 							retentionScanVo.setWaybillId(parcelListEntity.getWaybillId());
 							DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionLoadscanEntity.getReservationId());
 							retentionScanVo.setReservationCode(reservationEntity.getReservationCode());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -327,7 +327,7 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("trayCode", trayCode);
 									map.put("warehouseId", warehouseId);
 									map.put("orderPackageCode", packageCode);
-									warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+									warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
 								}
 							});
 						}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml

@@ -41,7 +41,7 @@
 
 
     <select id="selectWarehouseRetentionRecordPage" resultMap="warehouseRetentionRecordResultMap">
-        select * from logpm_warehouse_retention_scan where is_deleted = 0
+        select * from logpm_warehouse_retention_scan where is_deleted = 0 ORDER BY create_time DESC
     </select>