From 639385bba43f958f8a5797db14682e88859062b9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 1 Apr 2024 11:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=AD=BE=E6=94=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryDetailsMapper.java        | 2 +-
 .../mapper/DistributionDeliveryDetailsMapper.xml         | 9 ++++++---
 .../service/IDistributionDeliveryDetailsService.java     | 2 +-
 .../impl/DistributionDeliveryDetailsServiceImpl.java     | 4 ++--
 .../service/impl/DistrilbutionBillLadingServiceImpl.java | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java
index a77aed036..4d65bdd3c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.java
@@ -67,7 +67,7 @@ public interface DistributionDeliveryDetailsMapper extends BaseMapper<Distributi
 	 * @param coding
 	 * @return
 	 */
-	List<DistrilbutionBillLadingInventoryAppVO> listCode(@Param("billLadingId") String billLadingId,@Param("coding") String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(@Param("billLadingId") String billLadingId);
 
     IPage<DistributionBillInventoryVO> getBillOrderInventory(IPage<Object> page, @Param("param") DistributionDeliveryDetailsEntity deliveryDetails);
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
index 32ab028c6..ad3645d37 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
@@ -75,13 +75,16 @@
         where lddd.bill_lading_id = #{id} and lddd.is_deleted = 0
     </select>
     <select id="listCode" resultType="com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO">
-     select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId
+        select
+            lddd.quantity,
+            lddd.stock_list_id stockListId,
+            lddd.id ldddId
         from logpm_distribution_delivery_details lddd
-<!--        LEFT-->
-<!--        JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id-->
         where
         lddd.is_deleted = 0
         and lddd.bill_lading_id = #{billLadingId}
+        <!--        LEFT-->
+        <!--        JOIN logpm_distribution_stock lds on lddd.stock_list_id = lds.stock_list_id-->
 <!--        and lds.coding = #{coding}-->
 <!--        select lddd.quantity,lddd.stock_list_id stockListId,lddd.id ldddId-->
 <!--        from logpm_distribution_delivery_details lddd-->
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java
index f7f7c3462..44268aa47 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryDetailsService.java
@@ -61,7 +61,7 @@ public interface IDistributionDeliveryDetailsService extends BaseService<Distrib
 	 */
     DistributionDeliveryDetailsVO oneListNum(Long billLadingId);
 
-	List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding);
+	List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId);
 
 	/**
 	 * 自提库存品查询
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java
index fcf1dceb1..23a0d3e48 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryDetailsServiceImpl.java
@@ -77,8 +77,8 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl<Dist
 	}
 
 	@Override
-	public List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId, String coding) {
-		return baseMapper.listCode(billLadingId,coding) ;
+	public List<DistrilbutionBillLadingInventoryAppVO> listCode(String billLadingId) {
+		return baseMapper.listCode(billLadingId) ;
 	}
 
 	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index ffc33296e..62eb2bcbf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -1810,7 +1810,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//扫描
 			if ("1".equals(type)) {
 				//查询该自提单存在几种品类的库存品
-				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
+				List<DistrilbutionBillLadingInventoryAppVO> inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId));
 				if (ObjectUtils.isNotNull(inventoryAppVO)) {
 					List<Long> stocklistIds = inventoryAppVO.stream().map(DistrilbutionBillLadingInventoryAppVO::getStockListId).collect(Collectors.toList());
 					//查询该自提单所有的库存品包件信息