From 37ea52383fb71c6ebf29689e84cac69746b67722 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 22 Sep 2024 23:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=89=AB=E6=8F=8F=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E8=A3=85=E8=BD=A6=E5=BC=82=E5=B8=B8=E3=80=81=E8=A3=85?=
 =?UTF-8?q?=E8=BD=A6=E8=AE=A1=E5=88=92=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionLoadscanAbnormalMapper.java |  8 ++++++++
 .../mapper/DistributionLoadscanAbnormalMapper.xml  | 14 ++++++++++++++
 .../IDistributionLoadscanAbnormalService.java      |  8 ++++++++
 .../impl/DistributionDeliveryListServiceImpl.java  |  8 ++++++++
 .../DistributionLoadscanAbnormalServiceImpl.java   | 10 ++++++++++
 5 files changed, 48 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.java
index 5e09d7a64..4980df8f8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.java
@@ -51,4 +51,12 @@ public interface DistributionLoadscanAbnormalMapper extends BaseMapper<Distribut
 	 */
 	List<DistributionLoadscanAbnormalExcel> exportDistributionLoadscanAbnormal(@Param("ew") Wrapper<DistributionLoadscanAbnormalEntity> queryWrapper);
 
+	/**
+	 * 装车关闭装车异常
+	 * @param orderPackageCode
+	 * @param warehouseId
+	 * @param reservationId
+	 * @param username
+	 */
+    void completeLoadingAbnormal(@Param("orderPackageCode") String orderPackageCode,@Param("warehouseId") Long warehouseId,@Param("reservationId") Long reservationId,@Param("username") String username);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
index 289530bad..d898c64fa 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanAbnormalMapper.xml
@@ -40,6 +40,20 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
     </resultMap>
+    <update id="completeLoadingAbnormal">
+        UPDATE logpm_distribution_loadscan_abnormal
+        SET auditing_user = #{username},
+        auditing_time = now(),
+        complete = 1,
+        auditing_status = 4,
+        remarks = '扫描装车关闭异常'
+        WHERE
+        package_code = #{orderPackageCode}
+        AND warehouse_id = #{warehouseId}
+        AND reservation_id = #{reservationId}
+        AND is_deleted = 0
+        AND loading_id is null
+    </update>
 
 
     <select id="selectDistributionLoadscanAbnormalPage" resultMap="distributionLoadscanAbnormalResultMap">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanAbnormalService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanAbnormalService.java
index d9670448c..7681b9025 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanAbnormalService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanAbnormalService.java
@@ -49,4 +49,12 @@ public interface IDistributionLoadscanAbnormalService extends BaseService<Distri
 	 */
 	List<DistributionLoadscanAbnormalExcel> exportDistributionLoadscanAbnormal(Wrapper<DistributionLoadscanAbnormalEntity> queryWrapper);
 
+
+	/**
+	 * 进行装车异常记录关闭
+	 * @param orderPackageCode
+	 * @param warehouseId
+	 * @param reservationId
+	 */
+	void completeLoadingAbnormal(String orderPackageCode, Long warehouseId, Long reservationId,String username);
 }
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 0c1a7ffb1..8a6c97cd9 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
@@ -4786,6 +4786,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		if (!abnormalEntityList.isEmpty()) {
 			distributionLoadscanAbnormalService.saveBatch(abnormalEntityList);
+			//进行异常的标记
+			List<Long> reservationIds = abnormalEntityList.stream().map(DistributionLoadscanAbnormalEntity::getReservationId).collect(Collectors.toList());
+			distributionSignforService.update(Wrappers.<DistributionSignforEntity>update().lambda()
+				.in(DistributionSignforEntity::getReservationId,reservationIds)
+				.set(DistributionSignforEntity::getIsHaveAbnormalPackage,2)
+			);
 		}
 	}
 
@@ -8687,6 +8693,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//正常进行装车
 				DistributionLoadscanEntity loadscanEntity = createdDistributionLoadscanEntity(deliveryListEntity, distributionDeliverySelfEntity, reservationId, parcelListEntity, myCurrentWarehouse, user);
 				distributionLoadscanService.save(loadscanEntity);
+				//这里还需要对异常记录进行关闭和完成
+				distributionLoadscanAbnormalService.completeLoadingAbnormal(loadscanEntity.getOrderPackageCode(),loadscanEntity.getWarehouseId(),loadscanEntity.getReservationId(),loadscanEntity.getScanUser());
 				//更新包件装车状态
 				packageLockIds.add(parcelListEntity.getId());
 				parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanAbnormalServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanAbnormalServiceImpl.java
index 7d3bd203b..88b38fe93 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanAbnormalServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanAbnormalServiceImpl.java
@@ -16,11 +16,14 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionLoadscanAbnormalEntity;
 import com.logpm.distribution.excel.DistributionLoadscanAbnormalExcel;
 import com.logpm.distribution.mapper.DistributionLoadscanAbnormalMapper;
 import com.logpm.distribution.service.IDistributionLoadscanAbnormalService;
 import com.logpm.distribution.vo.DistributionLoadscanAbnormalVO;
+import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.constant.loading.LoadingAbnormalAuditingStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -51,4 +54,11 @@ public class DistributionLoadscanAbnormalServiceImpl extends BaseServiceImpl<Dis
 		return distributionLoadscanAbnormalList;
 	}
 
+
+	@Override
+	public void completeLoadingAbnormal(String orderPackageCode, Long warehouseId, Long reservationId,String username) {
+
+		baseMapper.completeLoadingAbnormal(orderPackageCode,warehouseId,reservationId,username);
+	}
+
 }