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] =?UTF-8?q?=E6=95=B4=E6=89=98=E5=A4=87=E8=B4=A7=E5=A2=9E?=
 =?UTF-8?q?=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;
 	}