From 2eae9b4893666db3799e96efa13a0fd3062ccbd8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 21 Jan 2025 17:46:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=B4=E6=89=98=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/AftersalesWorkOrderMapper.xml      |  8 +--
 .../mapper/DistributionStockupMapper.xml      |  5 +-
 .../impl/DistributionStockupServiceImpl.java  | 55 ++++++++++++-------
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 8a5f4173a..c2f4d1d2c 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -2037,7 +2037,7 @@
         lawo.create_time AS createTime,
         lawo.commit_time AS commitTime,
         GROUP_CONCAT( laprr.result_type ) AS  resultType,
-        SUM(laprr.money) AS money,
+        (SELECT SUM(money) FROM logpm_aftersales_processing_results WHERE is_deleted = 0 AND work_order_id = lawo.id) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
         GROUP_CONCAT(DISTINCT lapr.business_name) AS businessName,
@@ -2222,7 +2222,7 @@
         lawo.commit_time AS commitTime,
         lawo.over_time AS overTime,
         GROUP_CONCAT(DISTINCT laprr.result_type ) AS  resultType,
-        SUM(laprr.money) AS money,
+        (SELECT SUM(money) FROM logpm_aftersales_processing_results WHERE is_deleted = 0 AND work_order_id = lawo.id) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
         GROUP_CONCAT(DISTINCT lapr.business_name) AS businessName,
@@ -3758,7 +3758,7 @@
         lawo.commit_time AS commitTime,
         lawo.over_time AS overTime,
         GROUP_CONCAT( laprr.result_type ) AS  resultType,
-        SUM(laprr.money) AS money,
+        (SELECT SUM(money) FROM logpm_aftersales_processing_results WHERE is_deleted = 0 AND work_order_id = lawo.id) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
         GROUP_CONCAT(DISTINCT lapr.business_name) AS businessName,
@@ -3948,7 +3948,7 @@
         lawo.commit_time AS commitTime,
         lawo.over_time AS overTime,
         GROUP_CONCAT( laprr.result_type ) AS  resultType,
-        SUM(laprr.money) AS money,
+        (SELECT SUM(money) FROM logpm_aftersales_processing_results WHERE is_deleted = 0 AND work_order_id = lawo.id) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
         GROUP_CONCAT(DISTINCT lapr.business_name) AS businessName,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index e760a4fe3..e9d6ae6cc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -1581,6 +1581,7 @@
         logpm_distribution_stock AS ldss
         WHERE
         ldss.is_deleted = 0
+        AND ldss.cancel_status != 1
         AND ldss.reservation_id = ldr.id
         ) AS scanNum,
         IFNULL( SUM( ldr.reservation_stock_list_num ), 0 ) AS inventoryNum
@@ -1655,7 +1656,7 @@
         logpm_distribution_stock AS ldss
         WHERE
         ldss.is_deleted = 0
-        and ldss.cancel_status != 1
+        AND ldss.cancel_status != 1
         AND ldss.reservation_id = ldbl.id
         ) AS scanNum,
         (
@@ -2162,7 +2163,7 @@
         GROUP BY
         ldsi.stockup_id,ldr.id,ldpl.id
         HAVING
-        count( ldr.id )>0
+        count( ldpl.id  ) > 0
     </select>
     <select id="selectBillStockupPackageEntityList"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index e4d3d9ded..99c341541 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -4632,22 +4632,28 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (Objects.isNull(stockupEntity)) {
 			return Resp.scanFail("备货任务信息错误", "备货任务信息错误");
 		}
-		switch (scanType) {
-			case 1:
-				//订制品
-				return handleDeliveryPackageStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
-			case 2:
-				//库存品
-				return handleDeliveryInventoryStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
-			case 3:
-				//配送零担备货
-				return handleDeliveryZeroStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
-			case 4:
-				//配送托盘备货
-				return handleDeliveryTrayStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
-			default:
-				log.error(method + "未知scanType");
-				return Resp.scanFail("未知操作类型", "未知操作类型");
+		try {
+			switch (scanType) {
+				case 1:
+					//订制品
+					return handleDeliveryPackageStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
+				case 2:
+					//库存品
+					return handleDeliveryInventoryStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
+				case 3:
+					//配送零担备货
+					return handleDeliveryZeroStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
+				case 4:
+					//配送托盘备货
+					return handleDeliveryTrayStockUp(stockupDTO, myCurrentWarehouse, reservationId, stockupEntity);
+				default:
+					log.error(method + "未知scanType");
+					return Resp.scanFail("未知操作类型", "未知操作类型");
+			}
+
+		}catch (Exception e){
+			log.error(">>>>>>>>>>>>>>>",e.getMessage());
+			return null;
 		}
 	}
 
@@ -4698,9 +4704,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (packageData.isEmpty()) {
 				return R.fail("当前托盘无此客户的货物");
 			}
+			List<JSONObject> logList =new ArrayList<>();
 			warehouseUpdownTypeClient.downTray(trayByTrayCode.getPalletCode(),myCurrentWarehouse.getId());
 			//生成扫描数据
-			List<DistributionStockEntity> stockEntityList = generateDeliveryTrayPackageStockEntity(reservationEntity,packageData,myCurrentWarehouse,user,stockupDTO.getStockupId(),stockupEntity);
+			List<DistributionStockEntity> stockEntityList = generateDeliveryTrayPackageStockEntity(reservationEntity,packageData,myCurrentWarehouse,user,stockupDTO.getStockupId(),stockupEntity,logList);
 			if (!stockEntityList.isEmpty()) {
 				// 备货作业节点
 				distributionStockService.saveBatch(stockEntityList);
@@ -4709,8 +4716,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					.in(DistributionParcelListEntity::getId,updatePackageIds)
 					.set(DistributionParcelListEntity::getOrderPackageStockupStatus,OrderPackageStockupStatusConstant.yibeihu.getValue())
 				);
-			}
 
+			}
+			if (!logList.isEmpty()) {
+				trunklinePackageTrackLogClient.addPackageTrackLog(logList);
+			}
 			return Resp.scanSuccess("操作成功","");
 		}else {
 			return Resp.scanFail("订制品备货已完成","");
@@ -4722,7 +4732,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 																				 BasicdataWarehouseEntity warehouse,
 																				 BladeUser user,
 																				 Long stockUpId,
-																				 DistributionStockupEntity stockupEntity) {
+																				 DistributionStockupEntity stockupEntity,
+																				 List<JSONObject> logList) {
 		List<DistributionStockEntity> list= new ArrayList<>();
 		for (DistributionParcelListEntity parcelListEntity : packageData) {
 			DistributionStockEntity distributionStockEntity = new DistributionStockEntity();
@@ -4748,6 +4759,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if (ObjectUtils.isNotNull(nodeFanoutMsg)) {
 				distributionNodeWorkService.planStock(nodeFanoutMsg, AuthUtil.getUser());
 			}
+			//增加备货扫描节点
+			String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "按托盘备货作业,备货任务号:" + stockupEntity.getStockupCode();
+			JSONObject js = handleLogJSONObject(warehouse, user, distributionStockEntity.getCoding(), content, WorkNodeEnums.STOCKING_OPERATION.getCode());
+			logList.add(js);
 		}
 		return list;
 	}
@@ -4850,6 +4865,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	 * @param stockupEntity
 	 * @return
 	 */
+	@Transactional
 	private R handleDeliveryInventoryStockUp(StockupDTO stockupDTO, BasicdataWarehouseEntity myCurrentWarehouse, Long reservationId, DistributionStockupEntity stockupEntity) {
 		String method = "#######################DistributionStockupServiceImpl.handleDeliveryInventoryStockUp";
 		if (Objects.isNull(stockupDTO.getStockPrint())) {
@@ -4873,6 +4889,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	}
 
+	@Transactional
 	private R handleDeliveryUnHaveDataInventoryPackage(StockupDTO stockupDTO, BasicdataWarehouseEntity myCurrentWarehouse, Long reservationId, DistributionStockupEntity stockupEntity) {
 		String method = "#######################DistributionStockupServiceImpl.handleDeliveryUnHaveDataInventoryPackage";
 		//无数据库存品备货必须携带库位信息

From b8af9c96d56a87325abb5a171f5bea333657a4bb Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 21 Jan 2025 17:53:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B4=E6=89=98=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockupMapper.xml           |  2 +-
 .../impl/DistributionStockupServiceImpl.java       | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index e9d6ae6cc..ecaf411e3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -2249,7 +2249,7 @@
         ldbl.id,
         ldpl.id
         HAVING
-        count( ldbl.id )> 0
+        count( ldpl.id )> 0
     </select>
     <select id="selectDeliveryStockupInventoryEntityList"
             resultType="com.logpm.distribution.entity.DisStockListDetailEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 99c341541..e9fad5eff 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -5336,11 +5336,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail("当前托盘无此客户的货物");
 		}
 		warehouseUpdownTypeClient.downTray(trayByTrayCode.getPalletCode(),myCurrentWarehouse.getId());
+		List<JSONObject> logList = new ArrayList<>();
 		//生成扫描数据
-		List<DistributionStockEntity> stockEntityList = generateBillTrayPackageStockEntity(billLadingEntity,packageData,myCurrentWarehouse,user,stockupDTO.getStockupId());
+		List<DistributionStockEntity> stockEntityList = generateBillTrayPackageStockEntity(billLadingEntity,packageData,myCurrentWarehouse,user,stockupDTO.getStockupId(),stockupEntity,logList);
 		if (!stockEntityList.isEmpty()) {
 			distributionStockService.saveBatch(stockEntityList);
 		}
+		if (!logList.isEmpty()) {
+			trunklinePackageTrackLogClient.addPackageTrackLog(logList);
+		}
 		return Resp.scanSuccess("操作成功"," ");
 	}
 
@@ -5348,7 +5352,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 																			 List<DistributionParcelListEntity> packageData,
 																			 BasicdataWarehouseEntity myCurrentWarehouse,
 																			 BladeUser user,
-																			 Long stockupId) {
+																			 Long stockupId,
+																			 DistributionStockupEntity stockupEntity,
+																			 List<JSONObject> logList) {
 		List<DistributionStockEntity> list= new ArrayList<>();
 		for (DistributionParcelListEntity parcelListEntity : packageData) {
 			DistributionStockEntity distributionStockEntity = new DistributionStockEntity();
@@ -5370,6 +5376,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			distributionStockEntity.setScanUser(user.getNickName());
 			distributionStockEntity.setIsTray(Integer.parseInt(IsOrNoConstant.yes.getValue()));
 			list.add(distributionStockEntity);
+			//增加备货扫描节点
+			String content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "按托盘备货作业,备货任务号:" + stockupEntity.getStockupCode();
+			JSONObject js = handleLogJSONObject(myCurrentWarehouse, user, distributionStockEntity.getCoding(), content, WorkNodeEnums.STOCKING_OPERATION.getCode());
+			logList.add(js);
 		}
 		return list;
 	}

From 2a9dcef4ceed9a185588355e86b813a9aa273b11 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 21 Jan 2025 17:57:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 8c371e8a9..bd5cd7c35 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
@@ -5716,9 +5716,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				builder.append(distributionSignforEntity.getDriverRemarks()).append(deliverySelfEntity.getDriverName() + ":" + distributionSignfor.getDriverRemarks());
 				distributionSignforEntity.setDriverRemarks(builder.toString());
 			}
-			if (!aaa.isEmpty()){
-				trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
-			}
+
 		} else {
 			if (distributionDeliveryListEntity.getKind().equals("1")){
 				if (deliverySelfEntity.getIsMaster().equals(1)) {
@@ -6174,6 +6172,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L);
 			}
 		}
+		if (!aaa.isEmpty()){
+			trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
+		}
 		bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L);
 		NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists);
 		distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());

From 59f7c10322ce19eabc91bf85a02e7681707aef9d Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 21 Jan 2025 17:58:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=8C=85=E6=9D=A1=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java       | 3 ++-
 .../service/impl/DistributionStockupServiceImpl.java       | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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 bd5cd7c35..e7f66529d 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
@@ -6160,7 +6160,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (!packageLockIds.isEmpty()) {
 			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":orderPackageCode:");
 			if (Func.isNotEmpty(a)) {
-				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
+                assert a != null;
+                boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
 				if (flag) {
 					//正在操作，请稍后重试
 					throw new CustomerException("该包件正在被操作,请稍后再试!!!");
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index e9fad5eff..dc0789f9b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -6698,7 +6698,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		BladeUser user = AuthUtil.getUser();
 		DistributionStockEntity stockEntity = generateDeliveryPackageStockEntity(reservationEntity, parcelListEntity, warehouseId, warehouseName, user, stockupDTO.getStockupId());
 
-		DistributionReservationPackageEntity distributionReservationPackageEntity = packageEntityList.get(0);
 		if (parcelListEntity.getOrderPackageGroundingStatus().equals(OrderPackageGroundingStatusConstant.yishangjia.getValue())) {
 			//进行下架处理
 			WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
@@ -6736,7 +6735,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		//修改包件备货状态
 		parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
-		distributionParcelListService.updateById(parcelListEntity);
+
+		DistributionParcelListEntity update = new DistributionParcelListEntity();
+		update.setId(parcelListEntity.getId());
+		update.setOrderPackageStockupStatus(parcelListEntity.getOrderPackageStockupStatus());
+		distributionParcelListService.updateById(update);
 		trunklinePackageTrackLogClient.addPackageTrackLog(packageLogList);
 		// 备货作业节点
 		NodeFanoutMsg<StockUpVO> nodeFanoutMsg = buildStockUpNodeData(stockupEntity, stockEntity, parcelListEntity);