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);
 		}