From 72d5b144560b2ab4dfdc25c2f910591b0d2eacbf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 16 Mar 2024 22:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=A3=80=E6=B5=8B=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E5=8C=85=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/dto/DistributionParcelNumberDTO.java  |  5 +++++
 .../mapper/DistributionLoadscanMapper.java             |  9 +++++++++
 .../distribution/mapper/DistributionLoadscanMapper.xml | 10 ++++++++++
 .../mapper/DistributionReservationMapper.xml           |  3 ++-
 .../service/impl/DistributionSignforServiceImpl.java   |  7 +++++++
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelNumberDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelNumberDTO.java
index 8ea48328d..b309221c6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelNumberDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionParcelNumberDTO.java
@@ -36,6 +36,11 @@ public class DistributionParcelNumberDTO extends DistributionParcelNumberEntity
 	 */
 	private Integer number;
 
+	/**
+	 * 在库数量
+	 */
+	private Long reservationId;
+
 	/**
 	 * 装车数量
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
index 64e9fd1de..2a8c3f6fe 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
@@ -177,4 +177,13 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	 * @return
 	 */
 	Integer selectLoadingNumByDeliveryId(@Param("deliveryId")Long deliveryId);
+
+	/**
+	 * 判断零担订单是否完成签收
+	 * @param reservationId
+	 * @param parcelListId
+	 * @param reservationNum
+	 * @return
+	 */
+    boolean judgmentZeroPackageIsSign(@Param("reservationId") Long reservationId,@Param("packageId") Long packageId,@Param("num") Integer reservationNum);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
index 7cdc81160..0eb7bf552 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
@@ -286,4 +286,14 @@
         +
         (IF((SELECT sum(loaded_nub) FROM logpm_distribution_loadscaninvn  WHERE delivery_id = #{deliveryId} AND scan_state != 1 AND signfor_state = 2)is null,0,(SELECT sum(loaded_nub) FROM logpm_distribution_loadscaninvn  WHERE delivery_id = #{deliveryId} AND scan_state != 1 )))
     </select>
+    <select id="judgmentZeroPackageIsSign" resultType="java.lang.Boolean">
+
+        SELECT
+        IF
+        ( received_quantity = #{num}, 1, 0 )
+        FROM
+        logpm_distribution_loadscan AS ldl
+        WHERE
+        reservation_id = #{reservationId} AND package_id = #{packageId}
+    </select>
 </mapper>
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 b5a1269a5..7c5a67938 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
@@ -862,7 +862,7 @@
             logpm_distribution_reservation_package AS ldrs
             INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrs.parce_list_id = ldpl.id
         WHERE
-            ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId}
+            ldrs.packet_bar_status IN ('1','3') and reservation_id = #{reservationId} AND ldpl.conditions = 1
     </select>
     <select id="getReservationNumStockSelf" resultType="Integer">
         select SUM(lddd.quantity)
@@ -1197,6 +1197,7 @@
             ldrzp.parcel_list_id AS parcelListId,
             ldrs.stock_article_id AS stockArticleId,
             ldrzp.quantity AS reservationNum,
+            ldrzp.reservation_id AS reservationId,
             ldpn.quantity,
             ldpn.hand_quantity,
             ldpn.delivery_quantity,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 9aa5249f8..63f04a677 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1487,6 +1487,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	private boolean judgmentSignIsHavePackage(Long reservationId) {
 		boolean flag = false;
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
+		List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId);
 		//判断计划内的包件是否都进行签收了
 		if (Func.isNotEmpty(distributionParcelListEntities)) {
 			flag = distributionParcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
@@ -1496,6 +1497,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isNotEmpty(disStockListDetailEntities)) {
 			flag = disStockListDetailEntities.stream().allMatch(p -> p.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue()));
 		}
+		if (Func.isNotEmpty(distributionParcelNumberDTOS)){
+			for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) {
+				//查询是否签收是否和计划保持一致
+				flag = distributionLoadscanMapper.judgmentZeroPackageIsSign(distributionParcelNumberDTO.getReservationId(),distributionParcelNumberDTO.getParcelListId(),distributionParcelNumberDTO.getReservationNum());
+			}
+		}
 		return flag;
 	}