Merge remote-tracking branch 'origin/dev' into pre-production

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);
 

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())){
+				if (!Objects.isNull(i.getGroundingAllocationId())){
-					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(Long.parseLong(i.getAllocationId()));
+					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(i.getGroundingAllocationId());
-					if (Objects.isNull(entityByAllocationId)){
+					if (!Objects.isNull(entityByAllocationId)){
 						return Resp.scanFail("当前包件在"+entityByAllocationId.getQrCode()+"已盘点！", "当前包件在"+entityByAllocationId.getQrCode()+"已盘点！");
 					}
 				}