From 5c08df2a9a8043671ad467dbd264a50f62a5308b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 6 Jan 2024 15:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionSignforMapper.xml      |  4 +--
 .../mapper/DistributionStockArticleMapper.xml |  1 -
 .../service/IDistributionSignforService.java  |  6 ++++
 .../impl/DistributionSignforServiceImpl.java  | 34 +++++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 8936fab47..b41f5cfaf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -663,7 +663,7 @@
     </select>
 
 
-    
+
     <select id="selectloadNub" resultType="java.lang.Integer">
         SELECT COALESCE(sum(lds.loaded_number), 0)  FROM logpm_distribution_signfor lds WHERE lds.delivery_id = #{id}
     </select>
@@ -1056,7 +1056,7 @@
             LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id
             LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id
         WHERE
-            ldla.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId}
+            ldla.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status = 1
     </select>
     <select id="selectSignImgsUrl" resultType="com.logpm.distribution.vo.DistributionSignPrintVO">
         SELECT * FROM logpm_distribution_sign_print WHERE reservation_id = #{reservationId} and is_deleted = 0
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 76cf09463..5e3f881a2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -603,7 +603,6 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
-        LEFT JOIN order_use_num AS oun ON ldsa.id = oun.stock_article_id
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index be72b82c6..1ad9dfac5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -254,4 +254,10 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	R signforInPC(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO);
+
+	/**
+	 * 维护签收异常状态
+	 * @param aLong
+	 */
+	void maintenanceSignfor(Long aLong);
 }
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 3a711b228..0b7eabcb8 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
@@ -610,6 +610,33 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return R.status(true);
 	}
 
+	@Override
+	@Transactional
+	public void maintenanceSignfor(Long reservationId) {
+		//签收
+		DistributionSignforEntity signforEntity = this.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
+			.eq(DistributionSignforEntity::getReservationId, reservationId)
+		);
+		if (Func.isEmpty(signforEntity)){
+			log.error("维护签收异常是否存在异常包件失败");
+			return;
+		}
+		List<DistributionLoadscanAbnormalEntity> loadscanAbnormalEntityList = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+			.eq(DistributionLoadscanAbnormalEntity::getReservationId, reservationId)
+		);
+		if (Func.isNotEmpty(loadscanAbnormalEntityList)){
+			//查看当前客户是否都已经完成审核
+			boolean flag = loadscanAbnormalEntityList.stream().allMatch(p -> p.getAuditingStatus().equals(LoadingAbnormalAuditingStatusConstant.yishenhe.getValue()));
+			if (flag){
+				signforEntity.setIsHaveAbnormalPackage(1);
+			}else {
+				signforEntity.setIsHaveAbnormalPackage(2);
+			}
+
+		}
+		this.updateById(signforEntity);
+	}
+
 	private boolean judgmentSignIsHavePackage(Long reservationId) {
 		boolean flag = false;
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
@@ -3310,6 +3337,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
+	@Transactional
 	public R loadingAbnormalPackageListAuditing(String ids) {
 //		------------------------------------2023-09-27  异常装车包件审核----------------------------------------------
 //		思路：
@@ -3320,6 +3348,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("#############异常包件信息异常:{}", distributionLoadscanAbnormalEntities);
 			return R.fail(3000, "审核失败");
 		}
+		List<Long> reservationId = distributionLoadscanAbnormalEntities.stream().distinct().map(DistributionLoadscanAbnormalEntity::getReservationId).collect(Collectors.toList());
 		if (distributionLoadscanAbnormalEntities.size() == 1) {
 			DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = distributionLoadscanAbnormalEntities.get(0);
 			//需要将该包件追加至该客户之下
@@ -3370,6 +3399,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					.eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanAbnormalEntity.getDeliveryListId())
 					.eq(DistributionLoadscanEntity::getPackageId, distributionLoadscanAbnormalEntity.getPackageId())
 					.eq(DistributionLoadscanEntity::getOrderPackageCode, distributionLoadscanAbnormalEntity.getPackageCode())
+					.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 				);
 				loadscanEntity.setIsAbnormalLoading(1);
 				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){
@@ -3431,6 +3461,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			//批量审核
 		}
+		//维护签收的异常签收状态
+		this.maintenanceSignfor(reservationId.get(0));
+
+
 		return R.success("操作成功");
 	}