Commit 59ee545e authored by XuYang's avatar XuYang

添加

parent a2e62cbb
...@@ -57,6 +57,13 @@ ...@@ -57,6 +57,13 @@
<version>RELEASE</version> <version>RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -13,11 +13,14 @@ server: ...@@ -13,11 +13,14 @@ server:
mybatis-plus: mybatis-plus:
mapper-locations: "classpath*:mapper/**/**/*.xml" mapper-locations: "classpath*:mapper/**/**/*.xml"
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config: global-config:
db-config: db-config:
logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
# ------------spring component------------------ # ------------spring component------------------
spring: spring:
main: main:
...@@ -115,15 +118,15 @@ spring: ...@@ -115,15 +118,15 @@ spring:
#---------5.1 MYSQL------------- #---------5.1 MYSQL-------------
# mysql5.0 # mysql5.0
#driver-class-name: com.mysql.jdbc.Driver #driver-class-name: com.mysql.jdbc.Driver
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
# username: ${cy_db.username} # username: ${cy_db.username}
# password: ${cy_db.password} # password: ${cy_db.password}
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/wms_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/wms_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: root
password: mosheng password: 123456
#----------5.2 POSTGRES------------ #----------5.2 POSTGRES------------
......
...@@ -6,3 +6,11 @@ spring: ...@@ -6,3 +6,11 @@ spring:
prod: prod-conf,common,spbt prod: prod-conf,common,spbt
kube: kube-conf,common,spbt kube: kube-conf,common,spbt
test: test-conf,common,spbt test: test-conf,common,spbt
servlet:
multipart:
max-file-size: 10MB
max-request-size: 20MB
localPath:
path: D:\testImg\
...@@ -25,11 +25,13 @@ ...@@ -25,11 +25,13 @@
<result column="out_goods" jdbcType="VARCHAR" property="outGoods"/> <result column="out_goods" jdbcType="VARCHAR" property="outGoods"/>
</resultMap> </resultMap>
<insert id="batchAdd">insert into wms_goods_apply(flag,del_flag,create_by,create_date,update_by,update_date,remarks, <insert id="batchAdd">insert into wms_goods_apply(flag,del_flag,create_by,create_date,update_by,update_date,remarks,
io_type,deal_status,goods_counts,shipper,shipper_address,shipper_phone,goods_check,salesman,maker,in_goods,out_goods,app_code) values io_type,deal_status,goods_counts,shipper,shipper_address,shipper_phone,goods_check,salesman,maker,in_goods,out_goods,app_code)
values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.flag},#{item.delFlag},#{item.createBy},#{item.createDate},#{item.updateBy},#{item.updateDate},#{item.remarks},#{item.io_type},#{item.deal_status},#{item.goods_counts},#{item.shipper},#{item.shipper_address},#{item.shipper_phone}, (#{item.flag},#{item.delFlag},#{item.createBy},#{item.createDate},#{item.updateBy},#{item.updateDate},#{item.remarks},#{item.io_type},#{item.deal_status},#{item.goods_counts},#{item.shipper},#{item.shipper_address},#{item.shipper_phone},
#{item.goods_check},#{item.salesman},#{item.maker},#{item.inGoods},#{item.outGoods},#{item.appCode}) #{item.goods_check},#{item.salesman},#{item.maker},#{item.inGoods},#{item.outGoods},#{item.appCode})
</foreach></insert> </foreach>
</insert>
<!--<cache type="${corePackag!}.util.RedisCache"/>--> <!--<cache type="${corePackag!}.util.RedisCache"/>-->
<select id="queryWmsGoodsApplys" resultMap="BaseResultMap"> <select id="queryWmsGoodsApplys" resultMap="BaseResultMap">
select * from wms_goods_apply select * from wms_goods_apply
...@@ -110,6 +112,7 @@ ...@@ -110,6 +112,7 @@
</if> </if>
ORDER BY business_id DESC ORDER BY business_id DESC
</select> </select>
<select id="getOrderCodeCount" resultType="java.lang.Integer"> <select id="getOrderCodeCount" resultType="java.lang.Integer">
SELECT COALESCE( SELECT COALESCE(
(SELECT MAX(RIGHT(app_code, 3)) FROM wms_goods_apply WHERE app_code LIKE CONCAT(#{data}, '%')), (SELECT MAX(RIGHT(app_code, 3)) FROM wms_goods_apply WHERE app_code LIKE CONCAT(#{data}, '%')),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment