From 63b3722ad4f68db70b716830c7cde22c90d541ad Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 16 Oct 2024 14:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=B1=95=E7=A4=BA=E7=BB=B4=E6=8A=A4=E3=80=81=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E6=89=AB=E6=8F=8FBUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionParcelListServiceImpl.java    |  3 ++-
 .../impl/DistributionSignforServiceImpl.java  | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index a444b41dd..5fe46467f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -601,6 +601,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					if (isAutoWarehouse == Integer.parseInt(IsOrNoConstant.yes.getValue()) && !Objects.isNull(defaultGoodsAllocation)){
 						//进行此包件的默认上架
 						warehouseUpdownTypeClient.upShelfPackage( i.getOrderPackageCode(),defaultGoodsAllocation.getId(),myCurrentWarehouse.getId(),"自动上架");
+
 					}
 				});
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
@@ -1052,7 +1053,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					warehouseUpdownGoodsEntity.setAssociationValue(distributionParcelListEntity.getOrderPackageCode());
 					WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
 					if (Func.isNotEmpty(locationInformation)) {
-						distributionStockListInfo.setStorageLocation(locationInformation.getAllocationTitle());
+						distributionStockListInfo.setStorageLocation(locationInformation.getPositionCode());
 					}
 					distributionStockListInfo.setFactory(distributionStockArticleEntity.getFactoryTrain());
 					distributionStockListInfo.setDespatch(distributionStockArticleEntity.getTrainNumber());
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 30b4177c5..f2aa4756d 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
@@ -9126,21 +9126,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	 */
 	private DistributionLoadscanEntity updateSignDistributionLoadscanEntity(DistributionLoadscanEntity loadscanEntity, BladeUser user, DistributionParcelListEntity parcelListEntity) {
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date());
-		loadscanEntity.setSigningTime(now);
-		loadscanEntity.setSignforState(2);
-		loadscanEntity.setOneClick(1);
-		loadscanEntity.setOneQclick(1);
-		loadscanEntity.setIsInsert(2);
-		loadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
-		loadscanEntity.setSigningUser(user.getNickName());
-		loadscanEntity.setSigningUserId(user.getUserId());
-		loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
-		loadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
+		DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
+		distributionLoadscanEntity.setId(loadscanEntity.getId());
+		distributionLoadscanEntity.setSigningTime(now);
+		distributionLoadscanEntity.setSignforState(2);
+		distributionLoadscanEntity.setOneClick(1);
+		distributionLoadscanEntity.setOneQclick(1);
+		distributionLoadscanEntity.setIsInsert(2);
+		distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
+		distributionLoadscanEntity.setSigningUser(user.getNickName());
+		distributionLoadscanEntity.setSigningUserId(user.getUserId());
+		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
+		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
 		if (loadscanEntity.getLoadedNub().equals(loadscanEntity.getReceivedQuantity())) {
-			loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
+			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
 
-		return loadscanEntity;
+		return distributionLoadscanEntity;
 
 	}