Merge branch 'master' of csk/cus-wms-supervise2.0 into master

src/main/resources/application.yml

@@ -9,9 +9,9 @@ app:
 # 服务配置
 server:
     ## 生产环境
-    address: 172.18.0.193
+    ##address: 172.18.0.193
     ## 开发测试环境
-    ## address: 127.0.0.1
+    address: 127.0.0.1
     port: 6666
 
 
@@ -46,7 +46,8 @@ spring:
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
             # 生产环境
-            url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            # url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/wms_qhds?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: qhdsf_wms
             password: g$2tX98$tX
             # hikari连接池配置
@@ -79,7 +80,7 @@ spring:
             type: com.zaxxer.hikari.HikariDataSource
             driver-class-name: org.mariadb.jdbc.Driver
             # 生产环境
-            url: jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+            url: jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
             username: qhdsi_oms
             password: ZuQhCA#px3
             # hikari连接池配置
@@ -127,8 +128,10 @@ jobs:
             0 5 10,12,13,15,18,22 1/1 * ?
         # 货物库存数据
         inventory:
+          # 每分钟一次
+            0/10 * * * * ?
             # 每月1号开始,每天12,22点10分各1次,共2次
-            0 10 12,13,22 1/1 * ?
+            #0 10 12,13,22 1/1 * ?
         # 上下架
         shelf-load:
             # 上架

src/main/resources/mybatis/mapper/wms-acq-inventory-info.xml

@@ -60,7 +60,7 @@
 						  /*and th.itemCode = 'bj1510081058'*/
 					  ORDER BY th.lastUpdated DESC
 					 ) AS a where a.gQty is not null GROUP BY seatNo, skuNo
-			 ) as b GROUP BY emsClassCode, skuNo;
+			 ) as b GROUP BY emsClassType, skuNo;
 	</select>