Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -60,6 +60,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
 		Long advanceId = advanceDetailEntity.getAdvanceId();
+		String tenantId = advanceDetailEntity.getTenantId();
 		log.info("############saveOrderAndPackage: 保存订单和包件信息 orderPackageCode={}",orderPackageCode);
 
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
@@ -107,6 +108,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			String waybillNo = advanceEntity.getWaybillNo();
 
 			stockArticleEntity = new DistributionStockArticleEntity();
+			stockArticleEntity.setTenantId(tenantId);
 			stockArticleEntity.setCreateUser(userId);
 			stockArticleEntity.setUpdateUser(userId);
 			stockArticleEntity.setCreateDept(deptId);
@@ -228,6 +230,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		parcelList.setCreateUser(userId);
 		parcelList.setUpdateUser(userId);
 		parcelList.setCreateDept(deptId);
+		parcelList.setTenantId(tenantId);
 		parcelList.setWarehouse(warehouseEntity.getName());
 		parcelList.setWarehouseId(warehouseId);
 		String waybillNo = advanceEntity.getWaybillNo();