diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5f0c02f..0bcc71b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
- <module name="huaheng" />
<module name="wms2" />
+ <module name="huaheng" />
</profile>
</annotationProcessing>
</component>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index f20d44b..a21b0f0 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 96af260..14f48d4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -160,11 +160,6 @@
<select />
</treeState>
</component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="470" />
- <option name="width" value="980" />
- <option name="height" value="1030" />
- </component>
<component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
<component name="ProjectLevelVcsManager">
<OptionsSetting value="false" id="Update" />
diff --git a/src/main/resources/application-prd.yml b/src/main/resources/application-prd.yml
new file mode 100644
index 0000000..b58492e
--- /dev/null
+++ b/src/main/resources/application-prd.yml
@@ -0,0 +1,69 @@
+# 数据源配置
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库
+ master:
+ url: jdbc:mysql://localhost:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&allowPublicKeyRetrieval=true
+ username: root
+ password: 123456
+ # 从库
+ slave:
+ # 从库不启用
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 5000
+ # \配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 30000
+ #配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 300000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username:
+ login-password:
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+#日志配置
+logging:
+ level:
+ com.huaheng: debug
+ org.springframework: warn
+ spring.springboot.dao: DEBUG
+
+server:
+ port: 8888
+ servlet:
+ context-path: /twms/
\ No newline at end of file
diff --git a/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml b/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml
new file mode 100644
index 0000000..07995fc
--- /dev/null
+++ b/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaheng.pc.config.wcsscanbarcode.mapper.WcsscanbarcodeMapper">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.config.wcsscanbarcode.domain.Wcsscanbarcode">
+ <!--@mbg.generated-->
+ <!--@Table wcsscanbarcode-->
+ <id column="id" jdbcType="INTEGER" property="id" />
+ <result column="barcode" jdbcType="VARCHAR" property="barcode" />
+ <result column="flag" jdbcType="INTEGER" property="flag" />
+ <result column="area" jdbcType="INTEGER" property="area" />
+ <result column="Created" jdbcType="TIMESTAMP" property="created" />
+ <result column="CreatedBy" jdbcType="VARCHAR" property="createdby" />
+ <result column="Updated" jdbcType="TIMESTAMP" property="updated" />
+ <result column="UpdatedBy" jdbcType="VARCHAR" property="updatedby" />
+ <result column="content" jdbcType="VARCHAR" property="content" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, barcode, flag, area, Created, CreatedBy, Updated, UpdatedBy, content
+ </sql>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/xinyi/TokenMapper.xml b/src/main/resources/mybatis/xinyi/TokenMapper.xml
new file mode 100644
index 0000000..8766e77
--- /dev/null
+++ b/src/main/resources/mybatis/xinyi/TokenMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaheng.api.xinyi.mapper.TokenMapper">
+ <resultMap id="BaseResultMap" type="com.huaheng.api.xinyi.domian.TokenEntity">
+ <id column="id" jdbcType="INTEGER" property="id"/>
+ <result column="access_token" jdbcType="INTEGER" property="access_token" />
+ <result column="token_type" jdbcType="VARCHAR" property="token_type" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ <!--@mbg.generated-->
+ id, access_token, token_type
+ </sql>
+
+ <select id="findOneByAll" resultMap="BaseResultMap">
+ select * from token_entity limit 1
+ </select>
+
+ <!--auto generated by MybatisCodeHelper on 2019-12-29-->
+ <insert id="insertSelective">
+ INSERT INTO token_entity
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id!=null">id,</if>
+ <if test="access_token!=null">access_token,</if>
+ <if test="token_type!=null">token_type</if>
+ </trim>
+ VALUES
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id!=null">#{id,jdbcType=INTEGER},</if>
+ <if test="access_token!=null">#{access_token,jdbcType=INTEGER},</if>
+ <if test="token_type!=null">#{token_type,jdbcType=VARCHAR}</if>
+ </trim>
+ </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/container/container.html b/src/main/resources/templates/config/container/container.html
index 79958b5..3cb4027 100644
--- a/src/main/resources/templates/config/container/container.html
+++ b/src/main/resources/templates/config/container/container.html
@@ -57,6 +57,9 @@
</a>
</div>
+=======
+ </div>
+>>>>>>> Stashed changes
<div class="col-sm-12 select-info">
<table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
@@ -199,6 +202,7 @@
};
$.table.init(options);
});
+<<<<<<< Updated upstream
function print() {
var rows=$("#bootstrap-table").bootstrapTable('getSelections');
@@ -213,6 +217,8 @@
let url=prefix+'/print/' + ids;
$.modal.open("打印",url);
}
+=======
+>>>>>>> Stashed changes
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html b/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
index b6c3d1a..9488e15 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html
@@ -39,7 +39,11 @@
},
},
submitHandler: function(form) {
+<<<<<<< Updated upstream
$.operate.save(prefix + "/emptyCheckOut", $('#form-task-emptyInOut').serialize());
+=======
+ $.operate.save(prefix + "/emptyCheckOut", $('#form-task-emptyCheckOut').serialize());
+>>>>>>> Stashed changes
}
});