From 58bf6aaeb2585429bc41ccd21b8ea5c3cf382bb7 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 15 May 2024 15:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BABUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/distribution/bean/MyExcelUtil.java  | 3 ++-
 .../mapper/DistributionDeliveryDetailsMapper.xml            | 2 +-
 .../distribution/mapper/DistrilbutionBillStockMapper.xml    | 6 +++---
 .../service/IDistrilbutionBillStockService.java             | 3 ++-
 .../service/impl/DistrilbutionBillLadingServiceImpl.java    | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java
index 675869c75..c516be587 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/MyExcelUtil.java
@@ -149,7 +149,8 @@ public class MyExcelUtil extends ExcelUtil {
 			if (Func.isNotEmpty(map.getBillInventoryExcelList())){
 				build.write(map.getBillInventoryExcelList(),inventoryList);
 			}
-
+			build.finish();
+			outputStream.close();
 		}catch (Exception e) {
 
 			throw new RuntimeException("请稍后再试....");
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 92fe0f51b..45267788b 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
@@ -117,7 +117,7 @@
         LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id
         LEFT JOIN logpm_distribution_stock lds on lds.bill_lading_id = lddd.bill_lading_id and lddd.stock_list_id = lds.stock_list_id
         <where>
-            lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,2)
+            lddd.bill_lading_id = #{param.billLadingId} and lddd.inventory_status in (1,3)
         </where>
     </select>
     <select id="getBillOrderInventoryExcel"
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index 6358d7356..0b5a6e528 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -441,13 +441,13 @@
         CASE ldsa.is_zero
         WHEN 0 THEN
         (select COUNT(id) from  logpm_distrilbution_bill_package
-        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)  and  bill_lading_id =  #{param.billLadingId}  AND is_deleted = 0 )
+        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)  and  bill_lading_id =  #{id}  AND is_deleted = 0 )
         ELSE
         (select sum(quantity) from  logpm_distribution_reservation_zero_package
-        where  stock_article_id = ldsa.id and zero_package_status in (1,3)  AND type =3 and  reservation_id = #{param.billLadingId}  AND is_deleted = 0 )
+        where  stock_article_id = ldsa.id and zero_package_status in (1,3)  AND type =3 and  reservation_id = #{id}  AND is_deleted = 0 )
         END handQuantity,
         (select IFNULL(sum(quantity) ,0) from  logpm_distribution_bill_lading_scan
-        where  stock_article_id = ldsa.id AND bill_lading_id =  #{param.billLadingId}  AND is_deleted = 0 ) pick_up_quantity,
+        where  stock_article_id = ldsa.id AND bill_lading_id =  #{id}  AND is_deleted = 0 ) pick_up_quantity,
         CASE
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) = 0 THEN '20'
         WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) > 0 THEN '10'
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
index b6b83e6cb..46952280f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillStockService.java
@@ -24,6 +24,7 @@ import com.logpm.distribution.excel.DistributionBillOrderExcel;
 import com.logpm.distribution.excel.DistributionBillOrderPackExcel;
 import com.logpm.distribution.excel.DistrilbutionBillStockExcel;
 import com.logpm.distribution.vo.*;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
@@ -103,7 +104,7 @@ public interface IDistrilbutionBillStockService extends BaseService<Distrilbutio
 	 * @param id
 	 * @return
 	 */
-	List<DistributionBillOrderExcel> distrilbutionBillDeatilStock(Long id);
+	List<DistributionBillOrderExcel> distrilbutionBillDeatilStock(@Param("id") Long id);
 
 	List<DistributionBillOrderPackExcel> billOrderPackExcel(Map<String, Object> distrilbutionBillStock);
 
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 d96677198..aec9dece3 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
@@ -1730,6 +1730,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
 						billPackageEntity.setPacketNumber(1);
 						billPackageEntity.setPacketBarStatus(1);
+						billPackageEntity.setBillType("1");
 						packageEntityList.add(billPackageEntity);
 						finalPackageIds.add(i.getParceListId());
 					});
@@ -3180,7 +3181,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistrilbutionBillPackageEntity::getParceListId, list4.get(0).getId())
 				);
 				if (ObjectUtils.isNull(one3)) {
-					return Resp.scanFail("不在本次自提计划！", "不在本次自提计划！");
+					return Resp.scanFail("不是本客户的货！", "不是本客户的货！");
 				}
 
 				if ("20".equals(one2.getConditions())) {