From ab5b669c88e433f90559230c19b5a2c02bfd7a02 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 31 Oct 2023 16:02:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=89=E6=95=B0=E6=8D=AE=E8=BD=AC=E4=BA=86?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E4=B9=9F=E8=83=BD=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/warehouse/vo/UpShelfDataVO.java |  1 +
 .../impl/WarehouseTrayTypeServiceImpl.java    | 16 +++++++-------
 .../impl/WarehouseUpdownTypeServiceImpl.java  |  1 +
 .../impl/WarehouseWaybillServiceImpl.java     | 21 ++++++++-----------
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
index 6624dbc7a..4b84ab3fc 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
@@ -21,5 +21,6 @@ public class UpShelfDataVO implements Serializable {
 	private String materialName;//物料名称
 	private String incomingBatch;//批次号
 	private Integer goodsType;//货物类型
+	private Integer conditions;//1 订制品 2库存品
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 18d2bfcb1..4ae44fe00 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -418,10 +418,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			return Resp.scanFail(2001,"包件不在当前仓","包件不在当前仓");
 		}
 
-		if(conditions.equals(2)){
-			log.warn("##############orderScanOrderPackageCode: 包件已转库存品 orderPackageCode={} conditions={}",orderPackageCode,conditions);
-			return Resp.scanFail(2001,"包件已转库存品","包件已转库存品");
-		}
+//		if(conditions.equals(2)){
+//			log.warn("##############orderScanOrderPackageCode: 包件已转库存品 orderPackageCode={} conditions={}",orderPackageCode,conditions);
+//			return Resp.scanFail(2001,"包件已转库存品","包件已转库存品");
+//		}
 
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,warehouseId);
 		if(Objects.isNull(stockArticleEntity)){
@@ -609,10 +609,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			return Resp.scanFail(2001,"包件不在当前仓","包件不在当前仓");
 		}
 
-		if(conditions.equals(2)){
-			log.warn("##############orderScanOrderPackageCode: 包件已转库存品 orderPackageCode={} conditions={}",orderPackageCode,conditions);
-			return Resp.scanFail(2001,"包件已转库存品","包件已转库存品");
-		}
+//		if(conditions.equals(2)){
+//			log.warn("##############orderScanOrderPackageCode: 包件已转库存品 orderPackageCode={} conditions={}",orderPackageCode,conditions);
+//			return Resp.scanFail(2001,"包件已转库存品","包件已转库存品");
+//		}
 
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,warehouseId);
 		if(Objects.isNull(stockArticleEntity)){
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 a26a5cbb9..46371867e 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
@@ -345,6 +345,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			dataVO.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
 			dataVO.setTotalNum(1);
 			dataVO.setGoodsType(0);
+			dataVO.setConditions(parcelListEntity.getConditions());
 			ls.add(dataVO);
 			return ls;
 		}else if(upshelfScanType == 4){
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 86bba94a4..7e77cc81c 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
@@ -252,7 +252,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			}
 
 			//第一次生成订单也要生成包件信息
-			List<DistributionParcelListEntity> ls = new ArrayList<>();
+			List<DistributionParcelNumberEntity> parcelNumberList = new ArrayList<>();
 			for (WarehouseWayBillDetail warehouseWayBillDetail : details) {
 				DistributionParcelListEntity entity = new DistributionParcelListEntity();
 				entity.setFirsts(warehouseWayBillDetail.getProductName());
@@ -278,20 +278,15 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				entity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName());
 				entity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId());
 				entity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName());
-				ls.add(entity);
-
-			}
-			boolean b = distributionParcelListClient.addBatch(ls);
-			if (!b) {
-				log.warn("#################createStockArticle: 保存包件信息失败  orderSelfNum={}", waybillNo);
-				throw new CustomerException(405, "保存包件信息失败");
-			}
+				Long aLong = distributionParcelListClient.addReturnId(entity);
 
-			List<DistributionParcelNumberEntity> parcelNumberList = new ArrayList<>();
-			for (DistributionParcelListEntity entity:ls){
 				DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
 				parcelNumberEntity.setStockArticleId(id);
-				parcelNumberEntity.setParcelListId(entity.getId());
+				parcelNumberEntity.setParcelListId(aLong);
+				parcelNumberEntity.setTenantId("627683");
+				parcelNumberEntity.setCreateUser(distributionStockArticleEntity.getCreateUser());
+				parcelNumberEntity.setUpdateUser(distributionStockArticleEntity.getCreateUser());
+				parcelNumberEntity.setCreateDept(distributionStockArticleEntity.getCreateDept());
 				if(totalCount.equals(stockCount)){
 					parcelNumberEntity.setHandQuantity(entity.getQuantity());
 				}else{
@@ -302,9 +297,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				parcelNumberEntity.setSigninQuantity(0);
 				parcelNumberEntity.setOutboundQuantity(0);
 				parcelNumberList.add(parcelNumberEntity);
+
 			}
 			//存入零担订单包件数量
 			distributionParcelNumberClient.addBatch(parcelNumberList);
+
 		} else {
 
 			id = distributionStockArticleEntity.getId();