From 4005809b088eb5db8248966b38784808d03bc243 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jan 2024 16:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=8A=B6=E6=80=81=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistrilbutionBillLadingServiceImpl.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 c5cd087b7..4cdf92552 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
@@ -256,7 +256,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 											//xiugai
 											DistributionDeliveryDetailsEntity d = new DistributionDeliveryDetailsEntity();
 											d.setId(i.getId());
-											d.setConditions("1");
+											d.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 											distributionDeliveryDetailsService.updateById(d);
 										}
 									} else if (inventoryQuantity < quantity) {
@@ -367,7 +367,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 					distrilbutionBillStock.setBillLadingId(distrilbutionBillLading.getId());
 					distrilbutionBillStock.setStockArticleId(Long.parseLong(s));
-					distrilbutionBillStock.setConditions("1");
+					distrilbutionBillStock.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 					distrilbutionBillStock.setOrderStatus("1");
 					distrilbutionBillStockService.save(distrilbutionBillStock);
 					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
@@ -469,7 +469,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				details.setBillLadingId(distrilbutionBillLading.getId());
 				details.setStockListId(i.getId());
 				details.setQuantity(i.getInventoryQuantity());
-				details.setConditions("1");
+				details.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 				details.setRealityQuantity(0);
 				if (finalLas) {
 					details.setInventoryStatus("2");
@@ -903,6 +903,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 //					List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
 					List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 						.eq(DistrilbutionBillPackageEntity::getBillLadingId,vo.getBillLadingId())
+						.eq(DistrilbutionBillPackageEntity::getStockArticleId,s)
 						.apply("packet_bar_status in (1,3)")
 					);
 					int pn = list.size(); //包件数量