From a4f1748b5de85cc3e028b2818ff83cf9e843fee1 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 17 Feb 2025 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E6=8F=90=E7=A4=BA=E3=80=81=E6=89=93=E5=8D=A1=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=B6=E9=97=B4BUG=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        | 2 +-
 .../logpm/warehouse/service/impl/TaskQuestServiceImpl.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 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 07a1d3cf5..d88b88818 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
@@ -5122,7 +5122,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		nodeFanoutMsg.setWarehouse(deliveryListEntity.getWarehouseName());
 		nodeFanoutMsg.setWarehouseId(deliveryListEntity.getWarehouseId());
 		nodeFanoutMsg.setOperator(AuthUtil.getTenantId());
-		nodeFanoutMsg.setOperatorTime(deliveryListEntity.getCreateTime());
+		nodeFanoutMsg.setOperatorTime(new Date());
 
 //		List<PlanDriverbindCarVO> planDriverbindCarVOS = distributionDeliveryListService.buildDeliveryCarDriverInfor(deliveryListEntity);
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
index 992e3d208..5aac3c7e9 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
@@ -2974,9 +2974,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 		for (QuestDetailEntity i : questDetailEntityList) {
 			if (i.getQuestStatus().equals(1)) {
-				if (!Objects.isNull(i.getAllocationId())){
-					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(Long.parseLong(i.getAllocationId()));
-					if (Objects.isNull(entityByAllocationId)){
+				if (!Objects.isNull(i.getGroundingAllocationId())){
+					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(i.getGroundingAllocationId());
+					if (!Objects.isNull(entityByAllocationId)){
 						return Resp.scanFail("当前包件在"+entityByAllocationId.getQrCode()+"已盘点！", "当前包件在"+entityByAllocationId.getQrCode()+"已盘点！");
 					}
 				}