From abc5d62ac075f7e50cb6afa04fbe8506361fcb1f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 16 Oct 2024 14:39:45 +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=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=9F=B3=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockListMapper.xml    | 28 +++++++++++--------
 .../DistributionParcelListServiceImpl.java    |  5 +++-
 .../service/impl/TaskQuestServiceImpl.java    |  7 +++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 5a63c32cb..8807419b5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -399,21 +399,27 @@
     </select>
 
     <select id="listAllocationOrder" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
-        select lwug.position_code allocationTitle,
+        SELECT
+        lwga.qr_code AS allocationTitle,
         lwug.allocation_id,
-        ldsi.market_name marketName,
-        sum(lwug.num) num,
-        lwug.create_time createTime,
-        ldsi.cargo_unit cargoUnit,
+        ldsi.market_name AS marketName,
+        sum( lwug.num ) AS num,
+        lwug.create_time AS createTime,
+        ldsi.cargo_unit AS cargoUnit,
         ldsi.unpack,
-        ldsi.quantity_stock quantityStock,
-        ldsi.unpacking_quantity unpackingQuantity,
-        ldsi.description_goods descriptionGoods
+        ldsi.quantity_stock AS quantityStock,
+        ldsi.unpacking_quantity AS unpackingQuantity,
+        ldsi.description_goods AS descriptionGoods
         FROM
         logpm_distribution_stock_list ldsi
-        left join logpm_distribution_stock_list_info ldsli on ldsli.material_id = ldsi.material_id AND ldsli.warehouse_id = ldsi.warehouse_id
-        AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
-        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
+        LEFT JOIN logpm_distribution_stock_list_info ldsli ON ldsli.material_id = ldsi.material_id
+        AND ldsli.warehouse_id = ldsi.warehouse_id
+        AND ldsi.market_id = ldsli.market_id
+        AND ldsli.incoming_batch = ldsi.incoming_batch
+        AND ldsli.tenant_id = '627683'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id
+        AND lwug.association_type = '3'
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id
         <where>
             lwug.id is not null
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>
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 5fe46467f..30b3cc3ee 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
@@ -1053,7 +1053,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					warehouseUpdownGoodsEntity.setAssociationValue(distributionParcelListEntity.getOrderPackageCode());
 					WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
 					if (Func.isNotEmpty(locationInformation)) {
-						distributionStockListInfo.setStorageLocation(locationInformation.getPositionCode());
+						BasicdataGoodsAllocationEntity entityByAllocationId = allocationClient.getEntityByAllocationId(locationInformation.getAllocationId());
+						if (!Objects.isNull(entityByAllocationId)){
+							distributionStockListInfo.setStorageLocation(entityByAllocationId.getQrCode());
+						}
 					}
 					distributionStockListInfo.setFactory(distributionStockArticleEntity.getFactoryTrain());
 					distributionStockListInfo.setDespatch(distributionStockArticleEntity.getTrainNumber());
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 6cfdecaf2..992e3d208 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,6 +2974,13 @@ 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)){
+						return Resp.scanFail("当前包件在"+entityByAllocationId.getQrCode()+"已盘点！", "当前包件在"+entityByAllocationId.getQrCode()+"已盘点！");
+					}
+				}
+
 				return Resp.scanFail("当前包件已盘点！", "当前包件已盘点！");
 			}
 		}