From 1c04c6a9607b7d4543989c73a1ae91274bbb167c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 15 Mar 2022 18:34:05 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
index 99c0860..d261d4e 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -119,13 +119,18 @@
newSetting10.setCategory("店务配置");
newSettings.add(newSetting10);
+ ParameterSettings newSetting11=new ParameterSettings();
+ newSetting11.setCode(AppConstance.OPEN_SERVICE_ORDER_AUTO_BATCHING);
+ newSetting11.setName("开启服务单自动配料");
+ newSetting11.setType(1);
+ newSetting11.setCategory("店务配置");
+ newSettings.add(newSetting11);
+
for (ParameterSettings newSetting : newSettings) {
List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
if(CollectionUtil.isEmpty(parameterSettings)){
parameterSettingsDao.insert(newSetting);
System.out.println("新增配置"+newSetting.getName());
- }else {
- System.out.println("配置"+newSetting.getName()+"已经存在");
}
addSettingsTOAllCompany(newSetting);
}
@@ -144,8 +149,6 @@
busParameterSettings.setParamValue("");
busParameterSettingsDao.insert(busParameterSettings);
System.out.println(sysCompany.getComName()+"新增成功");
- }else{
- System.out.println("公司"+sysCompany.getComName()+"已经存在配置"+newSetting.getName());
}
}
--
Gitblit v1.9.1