From 30c6d8163f584ed88b2f17f0904807c0c507bb98 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 12 Jan 2024 00:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionAsyncServiceImpl.java         | 3 ++-
 .../service/impl/DistrilbutionBillLadingServiceImpl.java   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 20575f547..431b6dc21 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -29,6 +29,7 @@ import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant;
 import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
+import org.springblade.common.constant.billLading.BillLadingStatusConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
@@ -222,7 +223,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	public Boolean getBillStock(Long id) {
 		DistrilbutionBillStockEntity distrilbutionBillStock = new DistrilbutionBillStockVO();
 		distrilbutionBillStock.setId(id);
-		distrilbutionBillStock.setConditions("2");
+		distrilbutionBillStock.setConditions("20");
 		return distrilbutionBillStockService.updateById(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 0551f82b0..f095b5d5d 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
@@ -1478,7 +1478,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distributionBillLadingScan.setMaterialType((String) type);
 			distributionBillLadingScan.setBillLadingId(Long.parseLong(billLadingId.toString()));
 			distributionBillLadingScan.setScanType(1); //扫描
-			if (type.equals("1")) {
+			if ("1".equals(type)) {
 				//库存品
 				DistrilbutionBillLadingInventoryAppVO inventoryAppVO = distributionDeliveryDetailsService.listCode(String.valueOf(billLadingId), String.valueOf(coding));
 				if (ObjectUtils.isNotNull(inventoryAppVO)) {
@@ -1517,12 +1517,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 				DistrilbutionBillStockEntity one2 = distrilbutionBillStockService.getOne(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 					.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
+						.apply("order_status in (1 , 2)")
 					.eq(DistrilbutionBillStockEntity::getStockArticleId, list4.get(0).getStockArticleId())
 				);
 				if(ObjectUtils.isNull(one2)){
 					return Resp.scanFail("不在本次自提计划！","不在本次自提计划！");
 				}
-				if(one2.getConditions().equals("2")){
+				if("20".equals(one2.getConditions())){
 					return Resp.scanFail("当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！","当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！");
 				}
 
@@ -2161,7 +2162,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		DistrilbutionBillStockEntity one = distrilbutionBillStockService.getOne(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 			.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
 			.eq(DistrilbutionBillStockEntity::getStockArticleId, i.getStockArticleId())
-			.eq(DistrilbutionBillStockEntity::getConditions, "2")
+			.eq(DistrilbutionBillStockEntity::getConditions, "20")
 		);
 		if(ObjectUtils.isNotNull(one)){
 			return Resp.scanFail("已签收！","已签收！");