From 157ce45e0801106072ef1061f84ebfb029acf549 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 2 Aug 2023 23:24:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WarehouseWarehousingEntryServiceImpl.java        | 2 +-
 .../service/impl/WarehouseWaybillServiceImpl.java         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index cbe715f7c..113a093c8 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -201,7 +201,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			}
 			distributionStockListEntity.setUnpack(false);
 //			distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
-			distributionStockListEntity.setOrderSelfNumbering(warehousingEntryDTO.getOrderNumber()); //订单自编号
+			distributionStockListEntity.setOrderCode(warehousingEntryDTO.getOrderNumber()); //订单自编号
 			distributionStockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch()); //入库批次号
 //			distributionStockListEntity.setServiceNumber("服务号"); //服务号
 			distributionStockListEntity.setDescriptionGoods(warehousingDetail.getProductName()); //货物名称
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 333546a63..7eee6f456 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
@@ -263,7 +263,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 			distributionStockArticleEntity = new DistributionStockArticleEntity();
 			distributionStockArticleEntity.setServiceNumber(warehouseWaybill.getServiceNo());
-			distributionStockArticleEntity.setOrderSelfNumbering(waybillNo);
+			distributionStockArticleEntity.setOrderCode(waybillNo);
 			distributionStockArticleEntity.setMallName(warehouseWaybill.getConsigneeName());
 			distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId());
 			distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName());
@@ -342,7 +342,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		log.info("###########splitOrder: 开始拆单 ");
 		Long articleId = distributionStockArticleEntity.getId();
 		Integer handQuantity = distributionStockArticleEntity.getHandQuantity();
-		String orderSelfNum = distributionStockArticleEntity.getOrderSelfNumbering();
+		String orderSelfNum = distributionStockArticleEntity.getOrderCode();
 		List<ProductDTO> submitList = new ArrayList<>();
 		List<DistributionStockArticleEntity> articleList = distributionStockArticleClient.likeOrderSelfNumbering(orderSelfNum);
 		int size = articleList.size();
@@ -350,7 +350,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			SplitOrderDTO splitOrderDTO = splitOrderDTOList.get(i);
 			DistributionStockArticleEntity entity = new DistributionStockArticleEntity();
 			BeanUtil.copyProperties(distributionStockArticleEntity,entity);
-			entity.setOrderSelfNumbering(entity.getOrderSelfNumbering()+"-"+size);
+			entity.setOrderCode(entity.getOrderCode()+"-"+size);
 			entity.setCustomerName(splitOrderDTO.getCustomerPerson());
 			entity.setCustomerTelephone(splitOrderDTO.getCustomerMobile());
 			entity.setCustomerAddress(splitOrderDTO.getCustomerAddress());
@@ -420,7 +420,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			}
 			distributionStockArticleEntity.setHandQuantity(handQuantity-allNum);
 			distributionStockArticleClient.submitHandQuantity(allNum,articleId);
-			String orderSelfNumbering = distributionStockArticleEntity.getOrderSelfNumbering();
+			String orderSelfNumbering = distributionStockArticleEntity.getOrderCode();
 			warehouseWaybillMapper.submitStockCount(orderSelfNumbering,allNum);
 			//删除主订单包件对应数据
 			for (ProductDTO productDTO:submitList){