From 46965826600151563fa5ea194ccd311da6931735 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 3 Jan 2024 16:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E3=80=81=E4=B8=80=E9=94=AE=E7=AD=BE=E6=94=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loading/LoadingStatusConstant.java        |  2 +-
 .../vo/DistributionDeliveryInfoVO.java        |  5 ++++
 .../vo/DistributionParcelListVO.java          |  2 +-
 .../mapper/DistributionDeliveryInfoMapper.xml |  1 +
 .../mapper/DistributionReservationMapper.xml  |  2 +-
 .../mapper/DistributionStockArticleMapper.xml | 30 +++++++++----------
 .../DistributionDeliveryListServiceImpl.java  |  4 +--
 .../impl/DistributionSignforServiceImpl.java  |  9 +++++-
 .../DistributionStockArticleServiceImpl.java  |  1 -
 9 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
index d120b356f..89abadf64 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
@@ -11,7 +11,7 @@ public enum LoadingStatusConstant {
 	saomiao("扫描","2"),
 	queren("确认","3"),
 	yijianzhuangche("一键装车","4"),
-	bulu("补录","5");
+	buluzhuangche("补录装车","5");
 
 
 	/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
index 40554c22a..76f3113b1 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
@@ -356,6 +356,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	private String signingTime;
 
+	/**
+	 * 是否存在异常包件
+	 */
+	private String isHaveAbnormalPackage;
+
 
 
 //	/**
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 8f8917b08..46584e39c 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -127,7 +127,7 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	/**
 	 * 签收数量
 	 */
-	private Date  loadingTime;
+	private String  loadingTime;
 	/**
 	 * 实际装车人
 	 */
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 c6f206e14..4d9ca42bb 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
@@ -588,6 +588,7 @@ FROM
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
+        lds.is_have_abnormal_package isHaveAbnormalPackage,
         (SELECT
         ldss.forklift_name
         FROM
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 be0339cdf..a30aaa4d9 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
@@ -88,7 +88,7 @@
         UPDATE logpm_distribution_reservation_package SET packet_bar_status = 2 ,cancel_status = 1
         WHERE
         reservation_id = #{reservationId} and parce_list_id in
-        <foreach collection="packageId" item="id" open="(" close=")" separator=",">
+        <foreach collection="packageIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </update>
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 b37a18197..bb795f2f6 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
@@ -565,6 +565,18 @@
             </if>
         </where>
     </select>
+    <!--        (select GROUP_CONCAT(DISTINCT lwtg.tray_code)-->
+    <!--        from logpm_distribution_parcel_list ldpl-->
+    <!--        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-->
+    <!--        where ldpl.stock_article_id = ldsa.id) trays,-->
+    <!--        (-->
+    <!--        select GROUP_CONCAT(DISTINCT lwug.position_code)-->
+    <!--        from logpm_distribution_parcel_list ldpl-->
+    <!--        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-->
+    <!--        where ldsa.id = ldpl.stock_article_id-->
+    <!--        ) allocation-->
     <select id="selectAllDistributionOrder"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
         select DISTINCT ldsa.id, ldsa.tenant_id,
@@ -572,7 +584,7 @@
         ldsa.create_time,
         ldsa.update_user,
         ldsa.update_time,
-        (ldsa.incoming_num - IF(oun.num is null,0,oun.num)) AS handQuantity,
+        (ldsa.incoming_num - ldsa.delivery_quantity ) AS handQuantity,
         ldsa.status, ldsa.is_deleted, ldsa.create_dept,
         ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5,
         ldsa.service_number, ldsa.order_code,
@@ -593,19 +605,7 @@
         ldsa.inventory_date, ldsa.inventory_person, ldsa.inventory_person_id,
         ldsa.available_quantity, ldsa.is_have_data, ldsa.stock_article_code, ldsa.dealer_name, ldsa.dealer_code,
         ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
-        ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,
-        (select GROUP_CONCAT(DISTINCT lwtg.tray_code)
-        from logpm_distribution_parcel_list ldpl
-        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
-        where ldpl.stock_article_id = ldsa.id) trays,
-        (
-        select GROUP_CONCAT(DISTINCT lwug.position_code)
-        from logpm_distribution_parcel_list ldpl
-        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
-        where ldsa.id = ldpl.stock_article_id
-        ) allocation
+        ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         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
@@ -614,7 +614,7 @@
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
-            AND (ldsa.incoming_num - IF(oun.num is null,0,oun.num)) > 0
+            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>
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 54d4ee6a7..1f0dd227f 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
@@ -4083,7 +4083,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
 							if (Func.isNotEmpty(loadscanEntity.getScanTime())) {
-								distributionParcelListVO.setLoadingTime(sf.parse(loadscanEntity.getScanTime()));
+								distributionParcelListVO.setLoadingTime(loadscanEntity.getScanTime());
 							}
 							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
 								switch (loadscanEntity.getScanStatus()) {
@@ -4100,7 +4100,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										distributionParcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
 										break;
 									case "5":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
+										distributionParcelListVO.setScanStatus(LoadingStatusConstant.buluzhuangche.getName());
 										break;
 								}
 								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
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 8034dad08..19997d796 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
@@ -980,6 +980,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
 				distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 				distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
+				distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 				distributionLoadscanService.save(distributionLoadscanEntity);
 				//进行签收数量的修改
 				Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -2695,7 +2696,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public R offline(String offlineJson) {
-
 		return null;
 	}
 
@@ -2721,6 +2721,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (Func.isNotEmpty(distributionLoadscanEntity)) {
 							//该包件存在扫描记录
 							String scanStatus = distributionLoadscanEntity.getScanStatus();
+							p.setLoadingTime(distributionLoadscanEntity.getScanTime());
 							switch (scanStatus) {
 								case "1":
 									p.setScanStatus(LoadingStatusConstant.quxiao.getName());
@@ -2734,6 +2735,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								case "4":
 									p.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
 									break;
+								case "5":
+									p.setScanStatus(LoadingStatusConstant.buluzhuangche.getName());
+									break;
 							}
 							p.setLoadingNub(distributionLoadscanEntity.getLoadedNub());
 							p.setSigningNub(distributionLoadscanEntity.getReceivedQuantity());
@@ -2746,6 +2750,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							if (Func.isNotEmpty(distributionLoadscanEntity.getDriverName())) {
 								p.setDriverName(distributionLoadscanEntity.getDriverName());
 							}
+							if (Func.isNotEmpty(distributionLoadscanEntity.getSigningUser())) {
+								p.setSigningUser(distributionLoadscanEntity.getSigningUser());
+							}
 						}
 					});
 					parcelListVOS.addAll(parcelListVOList);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index a5fa8f5e1..a73d3c38e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1114,7 +1114,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	List<DistributionParcelNumberEntity> list = new ArrayList<>();
 	data.forEach( i -> {
 		DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
-
 		log.info("数据信息",i);
 		BasicdataWarehouseEntity warehouse = warehouseClient.getWarehouse(i.getWarehouse(), i.getWarehouseCode());
 		stockArticleEntity.setWarehouseId(warehouse.getId());