Merge branch 'dev' into test

2 years ago · 86e18e371a
1 changed files with 2 additions and 1 deletions
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@ -369,7 +369,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				}

 				String customerName = advanceEntity.getCustomerName();//客户名称
-				//通过客户名称去查询客户的服务类型
+				//通过客户名称去查询客户的服务类型、
+				distributionStockArticleEntity.setTypeService(1);//默认商配
 				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName);
 				if(!Objects.isNull(basicdataClientEntity)){
 					Long clientEntityId = basicdataClientEntity.getId();//基础客户