From 641cf98f2b6abf30d454390f3a5c5b30800def45 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 29 Apr 2024 22:57:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E4=B8=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=8E=B7=E5=8F=96=E6=B2=A1=E6=9C=89=E5=9C=A8=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E4=BB=BB=E5=8A=A1=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskQuestServiceImpl.java    | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

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 72c629b81..8c40c3db9 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
@@ -2084,33 +2084,41 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 						case "3": //3包件码
 							//查询订单ID
 							//查询订单信息
-							questDetail.setQuestTarget(1);//
-							questDetail.setOrderPackageCode(i.getAssociationValue());//包条码
-							questDetail.setOrderPackageId(i.getAssociationId());//包件ID
-							DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
-							parcelList.setId(i.getAssociationId());
-							parcelList.setOrderPackageCode(i.getAssociationValue());
-							List<DistributionParcelListEntity> parcelList1 = distributionParcelListClient.getParcelList(parcelList);
-							if (!parcelList1.isEmpty()) {
-								questDetail.setOrderId(parcelList1.get(0).getStockArticleId());
-							} else {
-								continue;
-							}
-							DistributionStockArticleEntity distributionStockArticleEntity = getStockArticleInfo(parcelList1.get(0).getStockArticleId());
-//							if (!list.stream().anyMatch(d -> d.getRefName().equals(distributionStockArticleEntity.getMallName()))) {
+//							questDetail.setQuestTarget(1);//
+//							questDetail.setOrderPackageCode(i.getAssociationValue());//包条码
+//							questDetail.setOrderPackageId(i.getAssociationId());//包件ID
+//							DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
+//							parcelList.setId(i.getAssociationId());
+//							parcelList.setOrderPackageCode(i.getAssociationValue());
+//							List<DistributionParcelListEntity> parcelList1 = distributionParcelListClient.getParcelList(parcelList);
+//							if (!parcelList1.isEmpty()) {
+//								questDetail.setOrderId(parcelList1.get(0).getStockArticleId());
+//							} else {
 //								continue;
 //							}
-							questDetail.setOrderCode(distributionStockArticleEntity.getOrderCode());//
-							WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = getUpdownGoodsPack(i.getAssociationId(), "3", i.getAssociationValue(), warehouseId);
-
-							if (Optional.ofNullable(warehouseUpdownGoodsEntity).isPresent()) {
-								questDetail.setPositionCode(warehouseUpdownGoodsEntity.getPositionCode());//完整货位
-								questDetail.setAllocationId(String.valueOf(warehouseUpdownGoodsEntity.getAllocationId()));
-							}
-							questDetail.setIsNew(0);//是否新增
+//							DistributionStockArticleEntity distributionStockArticleEntity = getStockArticleInfo(parcelList1.get(0).getStockArticleId());
+////							if (!list.stream().anyMatch(d -> d.getRefName().equals(distributionStockArticleEntity.getMallName()))) {
+////								continue;
+////							}
+//							questDetail.setOrderCode(distributionStockArticleEntity.getOrderCode());//
+//							WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = getUpdownGoodsPack(i.getAssociationId(), "3", i.getAssociationValue(), warehouseId);
+//
+//							if (Optional.ofNullable(warehouseUpdownGoodsEntity).isPresent()) {
+//								questDetail.setPositionCode(warehouseUpdownGoodsEntity.getPositionCode());//完整货位
+//								questDetail.setAllocationId(String.valueOf(warehouseUpdownGoodsEntity.getAllocationId()));
+//							}
+//							questDetail.setIsNew(0);//是否新增
+							DistributionParcelListEntity byPacketBarCodeAndWarehouseId = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(i.getAssociationValue(), warehouseId);
+							questDetail =buildQuestDetailEntity(taskSearchDTO.getQuestId(),byPacketBarCodeAndWarehouseId,user,null);
 							break;
 						case "4": //4库存品
-
+							questDetail.setCreateUser(user.getUserId());
+							questDetail.setCreateDept(Long.parseLong(user.getDeptId().split(",")[0]));
+							questDetail.setStatus(1);
+							questDetail.setIsDeleted(0);
+							Date date = new Date();
+							questDetail.setCreateTime(date);
+							questDetail.setUpdateTime(date);
 							questDetail.setQuestTarget(3);//
 							DistributionStockListEntity stockListEntity = new DistributionStockListEntity();
 							stockListEntity.setIncomingBatch(i.getIncomingBatch());
@@ -2138,14 +2146,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 							break;
 					}
 
-					questDetail.setCreateUser(user.getUserId());
-					Date date = new Date();
-					questDetail.setHasData(1);
-					questDetail.setCreateTime(date);
-					questDetail.setUpdateTime(date);
-					questDetail.setCreateDept(Long.parseLong(user.getDeptId().split(",")[0]));
-					questDetail.setStatus(1);
-					questDetail.setIsDeleted(0);
+
+
 					questDetail.setQuestType(4);//托盘
 					questDetail.setQuestStatus(0); //包件盘点状态
 					questDetail.setStockNum(i.getNum()); //数量
@@ -2154,6 +2156,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					questDetail.setTrayId(String.valueOf(trayByTrayCode.getId()));
 					questDetail.setAllocationId(String.valueOf(trayByTrayCode.getId()));
 					questDetail.setIsNew(0);//是否新增
+
+
+					// 增加商场信息
+
 					questDetailList.add(questDetail);
 				}
 				//添加