From 764ac1812ba233c2e0c5a2dba80b7962babe025a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 13 Jan 2024 14:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E4=B8=8A=E5=8F=96=E6=B6=88=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionParcelListMapper.xml   |  1 -
 .../mapper/DistributionReservationMapper.java |  2 +
 .../mapper/DistributionReservationMapper.xml  | 51 ++++++++++++++++++-
 .../impl/DistributionAsyncServiceImpl.java    |  1 +
 .../DistributionDeliveryListServiceImpl.java  |  7 +++
 .../DistributionParcelListWrapper.java        |  3 ++
 6 files changed, 63 insertions(+), 2 deletions(-)

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 1d029f222..e46bb843a 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
@@ -131,7 +131,6 @@
         ldpl.order_package_stockup_status orderPackageStockupStatus,
         ldpl.order_package_reservation_status orderPackageReservationStatus,
         ldpl.order_package_loading_status orderPackageLoadingStatus,
-        ldpl.waybill_number waybillNumber,
         ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
         ldpl.waybill_number waybillNumber,
         lwug.position_code goodsAllocation,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index cb4ffd81a..5b1c4d7c8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -356,4 +356,6 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @return
 	 */
     IPage<DistributionReservationInventoryPackageVO> selectInvenToryPackageByReservationInfo(@Param("param") Map<String, Object> reservationPackageDTO,IPage<DistributionReservationInventoryPackageVO> page);
+
+	List<DistributionParcelListEntity> getReservationPackageNew(@Param("param")Map<String, Object> distributionDeliveryInfoDTO);
 }
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 c97f4faec..f9ae56dcd 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
@@ -709,7 +709,7 @@
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
 
         <where>
-            lds.delivery_id = #{param.deliveryId}  and ldrp.packet_bar_status in ('1','3')
+            lds.delivery_id = #{param.deliveryId}  and ldrp.packet_bar_status in ('1','3') and ldpl.id is not null
             <if test="param.waybillNumber !=null and param.waybillNumber != ''">
                 and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
             </if>
@@ -1642,4 +1642,53 @@
         </if>
     </select>
 
+
+
+    <select id="getReservationPackageNew" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        select ldpl.*,ldpl.quantity AS reservationNum  from logpm_distribution_reservation_package ldrp LEFT JOIN
+        logpm_distribution_parcel_list ldpl ON ldrp.parce_list_id = ldpl.id
+        where reservation_id in (
+        SELECT reservation_id from logpm_distribution_signfor lds where lds.delivery_id= #{param.deliveryId}
+        ) and ldrp.packet_bar_status IN ( '1', '3' )
+        <if test="param.waybillNumber !=null and param.waybillNumber != ''">
+            and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
+        </if>
+        <if test="param.serviceNumber !=null and param.serviceNumber != ''">
+            and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
+        </if>
+        <if test="param.orderCode !=null and param.orderCode != ''">
+            and ldpl.order_code like concat('%',#{param.orderCode},'%')
+        </if>
+        <if test="param.orderPackageCode !=null and param.orderPackageCode != ''">
+            and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%')
+        </if>
+        <if test="param.warehouse !=null and param.warehouse != ''">
+            and ldpl.warehouse like concat('%',#{param.warehouse},'%')
+        </if>
+        <if test="param.materialName !=null and param.materialName != ''">
+            and ldpl.material_name like concat('%',#{param.materialName},'%')
+        </if>
+        <if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
+            and ldpl.accept_warehouse_name like concat('%',#{param.acceptWarehouseName},'%')
+        </if>
+        <if test="param.sendWarehouseName !=null and param.sendWarehouseName != ''">
+            and ldpl.send_warehouse_name like concat('%',#{param.sendWarehouseName},'%')
+        </if>
+        <if test="param.acceptWarehouseName !=null and param.acceptWarehouseName != ''">
+            and ldpl.accept_warehouse_name like concat('%',#{param.acceptWarehouseName},'%')
+        </if>
+        <if test="param.trainNumber !=null and param.trainNumber != ''">
+            and ldpl.train_number like concat('%',#{param.trainNumber},'%')
+        </if>
+        <if test="param.firsts !=null and param.firsts != ''">
+            and ldpl.firsts like concat('%',#{param.firsts},'%')
+        </if>
+        <if test="param.second !=null and param.second != ''">
+            and ldpl.second like concat('%',#{param.second},'%')
+        </if>
+        <if test="param.thirdProduct !=null and param.thirdProduct != ''">
+            and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
+        </if>
+
+    </select>
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 431b6dc21..d9814271d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1635,6 +1635,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					.distinct().collect(Collectors.joining(","));
 				distributionStockArticleService.maintenanceOrderInfo(orderCodes, warehouseId);
 
+				log.info(">>>>>> updatePackageDeliveryStatus,{}, {}",reservationId,packageIds);
 				//完成对该客户下此包件任务的取消
 				int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds);
 				//TODO  欠缺零担的资源释放
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index cb5b215ed..105c8793c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -4140,10 +4140,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if (Func.isNotEmpty(orderIds)) {
 				//查询该客户的非零但订单包间
 				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(orderIds, distributionDeliveryInfoDTO);
+//				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO);
+				log.info(">>>>>> parcelListEntityList {}",parcelListEntityList);
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
+					log.info(">>>>>> distributionParcelListVO {}",distributionParcelListVO);
 					if (Func.isNotEmpty(loadingDataMap)) {
 						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
+						log.info(">>>>>> loadscanEntity {}",loadscanEntity);
+
 						if (Func.isNotEmpty(loadscanEntity)) {
 							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 								distributionParcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
@@ -4185,6 +4190,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							}
 						}
 					}
+					log.info(">>>>>> distributionParcelListVO2 {}",distributionParcelListVO);
+
 					distributionParcelListVOS.add(distributionParcelListVO);
 				}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
index a16cf1902..142165b47 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
@@ -35,6 +35,9 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 	public DistributionParcelListVO entityVO(DistributionParcelListEntity entity) {
 //		IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class);
 //		IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class);
+
+
+
 		DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if(ObjectUtils.isNotNull(entity.getScanTimes())){