wms / wms_ningbohuazhang · Commits

Commit ed681064dce004f8dc90ba378c65dbe95ae75884

Authored by mahuandong
2 parents f71482cf bf4caf6a
webservice ... bytearray develop test

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 36 changed files with 359 additions and 890 deletions
.gitignore
  View file @ed68106
... ... @@ -11,6 +11,8 @@ target/
11 11 *.iml
12 12 *.ipr
13 13 .idea/workspace.xml
  14 +.idea/compiler.xml
  15 +
14 16  
15 17 ### NetBeans ###
16 18 /nbproject/private/
... ...
.idea/compiler.xml
  View file @ed68106
... ... @@ -6,7 +6,7 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="WMSV1" />
  9 + <module name="wms2" />
10 10 <module name="huaheng" />
11 11 </profile>
12 12 </annotationProcessing>
... ... @@ -15,6 +15,7 @@
15 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
16 16 <module name="WMSV1" options="-parameters" />
17 17 <module name="huaheng" options="-parameters" />
  18 + <module name="wms2" options="-parameters" />
18 19 </option>
19 20 </component>
20 21 </project>
21 22 \ No newline at end of file
... ...
.idea/encodings.xml
  View file @ed68106
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3   - <component name="Encoding">
  3 + <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
4 4 <file url="file://$PROJECT_DIR$" charset="UTF-8" />
  5 + <file url="PROJECT" charset="UTF-8" />
5 6 </component>
6 7 </project>
7 8 \ No newline at end of file
... ...
.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: com.baomidou:mybatis-plus:3.1.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: commons-fileupload:commons-fileupload:1.4">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__commons_io_commons_io_2_2.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: commons-io:commons-io:2.2">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: org.mybatis:mybatis:3.5.1">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: org.mybatis:mybatis-spring:2.0.1">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml deleted
View file @f71482c
1   -<component name="libraryTable">
2   - <library name="Maven: org.projectlombok:lombok:1.18.8">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/misc.xml
  View file @ed68106
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ExternalStorageConfigurationManager" enabled="true" />
  4 + <component name="JavaScriptSettings">
  5 + <option name="languageLevel" value="ES6" />
  6 + </component>
4 7 <component name="MavenProjectsManager">
5 8 <option name="originalFiles">
6 9 <list>
... ...
... ... @@ -5,16 +5,16 @@
5 5  
6 6 <groupId>com.huaheng</groupId>
7 7 <artifactId>huaheng</artifactId>
8   - <version>2.3.0</version>
  8 + <version>4.0.0</version>
9 9 <packaging>jar</packaging>
10 10  
11 11 <name>huaheng</name>
12   - <description>华恒管理系统</description>
  12 + <description>华恒WMS管理系统</description>
13 13  
14 14 <parent>
15 15 <groupId>org.springframework.boot</groupId>
16 16 <artifactId>spring-boot-starter-parent</artifactId>
17   - <version>2.0.3.RELEASE</version>
  17 + <version>2.1.3.RELEASE</version>
18 18 <relativePath />
19 19 </parent>
20 20  
... ... @@ -22,20 +22,20 @@
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24 24 <java.version>1.8</java.version>
25   - <shiro.version>1.4.0</shiro.version>
  25 + <shiro.version>1.4.1</shiro.version>
26 26 <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
27 27 <!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>-->
28 28 <pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version>
29   - <fastjson.version>1.2.47</fastjson.version>
30   - <druid.version>1.1.10</druid.version>
31   - <commons.io.version>2.2</commons.io.version>
  29 + <fastjson.version>1.2.59</fastjson.version>
  30 + <druid.version>1.1.18</druid.version>
  31 + <commons.io.version>2.5</commons.io.version>
32 32 <commons.fileupload.version>1.4</commons.fileupload.version>
33   - <bitwalker.version>1.19</bitwalker.version>
  33 + <bitwalker.version>1.21</bitwalker.version>
34 34 <lombok.version>1.18.8</lombok.version>
35 35 <velocity.version>1.7</velocity.version>
36 36 <kaptcha.version>2.3.2</kaptcha.version>
37   - <swagger.version>2.7.0</swagger.version>
38   - <jsoup.version>1.11.3</jsoup.version>
  37 + <swagger.version>2.9.2</swagger.version>
  38 + <jsoup.version>1.12.1</jsoup.version>
39 39 <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
40 40 </properties>
41 41  
... ... @@ -114,16 +114,10 @@
114 114 </dependency>
115 115  
116 116 <!--阿里数据库连接池 -->
117   -<!-- <dependency>
118   - <groupId>com.alibaba</groupId>
119   - <artifactId>druid-spring-boot-starter</artifactId>
120   - <version>${druid.version}</version>
121   - </dependency>-->
122   -
123 117 <dependency>
124 118 <groupId>com.alibaba</groupId>
125 119 <artifactId>druid-spring-boot-starter</artifactId>
126   - <version>1.1.17</version>
  120 + <version>${druid.version}</version>
127 121 </dependency>
128 122  
129 123 <!--常用工具类 -->
... ... @@ -199,12 +193,12 @@
199 193 <groupId>org.quartz-scheduler</groupId>
200 194 <artifactId>quartz</artifactId>
201 195 <version>2.3.1</version>
202   - <exclusions>
  196 + <!--<exclusions>
203 197 <exclusion>
204 198 <groupId>com.mchange</groupId>
205 199 <artifactId>c3p0</artifactId>
206 200 </exclusion>
207   - </exclusions>
  201 + </exclusions>-->
208 202 </dependency>
209 203  
210 204 <!--velocity代码生成使用模板 -->
... ... @@ -262,51 +256,13 @@
262 256 <!--<version>6.0.0</version>-->
263 257 <!--</dependency>-->
264 258  
265   - <!--共享Session-spring-session-data-redis分布式系统中-->
266   - <dependency>
267   - <groupId>org.springframework.session</groupId>
268   - <artifactId>spring-session-data-redis</artifactId>
269   - </dependency>
270   - <!-- Spring Boot Redis依赖 -->
271   - <dependency>
272   - <groupId>org.springframework.boot</groupId>
273   - <artifactId>spring-boot-starter-data-redis</artifactId>
274   - <!-- 1.5的版本默认采用的连接池技术是jedis 2.0以上版本默认连接池是lettuce, 在这里采用jedis，所以需要排除lettuce的jar -->
275   - <exclusions>
276   - <exclusion>
277   - <groupId>redis.clients</groupId>
278   - <artifactId>jedis</artifactId>
279   - </exclusion>
280   - <exclusion>
281   - <groupId>io.lettuce</groupId>
282   - <artifactId>lettuce-core</artifactId>
283   - </exclusion>
284   - </exclusions>
285   - </dependency>
286   -
287   - <!-- 添加jedis客户端 -->
288   - <dependency>
289   - <groupId>redis.clients</groupId>
290   - <artifactId>jedis</artifactId>
291   - </dependency>
292   -
293   - <!--spring2.0集成redis所需common-pool2-->
294   - <!-- 必须加上，jedis依赖此 -->
295   - <dependency>
296   - <groupId>org.apache.commons</groupId>
297   - <artifactId>commons-pool2</artifactId>
298   - <version>2.5.0</version>
299   - </dependency>
300   -
301   - <!-- 将作为Redis对象序列化器 -->
  259 + <!--json库-->
302 260 <dependency>
303 261 <groupId>com.alibaba</groupId>
304 262 <artifactId>fastjson</artifactId>
305   - <version>1.2.47</version>
  263 + <version>${fastjson.version}</version>
306 264 </dependency>
307 265  
308   -
309   -
310 266 <dependency>
311 267 <groupId>org.apache.httpcomponents</groupId>
312 268 <artifactId>httpclient</artifactId>
... ... @@ -317,25 +273,29 @@
317 273 <artifactId>httpcore</artifactId>
318 274 </dependency>
319 275  
320   -
321 276 <dependency>
322 277 <groupId>org.springframework.boot</groupId>
323 278 <artifactId>spring-boot-starter-mail</artifactId>
324 279 </dependency>
325 280  
326   -
327   -
328 281 <dependency>
329 282 <groupId>com.google.code.gson</groupId>
330 283 <artifactId>gson</artifactId>
331 284 <version>2.8.2</version>
332 285 </dependency>
333 286  
334   - <dependency>
  287 +<!-- <dependency>
335 288 <groupId>com.huaheng.soft</groupId>
336 289 <artifactId>echarts</artifactId>
337 290 <version>1.1</version>
338   - </dependency>
  291 + </dependency>-->
  292 +
  293 + <dependency>
  294 + <groupId>com.github.abel533</groupId>
  295 + <artifactId>ECharts</artifactId>
  296 + <version>3.0.0.5</version>
  297 + </dependency>
  298 +
339 299 <dependency>
340 300 <groupId>org.junit.jupiter</groupId>
341 301 <artifactId>junit-jupiter-api</artifactId>
... ... @@ -392,6 +352,38 @@
392 352 </plugins>
393 353 </build>
394 354  
  355 + <!--阿里maven地址-->
  356 + <!--<repositories>
  357 + <repository>
  358 + <id>nexus-aliyun</id>
  359 + <name>Nexus aliyun</name>
  360 + <layout>default</layout>
  361 + <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
  362 + <snapshots>
  363 + <enabled>false</enabled>
  364 + </snapshots>
  365 + <releases>
  366 + <enabled>true</enabled>
  367 + </releases>
  368 + </repository>
  369 + </repositories>
  370 +
  371 + <pluginRepositories>
  372 + <pluginRepository>
  373 + <id>nexus-aliyun</id>
  374 + <name>Nexus aliyun</name>
  375 + <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
  376 + <snapshots>
  377 + <enabled>false</enabled>
  378 + </snapshots>
  379 + <releases>
  380 + <enabled>true</enabled>
  381 + </releases>
  382 + </pluginRepository>
  383 + </pluginRepositories>-->
  384 +
  385 + <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
  386 +
395 387 <repositories>
396 388 <repository>
397 389 <id>nexus</id>
... ...
src/main/java/com/huaheng/HuaHengApplication.java
  View file @ed68106
... ... @@ -10,8 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
10 10 *
11 11 * @author huaheng
12 12 */
13   -//@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
14   -@MapperScan("com.huaheng.pc.**.**.mapper")
  13 +@MapperScan({"com.huaheng.pc.**.**.mapper","com.huaheng.common.**.**.mapper"})
15 14 //添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错
16 15 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
17 16 public class HuaHengApplication
... ... @@ -20,7 +19,7 @@ public class HuaHengApplication
20 19 {
21 20 // System.setProperty("spring.devtools.restart.enabled", "false");
22 21 SpringApplication.run(HuaHengApplication.class, args);
23   - System.out.println("(♥◠‿◠)ﾉﾞ 华恒启动成功 ლ(´ڡ`ლ)ﾞ \n" +
  22 + System.out.println("*************** 华恒WMS启动成功 ***************\n" +
24 23 " .-------. ____ __ \n" +
25 24 " | _ _ \\ \\ \\ / / \n" +
26 25 " | ( ' ) | \\ _. / ' \n" +
... ...
src/main/java/com/huaheng/common/redis/RedisConfig.java deleted
View file @f71482c
1   -package com.huaheng.common.redis;
2   -
3   -import org.springframework.beans.factory.annotation.Autowired;
4   -import org.springframework.context.annotation.Bean;
5   -import org.springframework.context.annotation.Configuration;
6   -import org.springframework.data.redis.connection.RedisConnectionFactory;
7   -import org.springframework.data.redis.core.*;
8   -import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
9   -import org.springframework.data.redis.serializer.StringRedisSerializer;
10   -
11   -@Configuration
12   -public class RedisConfig {
13   -
14   - /**
15   - * 注入 RedisConnectionFactory
16   - */
17   - @Autowired
18   - RedisConnectionFactory redisConnectionFactory;
19   -
20   - /**
21   - * 实例化 RedisTemplate 对象
22   - *
23   - * @return
24   - */
25   - @Bean
26   - public RedisTemplate<String, Object> functionDomainRedisTemplate() {
27   - RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
28   - initDomainRedisTemplate(redisTemplate, redisConnectionFactory);
29   - return redisTemplate;
30   - }
31   -
32   - /**
33   - * 设置数据存入 redis 的序列化方式
34   - *
35   - * @param redisTemplate
36   - * @param factory
37   - */
38   - private void initDomainRedisTemplate(RedisTemplate<String, Object> redisTemplate, RedisConnectionFactory factory) {
39   - redisTemplate.setKeySerializer(new StringRedisSerializer());
40   - redisTemplate.setHashKeySerializer(new StringRedisSerializer());
41   - redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
42   - redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
43   - redisTemplate.setConnectionFactory(factory);
44   - }
45   -
46   - /**
47   - * 实例化 HashOperations 对象,可以使用 Hash 类型操作
48   - *
49   - * @param redisTemplate
50   - * @return
51   - */
52   - @Bean
53   - public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
54   - return redisTemplate.opsForHash();
55   - }
56   -
57   - /**
58   - * 实例化 ValueOperations 对象,可以使用 String 操作
59   - *
60   - * @param redisTemplate
61   - * @return
62   - */
63   - @Bean
64   - public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
65   - return redisTemplate.opsForValue();
66   - }
67   -
68   - /**
69   - * 实例化 ListOperations 对象,可以使用 List 操作
70   - *
71   - * @param redisTemplate
72   - * @return
73   - */
74   - @Bean
75   - public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
76   - return redisTemplate.opsForList();
77   - }
78   -
79   - /**
80   - * 实例化 SetOperations 对象,可以使用 Set 操作
81   - *
82   - * @param redisTemplate
83   - * @return
84   - */
85   - @Bean
86   - public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
87   - return redisTemplate.opsForSet();
88   - }
89   -
90   - /**
91   - * 实例化 ZSetOperations 对象,可以使用 ZSet 操作
92   - *
93   - * @param redisTemplate
94   - * @return
95   - */
96   - @Bean
97   - public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
98   - return redisTemplate.opsForZSet();
99   - }
100   -}
101 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/controller/RedisController.java deleted
View file @f71482c
1   -package com.huaheng.common.redis.controller;
2   -
3   -import com.huaheng.common.redis.model.RedisModel;
4   -import com.huaheng.common.redis.serviceimpl.RedisServiceImpl;
5   -import org.springframework.beans.factory.annotation.Autowired;
6   -import org.springframework.stereotype.Controller;
7   -import org.springframework.web.bind.annotation.RequestMapping;
8   -import org.springframework.web.bind.annotation.RequestMethod;
9   -import org.springframework.web.bind.annotation.ResponseBody;
10   -import org.springframework.web.bind.annotation.RestController;
11   -
12   -@Controller
13   -public class RedisController {
14   -
15   - @Autowired
16   - private RedisServiceImpl service;
17   -
18   - //添加
19   -// @RequestMapping(value = "/add", method = RequestMethod.GET)
20   - public void test() {
21   - System.out.println("start.....");
22   - RedisModel m = new RedisModel();
23   - m.setName("张三");
24   - m.setTel("1111");
25   - m.setAddress("长沙");
26   - m.setRedisKey("zhangsanKey01");
27   - service.put(m.getRedisKey(), m, -1);
28   -
29   - RedisModel m2 = new RedisModel();
30   - m2.setName("张三2");
31   - m2.setTel("2222");
32   - m2.setAddress("长沙2");
33   - m2.setRedisKey("zhangsanKey02");
34   - service.put(m2.getRedisKey(), m2, -1);
35   -
36   - RedisModel m3 = new RedisModel();
37   - m3.setName("张三3");
38   - m3.setTel("2222");
39   - m3.setAddress("长沙3");
40   - m3.setRedisKey("zhangsanKey03");
41   - service.put(m3.getRedisKey(), m3, -1);
42   -
43   - System.out.println("add success end...");
44   - }
45   -
46   - //查询所有对象
47   -// @RequestMapping(value = "/getAll", method = RequestMethod.GET)
48   -// @ResponseBody
49   - public Object getAll() {
50   - return service.getAll();
51   - }
52   -
53   - //查询所有key
54   -// @RequestMapping(value = "/getKeys", method = RequestMethod.GET)
55   -// @ResponseBody
56   - public Object getKeys() {
57   - return service.getKeys();
58   - }
59   -
60   - //根据key查询
61   -// @RequestMapping(value = "/get", method = RequestMethod.GET)
62   - public Object get(String key) {
63   - RedisModel m = new RedisModel();
64   - m.setRedisKey(key);
65   - return service.get(m.getRedisKey());
66   - }
67   -
68   - //删除
69   -// @RequestMapping(value = "/remove", method = RequestMethod.GET)
70   -// @ResponseBody
71   - public void remove() {
72   - RedisModel m = new RedisModel();
73   - m.setRedisKey("zhangsanKey01");
74   - service.remove(m.getRedisKey());
75   - }
76   -
77   - //判断key是否存在
78   -// @RequestMapping(value = "/isKeyExists", method = RequestMethod.GET)
79   -// @ResponseBody
80   - public void isKeyExists() {
81   - RedisModel m = new RedisModel();
82   - m.setRedisKey("zhangsanKey01");
83   - boolean flag = service.isKeyExists(m.getRedisKey());
84   - System.out.println("zhangsanKey01 是否存在: "+flag);
85   - }
86   -
87   - //查询当前缓存的数量
88   -// @RequestMapping(value = "/count", method = RequestMethod.GET)
89   -// @ResponseBody
90   - public Object count() {
91   - return service.count();
92   - }
93   -
94   - //清空所有key
95   -// @RequestMapping(value = "/empty", method = RequestMethod.GET)
96   -// @ResponseBody
97   - public void empty() {
98   - service.empty();
99   - }
100   -}
101 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/model/RedisModel.java deleted
View file @f71482c
1   -package com.huaheng.common.redis.model;
2   -
3   -import java.io.Serializable;
4   -
5   -public class RedisModel implements Serializable {
6   -
7   -
8   - private String redisKey;//redis中的key
9   - private String name;//姓名
10   - private String tel;//电话
11   - private String address;//住址
12   -
13   - public String getRedisKey() {
14   - return redisKey;
15   - }
16   -
17   - public void setRedisKey(String redisKey) {
18   - this.redisKey = redisKey;
19   - }
20   -
21   - public String getName() {
22   - return name;
23   - }
24   -
25   - public void setName(String name) {
26   - this.name = name;
27   - }
28   -
29   - public String getTel() {
30   - return tel;
31   - }
32   -
33   - public void setTel(String tel) {
34   - this.tel = tel;
35   - }
36   -
37   - public String getAddress() {
38   - return address;
39   - }
40   -
41   - public void setAddress(String address) {
42   - this.address = address;
43   - }
44   -
45   -}
46 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/service/IRedisService.java deleted
View file @f71482c
1   -package com.huaheng.common.redis.service;
2   -
3   -import org.springframework.beans.factory.annotation.Autowired;
4   -import org.springframework.data.redis.core.HashOperations;
5   -import org.springframework.data.redis.core.RedisTemplate;
6   -
7   -import javax.annotation.Resource;
8   -import java.util.List;
9   -import java.util.Set;
10   -import java.util.concurrent.TimeUnit;
11   -
12   -public abstract class IRedisService<T> {
13   -
14   -
15   - @Autowired
16   - protected RedisTemplate<String, Object> redisTemplate;
17   - @Resource
18   - protected HashOperations<String, String, T> hashOperations;
19   -
20   - /**
21   - * 存入redis中的key
22   - *
23   - * @return
24   - */
25   - protected abstract String getRedisKey();
26   -
27   -
28   - /**
29   - * 添加
30   - *
31   - * @param key key
32   - * @param doamin 对象
33   - * @param expire 过期时间(单位:秒),传入 -1 时表示不设置过期时间
34   - */
35   - public void put(String key, T doamin, long expire) {
36   - hashOperations.put(getRedisKey(), key, doamin);
37   - if (expire != -1) {
38   - redisTemplate.expire(getRedisKey(), expire, TimeUnit.SECONDS);
39   - }
40   - }
41   -
42   - /**
43   - * 删除
44   - *
45   - * @param key 传入key的名称
46   - */
47   - public void remove(String key) {
48   - hashOperations.delete(getRedisKey(), key);
49   - }
50   -
51   - /**
52   - * 查询
53   - *
54   - * @param key 查询的key
55   - * @return
56   - */
57   - public T get(String key) {
58   - return hashOperations.get(getRedisKey(), key);
59   - }
60   -
61   - /**
62   - * 获取当前redis库下所有对象
63   - *
64   - * @return
65   - */
66   - public List<T> getAll() {
67   - return hashOperations.values(getRedisKey());
68   - }
69   -
70   - /**
71   - * 查询查询当前redis库下所有key
72   - *
73   - * @return
74   - */
75   - public Set<String> getKeys() {
76   - return hashOperations.keys(getRedisKey());
77   - }
78   -
79   - /**
80   - * 判断key是否存在redis中
81   - *
82   - * @param key 传入key的名称
83   - * @return
84   - */
85   - public boolean isKeyExists(String key) {
86   - return hashOperations.hasKey(getRedisKey(), key);
87   - }
88   -
89   - /**
90   - * 查询当前key下缓存数量
91   - *
92   - * @return
93   - */
94   - public long count() {
95   - return hashOperations.size(getRedisKey());
96   - }
97   -
98   - /**
99   - * 清空redis
100   - */
101   - public void empty() {
102   - Set<String> set = hashOperations.keys(getRedisKey());
103   - set.stream().forEach(key -> hashOperations.delete(getRedisKey(), key));
104   - }
105   -}
106 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java deleted
View file @f71482c
1   -package com.huaheng.common.redis.serviceimpl;
2   -
3   -import com.huaheng.common.redis.model.RedisModel;
4   -import com.huaheng.common.redis.service.IRedisService;
5   -import org.springframework.stereotype.Service;
6   -
7   -@Service
8   -public class RedisServiceImpl extends IRedisService<RedisModel> {
9   -
10   - private static final String REDIS_KEY = "TEST_REDIS_KEY";
11   -
12   - @Override
13   - protected String getRedisKey() {
14   -
15   -
16   - return this.REDIS_KEY;
17   - }
18   -}
src/main/java/com/huaheng/pc/config/containerType/domain/ContainerType.java
  View file @ed68106
... ... @@ -53,7 +53,7 @@ public class ContainerType implements Serializable {
53 53 */
54 54 @TableField(value = "enable")
55 55 @ApiModelProperty(value="启用；0—禁用状态")
56   - private Integer enable;
  56 + private Boolean enable;
57 57  
58 58 /**
59 59 * 序号
... ... @@ -116,7 +116,7 @@ public class ContainerType implements Serializable {
116 116 */
117 117 @TableField(value = "useAsDEFAULT")
118 118 @ApiModelProperty(value="作为默认货箱")
119   - private Integer useAsDEFAULT;
  119 + private Boolean useAsDEFAULT;
120 120  
121 121 /**
122 122 * 状态
... ... @@ -373,23 +373,6 @@ public class ContainerType implements Serializable {
373 373 this.companyCode = companyCode;
374 374 }
375 375  
376   - /**
377   - * 获取启用；0—禁用状态
378   - *
379   - * @return enable - 启用；0—禁用状态
380   - */
381   - public Integer getEnable() {
382   - return enable;
383   - }
384   -
385   - /**
386   - * 设置启用；0—禁用状态
387   - *
388   - * @param enable 启用；0—禁用状态
389   - */
390   - public void setEnable(Integer enable) {
391   - this.enable = enable;
392   - }
393 376  
394 377 /**
395 378 * 获取序号
... ... @@ -517,39 +500,33 @@ public class ContainerType implements Serializable {
517 500 this.maxWeight = maxWeight;
518 501 }
519 502  
520   - /**
521   - * 获取装满度
522   - *
523   - * @return fillPercent - 装满度
524   - */
525 503 public Integer getFillPercent() {
526 504 return fillPercent;
527 505 }
528 506  
529   - /**
530   - * 设置装满度
531   - *
532   - * @param fillPercent 装满度
533   - */
534 507 public void setFillPercent(Integer fillPercent) {
535 508 this.fillPercent = fillPercent;
536 509 }
537 510  
538 511 /**
539   - * 获取作为默认货箱
  512 + * 获取装满度
540 513 *
541   - * @return useAsDEFAULT - 作为默认货箱
  514 + * @return fillPercent - 装满度
542 515 */
543   - public Integer getUseAsDEFAULT() {
  516 +
  517 + public Boolean getEnable() {
  518 + return enable;
  519 + }
  520 +
  521 + public void setEnable(Boolean enable) {
  522 + this.enable = enable;
  523 + }
  524 +
  525 + public Boolean getUseAsDEFAULT() {
544 526 return useAsDEFAULT;
545 527 }
546 528  
547   - /**
548   - * 设置作为默认货箱
549   - *
550   - * @param useAsDEFAULT 作为默认货箱
551   - */
552   - public void setUseAsDEFAULT(Integer useAsDEFAULT) {
  529 + public void setUseAsDEFAULT(Boolean useAsDEFAULT) {
553 530 this.useAsDEFAULT = useAsDEFAULT;
554 531 }
555 532  
... ...
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
  View file @ed68106
1 1 package com.huaheng.pc.config.locationType.controller;
2 2  
3   -
4 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 4 import com.baomidou.mybatisplus.core.metadata.IPage;
6 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
... ... @@ -17,133 +16,150 @@ import com.huaheng.framework.web.page.TableDataInfo;
17 16 import com.huaheng.framework.web.page.TableSupport;
18 17 import com.huaheng.pc.config.locationType.domain.LocationType;
19 18 import com.huaheng.pc.config.locationType.service.LocationTypeService;
20   -import com.huaheng.pc.general.location.domain.Location;
21   -import com.huaheng.pc.general.location.service.LocationService;
  19 +import com.huaheng.pc.config.zone.domain.Zone;
  20 +import com.huaheng.pc.config.zone.service.ZoneService;
22 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
23 22 import org.springframework.beans.factory.annotation.Autowired;
24 23 import org.springframework.stereotype.Controller;
25 24 import org.springframework.ui.ModelMap;
26 25 import org.springframework.web.bind.annotation.*;
27 26  
28   -import java.util.Arrays;
29 27 import java.util.List;
30 28  
  29 +/**
  30 + * 库位类型 信息操作处理
  31 + *
  32 + * @author huaheng
  33 + * @date 2018-08-19
  34 + */
31 35 @Controller
32 36 @RequestMapping("/config/locationType")
33   -public class LocationTypeController extends BaseController {
34   -
  37 +public class LocationTypeController extends BaseController
  38 +{
35 39 private String prefix = "config/locationType";
36   -
37   - @Autowired
38   - private LocationTypeService locationTypeService;
39   - @Autowired
40   - private LocationService locationService;
41   -
42   - @RequestMapping("config:locationType:view")
43   - @GetMapping()
44   - public String locationType()
45   - {
46   - return prefix + "/locationType";
47   - }
48   -
49   - /**
50   - * 查询库位类型列表
51   - */
52   - @RequiresPermissions("config:locationType:list")
53   - @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT)
54   - @PostMapping("/list")
55   - @ResponseBody
56   - public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd) {
57   - LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
58   - PageDomain pageDomain = TableSupport.buildPageRequest();
59   - Integer pageNum = pageDomain.getPageNum();
60   - Integer pageSize = pageDomain.getPageSize();
61   -
62   - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
63   - .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
64   - .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
65   - .eq(StringUtils.isNotEmpty(locationType.getCode()),LocationType::getCode,locationType.getCode())
66   - .like(StringUtils.isNotEmpty(locationType.getName()),LocationType::getName,locationType.getName());
67   -
68   - if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
69   - /**
70   - * 使用分页查询
71   - */
72   - Page<LocationType> page = new Page<>(pageNum, pageSize);
73   - IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
74   - return getDataTable(iPage.getRecords());
75   - } else {
76   - List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
77   - return getDataTable(list);
78   - }
79   - }
80   -
81   - /**
82   - * 新增库位类型
83   - */
84   - @GetMapping("/add")
85   - public String add() {
86   - return prefix + "/add";
87   - }
88   -
89   - /**
90   - * 新增保存库位类型
91   - */
92   - @RequiresPermissions("config:locationType:add")
93   - @Log(title = "通用-库位类型管理", operating = "新增库位类型", action = BusinessType.INSERT)
94   - @PostMapping("/add")
95   - @ResponseBody
96   - public AjaxResult addSave(LocationType locationType) {
97   - Boolean result = locationTypeService.save(locationType);
98   - return toAjax(result);
99   - }
100   -
101   - /**
102   - * 修改库位类型
103   - */
104   - @GetMapping("/edit/{id}")
105   - public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
106   - LocationType locationType = locationTypeService.getById(id);
107   - mmap.put("locationType", locationType);
108   - return prefix + "/edit";
109   - }
110   -
111   - /**
112   - * 修改保存库位类型
113   - */
114   - @RequiresPermissions("config:locationType:edit")
115   - @Log(title = "通用-库位类型管理", operating = "修改库位类型", action = BusinessType.UPDATE)
116   - @PostMapping("/edit")
117   - @ResponseBody
118   - public AjaxResult editSave(LocationType locationType) {
119   - locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
120   - Boolean result = locationTypeService.updateById(locationType);
121   - return toAjax(result);
122   - }
123   -
124   - /**
125   - * 删除库位
126   - */
127   - @RequiresPermissions("config:locationType:remove")
128   - @Log(title = "通用-库位类型管理", operating = "删除库位类型", action = BusinessType.DELETE)
129   - @PostMapping( "/remove")
130   - @ResponseBody
131   - public AjaxResult remove(String ids) {
132   - if (StringUtils.isEmpty(ids)){
133   - return AjaxResult.error("id不能为空");
134   - }
135   -
136   - for (Integer id : Convert.toIntArray(ids)) {
137   - LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery();
138   - lambdaQueryWrapper.eq(Location::getLocationType,id);
139   -
140   - int count = locationService.count(lambdaQueryWrapper);
141   - if (count != 0){
142   - return AjaxResult.error("库位类型id="+id+",存在库位，不能删除。");
143   - }
144   - }
145   - List<Integer> list = Arrays.asList(Convert.toIntArray(ids));
146   - locationTypeService.removeByIds(list);
147   - return AjaxResult.success("删除成功！");
148   - }
  40 +
  41 + @Autowired
  42 + private LocationTypeService locationTypeService;
  43 + @Autowired
  44 + private ZoneService zoneService;
  45 +
  46 + @RequiresPermissions("config:locationType:view")
  47 + @GetMapping()
  48 + public String locationType()
  49 + {
  50 + return prefix + "/locationType";
  51 + }
  52 +
  53 + /**
  54 + * 查询库位类型列表
  55 + */
  56 + @RequiresPermissions("config:locationType:list")
  57 + @Log(title = "配置-库位类型设置", operating = "查看库位类型", action = BusinessType.GRANT)
  58 + @PostMapping("/list")
  59 + @ResponseBody
  60 + public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd)
  61 + {
  62 + LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 +
  67 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
  68 + .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
  69 + .eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode())
  70 + .eq(StringUtils.isNotEmpty(locationType.getCode()), LocationType::getCode, locationType.getCode())
  71 + .like(StringUtils.isNotEmpty(locationType.getName()), LocationType::getName, locationType.getName())
  72 + .orderByAsc(LocationType::getId);
  73 +
  74 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  75 + /**
  76 + * 使用分页查询
  77 + */
  78 + Page<LocationType> page = new Page<>(pageNum, pageSize);
  79 + IPage<LocationType> iPage = locationTypeService.page(page, lambdaQueryWrapper);
  80 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  81 + } else {
  82 + List<LocationType> list = locationTypeService.list(lambdaQueryWrapper);
  83 + return getDataTable(list);
  84 + }
  85 + }
  86 +
  87 + /**
  88 + * 新增库位类型
  89 + */
  90 + @GetMapping("/add")
  91 + public String add()
  92 + {
  93 + return prefix + "/add";
  94 + }
  95 +
  96 + /**
  97 + * 新增保存库位类型
  98 + */
  99 + @RequiresPermissions("config:locationType:add")
  100 + @Log(title = "配置-库位类型设置", operating = "新增库位类型", action = BusinessType.INSERT)
  101 + @PostMapping("/add")
  102 + @ResponseBody
  103 + public AjaxResult addSave(LocationType locationType)
  104 + {
  105 + if(StringUtils.isEmpty(locationType.getCode())){
  106 + return AjaxResult.error("库位类型为空");
  107 + }
  108 + //查找location，是否存在
  109 + Zone zone=new Zone();
  110 + LambdaQueryWrapper<Zone> lambdaQueryWrapper = Wrappers.lambdaQuery();
  111 + lambdaQueryWrapper.eq(Zone::getLocationType,locationType.getCode())
  112 + .eq(Zone::getWarehouseCode,ShiroUtils.getWarehouseCode());
  113 + zone=zoneService.getOne(lambdaQueryWrapper);
  114 + if(zone==null){
  115 + return AjaxResult.error("系统没有此库位类型");
  116 + }
  117 + locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());
  118 + locationType.setCreatedBy(ShiroUtils.getLoginName());
  119 + locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
  120 + return toAjax(locationTypeService.save(locationType));
  121 + }
  122 +
  123 + /**
  124 + * 修改库位类型
  125 + */
  126 + @GetMapping("/edit/{id}")
  127 + public String edit(@PathVariable("id") Integer id, ModelMap mmap)
  128 + {
  129 + LocationType locationType = locationTypeService.getById(id);
  130 + mmap.put("locationType", locationType);
  131 + return prefix + "/edit";
  132 + }
  133 +
  134 + /**
  135 + * 修改保存库位类型
  136 + */
  137 + @RequiresPermissions("config:locationType:edit")
  138 + @Log(title = "配置-库位类型设置", operating = "修改库位类型", action = BusinessType.UPDATE)
  139 + @PostMapping("/edit")
  140 + @ResponseBody
  141 + public AjaxResult editSave(LocationType locationType)
  142 + {
  143 + locationType.setLastUpdatedBy(ShiroUtils.getLoginName());
  144 + return toAjax(locationTypeService.saveOrUpdate(locationType));
  145 + }
  146 +
  147 + /**
  148 + * 删除库位类型
  149 + */
  150 + @RequiresPermissions("config:locationType:remove")
  151 + @Log(title = "配置-库位类型设置", operating = "删除库位类型", action = BusinessType.DELETE)
  152 + @PostMapping( "/remove")
  153 + @ResponseBody
  154 + public AjaxResult remove(String ids)
  155 + {
  156 + if (StringUtils.isEmpty(ids))
  157 + return AjaxResult.error("id不能为空");
  158 + for (Integer id : Convert.toIntArray(ids))
  159 + {
  160 + locationTypeService.removeById(id);
  161 + }
  162 + return AjaxResult.success("删除成功！");
  163 + }
  164 +
149 165 }
... ...
src/main/java/com/huaheng/pc/config/locationType/domain/LocationType.java
  View file @ed68106
... ... @@ -93,7 +93,7 @@ public class LocationType implements Serializable {
93 93 * 有效
94 94 */
95 95 @TableField(value = "enable")
96   - private Integer enable;
  96 + private Boolean enable;
97 97  
98 98 /**
99 99 * 创建时间
... ...
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeService.java
  View file @ed68106
... ... @@ -7,6 +7,4 @@ import java.util.List;
7 7 import java.util.Map;
8 8  
9 9 public interface LocationTypeService extends IService<LocationType>{
10   -
11   - List<Map<String,Object>> getLocationPrefix();
12 10 }
... ...
src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java
  View file @ed68106
... ... @@ -14,13 +14,4 @@ import java.util.Map;
14 14 @Service("locationType")
15 15 public class LocationTypeServiceImpl extends ServiceImpl<LocationTypeMapper, LocationType> implements LocationTypeService{
16 16  
17   - @Override
18   - public List<Map<String, Object>> getLocationPrefix() {
19   - LocationType locationType=new LocationType();
20   - locationType.setWarehouseCode(ShiroUtils.getWarehouseCode());
21   - locationType.setEnable(0);
22   - LambdaQueryWrapper<LocationType> lambda = Wrappers.lambdaQuery(locationType);
23   -
24   - return this.listMaps(lambda);
25   - }
26 17 }
... ...
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
  View file @ed68106
... ... @@ -6,10 +6,7 @@ import com.github.abel533.echarts.Option;
6 6 import com.github.abel533.echarts.axis.Axis;
7 7 import com.github.abel533.echarts.axis.CategoryAxis;
8 8 import com.github.abel533.echarts.axis.ValueAxis;
9   -import com.github.abel533.echarts.code.Orient;
10   -import com.github.abel533.echarts.code.PointerType;
11   -import com.github.abel533.echarts.code.SeriesType;
12   -import com.github.abel533.echarts.code.Trigger;
  9 +import com.github.abel533.echarts.code.*;
13 10 import com.github.abel533.echarts.json.GsonUtil;
14 11 import com.github.abel533.echarts.series.Line;
15 12 import com.github.abel533.echarts.series.Pie;
... ... @@ -76,7 +73,7 @@ public class IndexController extends BaseController
76 73 pie.itemStyle().emphasis().setShadowBlur(10);
77 74 pie.itemStyle().emphasis().setShadowOffsetX(0);
78 75 pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)");
79   - String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = '" + ShiroUtils.getWarehouseCode()+"'";
  76 + String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = ' " + ShiroUtils.getWarehouseCode()+"' ;";
80 77 List<LinkedHashMap<String, Object>> results = mapper.selectCommon(sql);
81 78 for(LinkedHashMap<String, Object> item : results){
82 79 ChartData chartData = new ChartData();
... ... @@ -226,7 +223,8 @@ public class IndexController extends BaseController
226 223 option.legend().setTop(10);
227 224 option.legend().setBottom(10);
228 225 option.legend().setData(new ArrayList<String>());
229   - option.legend().setType("scroll");
  226 + option.legend().setType(LegendType.scroll);
  227 + // option.legend().setType("scroll");
230 228  
231 229 Pie pie = new Pie();
232 230 pie.setName("库存");
... ...
src/main/resources/application.properties
  View file @ed68106
... ... @@ -2,7 +2,7 @@
2 2 #\u540D\u79F0
3 3 huaheng.name=huaheng
4 4 #\u7248\u672C
5   -huaheng.version=2.6.0
  5 +huaheng.version=4.0.0
6 6 #\u7248\u6743\u5E74\u4EFD
7 7 huaheng.copyrightYear=2018
8 8 #\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84
... ... @@ -107,31 +107,5 @@ gen.autoRemovePre=false
107 107 # \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
108 108 gen.tablePrefix=sys_
109 109  
110   -# default-store in spring session. it will be set in redis only outside.
111   -spring.session.store-type=none
112   -# REDIS (RedisProperties)
113   -# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
114   -spring.redis.database=0
115   -# Redis\u670D\u52A1\u5668\u5730\u5740
116   -spring.redis.host=127.0.0.1
117   -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
118   -spring.redis.port=6379
119   -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
120   -spring.redis.password=
121   -# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
122   -#spring.redis.pool.max-active=8
123   -spring.redis.jedis.pool.max-active=8
124   -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
125   -#spring.redis.pool.max-wait=-1
126   -spring.redis.jedis.pool.max-wait=-1ms
127   -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
128   -#spring.redis.pool.max-idle=8
129   -spring.redis.jedis.pool.max-idle=8
130   -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
131   -#spring.redis.pool.min-idle=0
132   -spring.redis.jedis.pool.min-idle= 0
133   -# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
134   -spring.redis.timeout= 0
135   -spring.redis.lettuce.shutdown-timeout=0ms
136 110  
137 111  
... ...
src/main/resources/templates/config/containerType/add.html
  View file @ed68106
... ... @@ -17,6 +17,12 @@
17 17 <input id="name" name="name" class="form-control" type="text">
18 18 </div>
19 19 </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">序号：</label>
  22 + <div class="col-sm-8">
  23 + <input id="sequence" name="sequence" class="form-control" type="text">
  24 + </div>
  25 + </div>
20 26 <!--<div class="form-group"> -->
21 27 <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
22 28 <!--<div class="col-sm-8">-->
... ... @@ -30,12 +36,6 @@
30 36 <!--</div>-->
31 37 <!--</div>-->
32 38 <div class="form-group">
33   - <label class="col-sm-3 control-label">前缀：</label>
34   - <div class="col-sm-8">
35   - <input id="prefix" name="prefix" class="form-control" type="text">
36   - </div>
37   - </div>
38   - <div class="form-group">
39 39 <label class="col-sm-3 control-label">空箱重量kg：</label>
40 40 <div class="col-sm-8">
41 41 <input id="emptyWeight" name="emptyWeight" class="form-control" type="text">
... ... @@ -71,6 +71,12 @@
71 71 <input id="fillPercent" name="fillPercent" class="form-control" type="text">
72 72 </div>
73 73 </div>
  74 + <div class="form-group">
  75 + <label class="col-sm-3 control-label">状态：</label>
  76 + <div class="col-sm-8">
  77 + <input id="status" name="status" class="form-control" type="text">
  78 + </div>
  79 + </div>
74 80 <!--<div class="form-group"> -->
75 81 <!--<label class="col-sm-3 control-label">作为默认货箱：</label>-->
76 82 <!--<div class="col-sm-8">-->
... ... @@ -81,7 +87,7 @@
81 87 <label class="col-sm-3 control-label">是否默认容器：</label>
82 88 <div class="col-sm-8">
83 89 <div class="onoffswitch">
84   - <input type="checkbox" th:checked="false" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
  90 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
85 91 <label class="onoffswitch-label" for="useAsDefault">
86 92 <span class="onoffswitch-inner"></span>
87 93 <span class="onoffswitch-switch"></span>
... ... @@ -90,36 +96,6 @@
90 96 </div>
91 97 </div>
92 98 <div class="form-group">
93   - <label class="col-sm-3 control-label">类型描述：</label>
94   - <div class="col-sm-8">
95   - <input id="remark" name="remark" class="form-control" type="text">
96   - </div>
97   - </div>
98   - <!--<div class="form-group"> -->
99   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
100   - <!--<div class="col-sm-8">-->
101   - <!--<input id="created" name="created" class="form-control" type="text">-->
102   - <!--</div>-->
103   - <!--</div>-->
104   - <!--<div class="form-group"> -->
105   - <!--<label class="col-sm-3 control-label">创建用户：</label>-->
106   - <!--<div class="col-sm-8">-->
107   - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
108   - <!--</div>-->
109   - <!--</div>-->
110   - <!--<div class="form-group"> -->
111   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
112   - <!--<div class="col-sm-8">-->
113   - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
114   - <!--</div>-->
115   - <!--</div>-->
116   - <!--<div class="form-group"> -->
117   - <!--<label class="col-sm-3 control-label">更新用户：</label>-->
118   - <!--<div class="col-sm-8">-->
119   - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
120   - <!--</div>-->
121   - <!--</div>-->
122   - <div class="form-group">
123 99 <label class="col-sm-3 control-label">是否有效：</label>
124 100 <div class="col-sm-8">
125 101 <!--<input id="enable" name="enable" class="form-control" type="text">-->
... ... @@ -205,14 +181,14 @@
205 181 "useAsDefault" : $("input[name='useAsDefault']").is(':checked'),
206 182 "code" :$("input[name='code']").val(),
207 183 "name" :$("input[name='name']").val(),
208   - "prefix" :$("input[name='prefix']").val(),
  184 + "sequence" :$("input[name='sequence']").val(),
209 185 "emptyWeight" :$("input[name='emptyWeight']").val(),
210 186 "length" :$("input[name='length']").val(),
211 187 "width" :$("input[name='width']").val(),
212 188 "height" :$("input[name='height']").val(),
213 189 "maxWeight" :$("input[name='maxWeight']").val(),
214 190 "fillPercent" :$("input[name='fillPercent']").val(),
215   - "remark" :$("input[name='remark']").val()
  191 + "status" :$("input[name='status']").val(),
216 192 },
217 193 async : false,
218 194 error : function(request) {
... ...
src/main/resources/templates/config/containerType/containerType.html
  View file @ed68106
... ... @@ -87,6 +87,10 @@
87 87 field : 'companyCode',
88 88 title : '货主编码'
89 89 },
  90 + {
  91 + field : 'sequence',
  92 + title : '序号'
  93 + },
90 94 {
91 95 field : 'emptyWeight',
92 96 title : '空箱重量kg'
... ... @@ -124,10 +128,6 @@
124 128 }
125 129 },
126 130 {
127   - field : 'remark',
128   - title : '类型描述'
129   - },
130   - {
131 131 field : 'created',
132 132 title : '创建时间'
133 133 },
... ...
src/main/resources/templates/config/containerType/edit.html
  View file @ed68106
... ... @@ -30,12 +30,7 @@
30 30 <!--<input id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">-->
31 31 <!--</div>-->
32 32 <!--</div>-->
33   - <div class="form-group">
34   - <label class="col-sm-3 control-label">前缀：</label>
35   - <div class="col-sm-8">
36   - <input id="prefix" name="prefix" th:field="*{prefix}" class="form-control" type="text">
37   - </div>
38   - </div>
  33 +
39 34 <div class="form-group">
40 35 <label class="col-sm-3 control-label">空箱重量kg：</label>
41 36 <div class="col-sm-8">
... ... @@ -78,24 +73,24 @@
78 73 <input id="useAsDefault" name="useAsDefault" th:field="*{ }" class="form-control" type="text">
79 74 </div>
80 75 </div>-->
81   - <div class="form-group">
82   - <label class="col-sm-3 control-label">是否默认容器：</label>
83   - <div class="col-sm-8">
84   - <div class="onoffswitch">
85   - <input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">
86   - <label class="onoffswitch-label" for="useAsDefault">
87   - <span class="onoffswitch-inner"></span>
88   - <span class="onoffswitch-switch"></span>
89   - </label>
90   - </div>
91   - </div>
92   - </div>
93   - <div class="form-group">
94   - <label class="col-sm-3 control-label">类型描述：</label>
95   - <div class="col-sm-8">
96   - <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
97   - </div>
98   - </div>
  76 + <!--<div class="form-group">-->
  77 + <!--<label class="col-sm-3 control-label">是否默认容器：</label>-->
  78 + <!--<div class="col-sm-8">-->
  79 + <!--<div class="onoffswitch">-->
  80 + <!--<input type="checkbox" th:checked="${containerType.useAsDefault}" class="onoffswitch-checkbox" id="useAsDefault" name="useAsDefault">-->
  81 + <!--<label class="onoffswitch-label" for="useAsDefault">-->
  82 + <!--<span class="onoffswitch-inner"></span>-->
  83 + <!--<span class="onoffswitch-switch"></span>-->
  84 + <!--</label>-->
  85 + <!--</div>-->
  86 + <!--</div>-->
  87 + <!--</div>-->
  88 + <!--<div class="form-group"> -->
  89 + <!--<label class="col-sm-3 control-label">类型描述：</label>-->
  90 + <!--<div class="col-sm-8">-->
  91 + <!--<input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">-->
  92 + <!--</div>-->
  93 + <!--</div>-->
99 94 <!--<div class="form-group"> -->
100 95 <!--<label class="col-sm-3 control-label">创建时间：</label>-->
101 96 <!--<div class="col-sm-8">-->
... ...
src/main/resources/templates/config/locationType/add.html
  View file @ed68106
... ... @@ -17,12 +17,6 @@
17 17 <input id="name" name="name" class="form-control" type="text">
18 18 </div>
19 19 </div>
20   - <div class="form-group">
21   - <label class="col-sm-3 control-label">前缀：</label>
22   - <div class="col-sm-8">
23   - <input id="prefix" name="prefix" class="form-control" type="text">
24   - </div>
25   - </div>
26 20 <!--<div class="form-group"> -->
27 21 <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
28 22 <!--<div class="col-sm-8">-->
... ... @@ -60,9 +54,33 @@
60 54 </div>
61 55 </div>
62 56 <div class="form-group">
63   - <label class="col-sm-3 control-label">描述：</label>
  57 + <label class="col-sm-3 control-label">最小允许单位：</label>
  58 + <div class="col-sm-8">
  59 + <input id="minQtyUm" name="minQtyUm" class="form-control" type="text">
  60 + </div>
  61 + </div>
  62 + <div class="form-group">
  63 + <label class="col-sm-3 control-label">校验位：</label>
  64 + <div class="col-sm-8">
  65 + <input id="checkDigit" name="checkDigit" class="form-control" type="text">
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-sm-3 control-label">最多混放物料数：</label>
  70 + <div class="col-sm-8">
  71 + <input id="maxMaterials" name="maxMaterials" class="form-control" type="text">
  72 + </div>
  73 + </div>
  74 + <div class="form-group">
  75 + <label class="col-sm-3 control-label">最大批号数量：</label>
64 76 <div class="col-sm-8">
65   - <input id="remark" name="remark" class="form-control" type="text">
  77 + <input id="maxLots" name="maxLots" class="form-control" type="text">
  78 + </div>
  79 + </div>
  80 + <div class="form-group">
  81 + <label class="col-sm-3 control-label">最大允许托盘数：</label>
  82 + <div class="col-sm-8">
  83 + <input id="maxContainers" name="maxContainers" class="form-control" type="text">
66 84 </div>
67 85 </div>
68 86 <!--<div class="form-group"> -->
... ... @@ -89,19 +107,19 @@
89 107 <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
90 108 <!--</div>-->
91 109 <!--</div>-->
92   - <div class="form-group">
93   - <label class="col-sm-3 control-label">是否有效：</label>
94   - <div class="col-sm-8">
95   - <!--<input id="enable" name="enable" class="form-control" type="text">-->
96   - <div class="onoffswitch">
97   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
98   - <label class="onoffswitch-label" for="enable">
99   - <span class="onoffswitch-inner"></span>
100   - <span class="onoffswitch-switch"></span>
101   - </label>
102   - </div>
103   - </div>
104   - </div>
  110 + <!--<div class="form-group"> -->
  111 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  112 + <!--<div class="col-sm-8">-->
  113 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  114 + <!--<div class="onoffswitch">-->
  115 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  116 + <!--<label class="onoffswitch-label" for="enable">-->
  117 + <!--<span class="onoffswitch-inner"></span>-->
  118 + <!--<span class="onoffswitch-switch"></span>-->
  119 + <!--</label>-->
  120 + <!--</div>-->
  121 + <!--</div>-->
  122 + <!--</div>-->
105 123 <!--<div class="form-group"> -->
106 124 <!--<label class="col-sm-3 control-label">是否删除：</label>-->
107 125 <!--<div class="col-sm-8">-->
... ...
src/main/resources/templates/config/locationType/edit.html
  View file @ed68106
... ... @@ -19,12 +19,6 @@
19 19 </div>
20 20 </div>
21 21 <div class="form-group">
22   - <label class="col-sm-3 control-label">前缀：</label>
23   - <div class="col-sm-8">
24   - <input id="prefix" name="prefix" th:field="*{prefix}" class="form-control" type="text">
25   - </div>
26   - </div>
27   - <div class="form-group">
28 22 <label class="col-sm-3 control-label">长m：</label>
29 23 <div class="col-sm-8">
30 24 <input id="length" name="length" th:field="*{length}" class="form-control" type="text">
... ... @@ -49,9 +43,33 @@
49 43 </div>
50 44 </div>
51 45 <div class="form-group">
52   - <label class="col-sm-3 control-label">描述：</label>
  46 + <label class="col-sm-3 control-label">最小允许单位：</label>
  47 + <div class="col-sm-8">
  48 + <input id="minQtyUm" name="minQtyUm" th:field="*{minQtyUm}" class="form-control" type="text">
  49 + </div>
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="col-sm-3 control-label">校验位：</label>
  53 + <div class="col-sm-8">
  54 + <input id="checkDigit" name="checkDigit" th:field="*{checkDigit}" class="form-control" type="text">
  55 + </div>
  56 + </div>
  57 + <div class="form-group">
  58 + <label class="col-sm-3 control-label">最多混放物料数：</label>
  59 + <div class="col-sm-8">
  60 + <input id="maxMaterials" name="maxMaterials" th:field="*{maxMaterials}" class="form-control" type="text">
  61 + </div>
  62 + </div>
  63 + <div class="form-group">
  64 + <label class="col-sm-3 control-label">最大批号数量：</label>
  65 + <div class="col-sm-8">
  66 + <input id="maxLots" name="maxLots" th:field="*{maxLots}" class="form-control" type="text">
  67 + </div>
  68 + </div>
  69 + <div class="form-group">
  70 + <label class="col-sm-3 control-label">最大允许托盘数：</label>
53 71 <div class="col-sm-8">
54   - <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
  72 + <input id="maxContainers" name="maxContainers" th:field="*{maxContainers}" class="form-control" type="text">
55 73 </div>
56 74 </div>
57 75 <!--<div class="form-group"> -->
... ...
src/main/resources/templates/config/locationType/locationType.html
  View file @ed68106
... ... @@ -71,20 +71,12 @@
71 71 title : '库位类型Id'
72 72 },
73 73 {
74   - field : 'prefix',
75   - title : '前缀'
  74 + field : 'code',
  75 + title : '货位类型'
76 76 },
77 77 {
78   - field : 'name',
79   - title : '库位名称'
80   - },
81   - {
82   - field : 'code',
83   - title : '编码'
84   - },
85   - {
86   - field : 'warehouseId',
87   - title : '仓库Id'
  78 + field : 'name',
  79 + title : '名称'
88 80 },
89 81 {
90 82 field : 'warehouseCode',
... ... @@ -107,9 +99,25 @@
107 99 title : '最大重量kg'
108 100 },
109 101 {
110   - field : 'remark',
111   - title : '描述'
112   - },
  102 + field : 'minQtyUm',
  103 + title : '最小允许单位'
  104 + },
  105 + {
  106 + field : 'checkDigit',
  107 + title : '校验位'
  108 + },
  109 + {
  110 + field : 'checkDigit',
  111 + title : '校验位'
  112 + },
  113 + {
  114 + field : 'maxMaterials',
  115 + title : '最多混放物料数'
  116 + },
  117 + {
  118 + field : 'maxContainers',
  119 + title : '最大允许托盘数'
  120 + },
113 121 {
114 122 field : 'created',
115 123 title : '创建时间'
... ...
src/main/resources/templates/config/zoneCapacity/add.html
  View file @ed68106
... ... @@ -12,17 +12,11 @@
12 12 <input id="materialId" name="materialId" type="hidden">
13 13 </div>
14 14 </div>
15   - <div class="form-group">
16   - <label class="col-sm-3 control-label">仓库：</label>
17   - <div class="col-sm-8">
18   - <input id="warehouseCode" name="warehouseCode" class="form-control" type="text">
19   - </div>
20   - </div>
21 15 <div class="form-group">
22 16 <label class="col-sm-3 control-label">货位过滤条件：</label>
23 17 <div class="col-sm-8">
24   - <select id="zoneId" name="zoneId" class="form-control" th:with="zones=${@zone.list()}">
25   - <option th:each="zone: ${zones}" th:text="${zone['name']}" th:value="${zone['id']}"></option>
  18 + <select id="filterCode" name="filterCode" class="form-control" th:with="zones=${@zone.list()}">
  19 + <option th:each="zone: ${zones}" th:text="${zone['name']}" th:value="${zone['code']}"></option>
26 20 </select>
27 21 </div>
28 22 </div>
... ... @@ -54,7 +48,7 @@
54 48 materialCode:{
55 49 required:true,
56 50 },
57   - warehouseCode:{
  51 + filterCode:{
58 52 required:true,
59 53 },
60 54 materialCode:{
... ...
src/main/resources/templates/system/dict/data/data.html
  View file @ed68106
... ... @@ -54,7 +54,7 @@
54 54 <!--</div>-->
55 55  
56 56 <div class="btn-group hidden-xs" id="toolbar" role="group">
57   - <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'"
  57 + <a class="btn btn-outline btn-success btn-rounded" th:value="${dict.dictType}" onclick="add()" id="add"
58 58 shiro:hasPermission="system:dict:add">
59 59 <i class="fa fa-plus"></i> 新增
60 60 </a>
... ... @@ -149,6 +149,12 @@
149 149 dictType: $("#dictType").val()
150 150 };
151 151 }
  152 +
  153 + function add() {
  154 + let id=$("#add").attr('value');
  155 + $.operate.add(id);
  156 + }
  157 +
152 158 </script>
153 159 </body>
154 160 </html>
155 161 \ No newline at end of file
... ...