From 62e2ab095c69db665f9c087b02808d7c19f48514 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Mon, 21 Aug 2023 10:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/app/DistributionAppParcelListVO.java         |  5 +++++
 .../mapper/DistributionDeliveryInfoMapper.xml       |  4 +++-
 .../mapper/DistributionParcelListMapper.xml         |  4 +++-
 .../mapper/DistributionReservationPackageMapper.xml |  2 +-
 .../impl/DistributionDeliveryInfoServiceImpl.java   |  1 +
 .../wrapper/DistributionStockArticleWrapper.java    | 13 ++++++++-----
 .../wrapper/DistributionStockupWrapper.java         | 13 +++++++++----
 7 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
index b5fef0cd1..94585f545 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
@@ -38,6 +38,11 @@ public class DistributionAppParcelListVO extends DistributionParcelListEntity {
 	 */
 	@ApiModelProperty(value = "订单自编号")
 	private String orderSelfNumbering;
+	/**
+	 * 预约ID
+	 */
+	@ApiModelProperty(value = "预约ID")
+	private String reservationId;
 
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 386c5b05a..f32d66c43 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -277,7 +277,9 @@
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
             ldsa.id  stockArticleId,
-            (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
+            (SELECT COALESCE(COUNT(*), 0)
+             from logpm_distribution_loadscan ldl
+             WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.reservation_id = #{param.reservationId} ) loadingNub
         FROM
             logpm_distribution_reservation ldr
             join logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id
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 a93df353b..75c1dab28 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
@@ -55,7 +55,9 @@
         )
     </select>
     <select id="getOrderPackageCode" resultType="String">
-
+        select GROUP_CONCAT(order_package_code SEPARATOR ',')
+        from logpm_distribution_parcel_list
+        where stock_article_id = #{id}
     </select>
 
     <select id="exportDistributionParcelList" resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
index 3fd486833..a9f881315 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
@@ -78,7 +78,7 @@ FROM
 INNER JOIN logpm_distribution_parcel_list ldpl ON ldrp.parce_list_id = ldpl.id
 WHERE
 	ldrp.stock_article_id = #{id} -->
-        select DISTINCT ldrp.packet_bar_code orderPackageCode,ldsa.description_goods thirdProduct
+        select DISTINCT ldrp.packet_bar_code orderPackageCode,ldsa.description_goods thirdProduct,ldrp.reservation_id reservationId
         from   logpm_distribution_reservation_package ldrp
         left JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrp.stock_article_id
         WHERE 	ldrp.stock_article_id = #{id} and ldrp.packet_bar_status in (1,3)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index ced7338c5..660dbc5d7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -129,6 +129,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 			ks.forEach( k ->{
 				List<DistributionLoadscanEntity> list = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, k.getOrderPackageCode())
+					.eq(DistributionLoadscanEntity::getReservationId,k.getReservationId() )
 					.apply("scan_status != 1")
 				);
 				if(list.size() > 0){
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
index 9e2817207..00bc604be 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
@@ -10,6 +10,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
 import java.util.Objects;
@@ -17,10 +18,10 @@ import java.util.Objects;
 /**
  * 在库订单实体VO 转换
  */
-public class DistributionStockArticleWrapper extends BaseEntityWrapper<DistributionStockArticleEntity
-	, DistributionStockArticleVO> {
+public class DistributionStockArticleWrapper extends BaseEntityWrapper<DistributionStockArticleEntity, DistributionStockArticleVO> {
 	private IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
-	private IDistributionParcelListService distributionParcelListService;
+	private IDistributionParcelListService distributionParcelListService = SpringUtil.getBean(IDistributionParcelListService.class);
+
 
 
 	public static DistributionStockArticleWrapper build() {
@@ -33,8 +34,10 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 
 		DistributionStockArticleVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(entity, DistributionStockArticleVO.class));
 		// 查询包条码
-	/*	String orderPackageCode = distributionParcelListService.getOrderPackageCode(distributionStockupVO.getId());
-		distributionStockupVO.setOrderPackageCode( orderPackageCode);*/
+		if(ObjectUtils.isNotNull(distributionStockupVO.getId())){
+			String orderPackageCode = distributionParcelListService.getOrderPackageCode(distributionStockupVO.getId());
+			distributionStockupVO.setOrderPackageCode( orderPackageCode);
+		}
 		//计算在库天数
 		long time1 = entity.getWarehouseEntryTime().getTime(); //入库
 		long time2 = new Date().getTime(); // 现在
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockupWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockupWrapper.java
index 89006a3ef..edb17c02e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockupWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockupWrapper.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;
 import org.springblade.common.constant.DictBizConstant;
@@ -39,12 +40,16 @@ public class DistributionStockupWrapper extends BaseEntityWrapper<DistributionSt
 
 	@Override
 	public DistributionStockupVO entityVO(DistributionStockupEntity distributionStockupEntity) {
-		DistributionStockupVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(distributionStockupEntity, DistributionStockupVO.class));
+		DistributionStockupVO distributionStockupVO = new DistributionStockupVO();
+		if(ObjectUtils.isNotNull(distributionStockupEntity)){
+			 distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(distributionStockupEntity, DistributionStockupVO.class));
 //		String deliveryMethodStr = DictBizCache.getValue(DictBizConstant.DELIVERY_METHOD, distributionStockupVO.getDeliveryMethod());
 //		distributionStockupVO.setDeliveryMethodStr(deliveryMethodStr);
-		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,distributionStockupEntity.getStockupStatus()));
-		distributionStockupVO.setAssignStatusName(DictBizCache.getValue(DictBizConstant.STOCK_ALLOCATION,distributionStockupEntity.getAssignStatus()));
-		distributionStockupVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,distributionStockupEntity.getTypeService()));
+			distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,distributionStockupEntity.getStockupStatus()));
+			distributionStockupVO.setAssignStatusName(DictBizCache.getValue(DictBizConstant.STOCK_ALLOCATION,distributionStockupEntity.getAssignStatus()));
+			distributionStockupVO.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,distributionStockupEntity.getTypeService()));
+		}
+
 		return distributionStockupVO;
 	}