入库单BUG修复

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -284,14 +284,26 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 		} else {
 			//查询库存品信息
 			DistributionStockListEntity stockListEntity = new DistributionStockListEntity();
-			stockListEntity.setStoreId(warehousingEntryDTO.getStoreId());
-			stockListEntity.setMarketId(warehousingEntryDTO.getClientId());
-			stockListEntity.setMaterialId(warehousingDetail.getMaterialId());
-			stockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch());
+//			stockListEntity.setStoreId(warehousingEntryDTO.getStoreId());
+//			stockListEntity.setMarketId(warehousingEntryDTO.getClientId());
+//			stockListEntity.setMaterialId(warehousingDetail.getMaterialId());
+//			stockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch());
 			DistributionStockListVO queryData = distributionStockListClient.getQueryData(stockListEntity);
 
 
-			//添加
+			//导入
+
+			if (Func.isNotEmpty(queryData)) {
+//				distributionStockListEntity.setQuantityStock( queryData.getQuantityStock()+num  ); //库存数量
+//				distributionStockListEntity.setOutboundQuantity(queryData.getOutboundQuantity()); //出库数量
+				//修改
+				DistributionStockListEntity distributionStockList = new DistributionStockListEntity();
+				distributionStockList.setQuantityStock(queryData.getQuantityStock() + num);
+				distributionStockList.setOutboundQuantity(queryData.getOutboundQuantity());
+				distributionStockList.setId(queryData.getId());
+				distributionStockListClient.getUpdateStockList(distributionStockList);
+			} else {
+//添加
 				DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 				distributionStockListEntity.setUnpack(false);
 //			distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
@@ -335,24 +347,13 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				distributionStockListEntity.setOutboundQuantity(0); //出库数量
 				distributionStockListEntity.setUnpackingQuantity(0); //库存拆包数量
 				distributionStockListEntity.setSku(warehousingDetail.getSku());
-			distributionStockListEntity.setSourceType("2");//导入
-
-			if (Func.isNotEmpty(queryData)) {
-//				distributionStockListEntity.setQuantityStock( queryData.getQuantityStock()+num  ); //库存数量
-//				distributionStockListEntity.setOutboundQuantity(queryData.getOutboundQuantity()); //出库数量
-				//修改
-				DistributionStockListEntity distributionStockList = new DistributionStockListEntity();
-				distributionStockList.setQuantityStock(queryData.getQuantityStock() + num);
-				distributionStockList.setOutboundQuantity(queryData.getOutboundQuantity());
-				distributionStockList.setId(queryData.getId());
-				distributionStockListClient.getUpdateStockList(distributionStockList);
-			} else {
-
+				distributionStockListEntity.setSourceType("2");
 				distributionStockListClient.getAddStockList(distributionStockListEntity);
+				stockListEntity = distributionStockListEntity;
 			}
 
 			DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
-			BeanUtil.copyProperties(distributionStockListEntity, distributionStockListInfo);
+			BeanUtil.copyProperties(stockListEntity, distributionStockListInfo);
 			distributionStockListInfo.setSourceType("2");//导入
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}