From 1038fba30a737f017cbcc8eee46ee1494fe8c528 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 6 Sep 2023 18:06:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=9E=B6=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E8=BF=90=E5=8D=95=E5=88=9B=E5=BB=BA=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=9B=B6=E6=8B=85=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseUpdownTypeServiceImpl.java          | 4 ++--
 .../warehouse/service/impl/WarehouseWaybillServiceImpl.java   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 5db51fea1..a132947e3 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -211,14 +211,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
 			updownGoodsEntityQueryWrapper.eq("association_value",code);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper);
-			if(Objects.isNull(updownGoodsEntity)){
+			if(!Objects.isNull(updownGoodsEntity)){
 				log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);
 				throw new CustomerException(403,"包件已上架");
 			}
 			QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsEntityQueryWrapper = new QueryWrapper<>();
 			trayGoodsEntityQueryWrapper.eq("association_value",code);
 			WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
-			if(Objects.isNull(trayGoodsEntity)){
+			if(!Objects.isNull(trayGoodsEntity)){
 				log.warn("#################findUpShelfScanGoods: 包件已打托 code={}",code);
 				throw new CustomerException(403,"包件已打托");
 			}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 01bb235b3..a38d65099 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -217,7 +217,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 			distributionStockArticleEntity.setConsigneeUnit(customerName);//收货单位（经销商）
 			distributionStockArticleEntity.setConsigneePerson(warehouseWaybill.getConsigneeName());//收货人
-			distributionStockArticleEntity.setReserve1("zero");
+			distributionStockArticleEntity.setIsZero("1");
 			distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);
 			id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 			if (id == 0) {
@@ -236,7 +236,6 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			entity.setMaterialName(warehouseWayBillDetail.getProductName());
 			entity.setQuantity(warehouseWayBillDetail.getNum());
 			entity.setConditions(1);
-			entity.setReserve1("zero");
 			entity.setStockArticleId(id);
 			ls.add(entity);
 		}