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

build.gradle

@@ -18,6 +18,7 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
+apply plugin: 'war'
 
 group = 'com.emato'
 version = '1.0.0'

src/main/resources/application.yml

@@ -8,8 +8,8 @@ app:
 
 # 服务配置
 server:
-  address: 127.0.0.1
-  port: 8081
+  address: 120.24.12.161
+  port: 6666
 
 # 使用环境
 spring:
@@ -44,9 +44,12 @@ spring:
       # 数据源zaxxer HikariCP 写入数据库
       type: com.zaxxer.hikari.HikariDataSource
       driver-class-name: org.mariadb.jdbc.Driver
-      url: jdbc:mysql://120.76.84.45:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-      username: ceshi
-      password: abc-123
+#      url: jdbc:mysql://120.76.84.45:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#      username: ceshi
+#      password: abc-123
+      url: jdbc:mysql://183.3.221.144:3306/wms_data?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+      username: tjadmin
+      password: dbmsTJ@!#
       # hikari连接池配置
       hikari:
         connectionTimeout: 10000
@@ -59,9 +62,12 @@ spring:
           # 数据源zaxxer HikariCP 读取oms
           type: com.zaxxer.hikari.HikariDataSource
           driver-class-name: org.mariadb.jdbc.Driver
-          url: jdbc:mysql://120.24.12.161:60002/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-          username: out_qhm
-          password: QhpC7op3
+#          url: jdbc:mysql://120.24.12.161:60002/oms_write?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#          username: out_qhm
+#          password: QhpC7op3
+          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
+          username: qhdsi_oms
+          password: CcopQ#B^$
           # hikari连接池配置
           hikari:
             connectionTimeout: 10000

src/main/resources/mybatis/mapper/wms-acq-goods-move.xml

@@ -24,7 +24,7 @@
 		LEFT JOIN item i on td.itemcode = i.CODE
 		<where>
 			<if test="thisTime != null">
-				td.created &gt;= #{thisTime}
+				td.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
     </select>

src/main/resources/mybatis/mapper/wms-acq-goods-on-seat.xml

@@ -28,7 +28,7 @@
         LEFT JOIN item i ON li.itemCode = i. CODE
         <where>
             <if test="thisTime != null">
-                li.created &gt;= #{thisTime}
+                li.lastUpdated &gt;= #{thisTime}
             </if>
         </where>
     </select>

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

@@ -19,7 +19,7 @@
 		LEFT JOIN item i ON li.itemCode = i. CODE
 		<where>
 			<if test="thisTime != null">
-				li.created &gt;= #{thisTime}
+				li.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
 		GROUP BY

src/main/resources/mybatis/mapper/wms-acq-shelf-load.xml

@@ -28,7 +28,7 @@
 			LEFT JOIN item i ON rc.itemcode = i. CODE
 		<where>
 			<if test="thisTime != null">
-				rc.created &gt;= #{thisTime}
+				rc.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
     </select>
@@ -58,7 +58,7 @@
 		LEFT JOIN item i ON scd.itemCode = i.`code`
 		<where>
 			<if test="thisTime != null">
-				scd.created &gt;= #{thisTime}
+				scd.lastUpdated &gt;= #{thisTime}
 			</if>
 		</where>
 	</select>

src/sql/emt-record-time-2.0.sql

@@ -1,27 +1,27 @@
 DELETE FROM emt_record_time;
 --企业库存信息
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_INVENTORY_INFO', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_INVENTORY_INFO', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );
 -- 企业货物上下架信息
 --上架
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_SHELF_LOAD', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_SHELF_LOAD', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );
 --下架
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_SHELF_LOAD_DOWN', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_SHELF_LOAD_DOWN', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );
 --企业货物在仓库的移动信息
 --上架
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_GOODS_MOVE_UP', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_GOODS_MOVE_UP', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );
 --下架
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_GOODS_MOVE_DOWN', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_GOODS_MOVE_DOWN', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );
 --库位上的货物信息
 INSERT INTO emt_record_time (data_type, last_time, this_time, creater_sn, create_time, moder_sn, mod_time) VALUES (
-  'ACQ_GOODS_ON_SEAT', '2018-02-02 14:11:30', '2018-02-02 14:11:30', '1', now(), '1', now()
+  'ACQ_GOODS_ON_SEAT', '2018-02-02 00:00:00', '2018-02-02 00:00:00', '1', now(), '1', now()
 );

上线打包流程.txt

@@ -0,0 +1,9 @@
+上线打包的流程：
+cus-wms-supervise2.0的打包
+	1、在控制台中对项目进行打包：在Terminal中，输入gradle clean buildDependents
+	2、相应类结构和路径
+		1、cus-wms-supervise2.0的打包路径：cus-wms-supervise2.0\build\libs\cus-wms-supervise2.0.war
+		2、解压cus-wms-supervise2.0.war ,找到web-inf
+		cus-wms-supervise2.0.zip包里面包含的文件夹目录结构：
+			-classes
+			-lib

环境切换需要修改的.txt

@@ -0,0 +1,3 @@
+application.yml的修改：正式站点的每个active里面的去掉dev
+数据库配置
+