From a2ca6580028f1d1583002c7516ff333f89b5e224 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 一月 2021 14:27:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/properties/SlaveProperties.java | 24 ++++++++++++++++++++++++
src/main/webapp/static/js/locMast/locMast.js | 4 ++--
src/main/resources/application.yml | 11 ++++++++++-
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/properties/SlaveProperties.java b/src/main/java/com/zy/common/properties/SlaveProperties.java
new file mode 100644
index 0000000..c5184c4
--- /dev/null
+++ b/src/main/java/com/zy/common/properties/SlaveProperties.java
@@ -0,0 +1,24 @@
+package com.zy.common.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/8/4
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "wcs-slave")
+public class SlaveProperties {
+
+ private boolean doubleDeep;
+
+ private List<Integer> doubleLocs = new ArrayList<>();
+
+ private int groupCount;
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 53bb2a9..169f6b8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,4 +45,13 @@
pwd: xltys1995
swagger:
- enable: false
\ No newline at end of file
+ enable: false
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
\ No newline at end of file
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 2c8959e..98692a4 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -54,8 +54,8 @@
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
- ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
- ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
+ // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+ // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
--
Gitblit v1.9.1