Skip to content

W
wms_api
Commit 59ee545e authored by XuYang's avatar XuYang
Browse files
Options

添加

parent a2e62cbb
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 78 deletions
pom.xml
View file @ 59ee545e
...@@ -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>
......
src/main/resources/application-common.yml
View file @ 59ee545e
...@@ -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:
...@@ -61,7 +64,7 @@ spring: ...@@ -61,7 +64,7 @@ spring:
timeout: 3000 timeout: 3000
jedis: jedis:
pool: pool:
max-active: 32 max-active: 32
max-idle: 16 max-idle: 16
max-wait: 300ms max-wait: 300ms
min-idle: 8 min-idle: 8
...@@ -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------------
......
src/main/resources/application.yml
View file @ 59ee545e
...@@ -5,4 +5,12 @@ spring: ...@@ -5,4 +5,12 @@ spring:
dev: dev-conf,common,spbt dev: dev-conf,common,spbt
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
\ No newline at end of file
servlet:
multipart:
max-file-size: 10MB
max-request-size: 20MB
localPath:
path: D:\testImg\
src/main/resources/mapper/bus/wmsGoodsApply/WmsGoodsApplyMapper.xml
View file @ 59ee545e
...@@ -25,91 +25,94 @@ ...@@ -25,91 +25,94 @@
<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
where 1=1 where 1=1
and del_flag = '0' and del_flag = '0'
<if test="entity.flag !=null and entity.flag != '' "> <if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag} and flag = #{entity.flag}
</if> </if>
<if test="entity.ioType !=null and entity.ioType != '' "> <if test="entity.ioType !=null and entity.ioType != '' ">
and io_type = #{entity.ioType} and io_type = #{entity.ioType}
</if> </if>
<if test="entity.dealStatus !=null and entity.dealStatus != '' "> <if test="entity.dealStatus !=null and entity.dealStatus != '' ">
and deal_status = #{entity.dealStatus} and deal_status = #{entity.dealStatus}
</if> </if>
<if test="entity.goodsCounts !=null and entity.goodsCounts != '' "> <if test="entity.goodsCounts !=null and entity.goodsCounts != '' ">
and goods_counts = #{entity.goodsCounts} and goods_counts = #{entity.goodsCounts}
</if> </if>
<if test="entity.appCode !=null and entity.appCode != '' "> <if test="entity.appCode !=null and entity.appCode != '' ">
and app_code like concat('%',#{entity.appCode},'%') and app_code like concat('%',#{entity.appCode},'%')
</if> </if>
<if test="entity.shipper !=null and entity.shipper != '' "> <if test="entity.shipper !=null and entity.shipper != '' ">
and shipper like concat('%',#{entity.shipper},'%') and shipper like concat('%',#{entity.shipper},'%')
</if> </if>
<if test="entity.shipperAddress !=null and entity.shipperAddress != '' "> <if test="entity.shipperAddress !=null and entity.shipperAddress != '' ">
and shipper_address like concat('%',#{entity.shipperAddress},'%') and shipper_address like concat('%',#{entity.shipperAddress},'%')
</if> </if>
<if test="entity.shipperPhone !=null and entity.shipperPhone != '' "> <if test="entity.shipperPhone !=null and entity.shipperPhone != '' ">
and shipper_phone like concat('%',#{entity.shipperPhone},'%') and shipper_phone like concat('%',#{entity.shipperPhone},'%')
</if> </if>
<if test="entity.goodsCheck !=null and entity.goodsCheck != '' "> <if test="entity.goodsCheck !=null and entity.goodsCheck != '' ">
and goods_check = #{entity.goodsCheck} and goods_check = #{entity.goodsCheck}
</if> </if>
<if test="entity.salesman !=null and entity.salesman != '' "> <if test="entity.salesman !=null and entity.salesman != '' ">
and salesman like concat('%',#{entity.salesman},'%') and salesman like concat('%',#{entity.salesman},'%')
</if> </if>
<if test="entity.maker !=null and entity.maker != '' "> <if test="entity.maker !=null and entity.maker != '' ">
and maker like concat('%',#{entity.maker},'%') and maker like concat('%',#{entity.maker},'%')
</if> </if>
ORDER BY business_id DESC ORDER BY business_id DESC
</select> </select>
<select id="queryWmsGoodsApplysPaged" resultMap="BaseResultMap"> <select id="queryWmsGoodsApplysPaged" resultMap="BaseResultMap">
select * from wms_goods_apply select * from wms_goods_apply
where 1=1 where 1=1
and del_flag = '0' and io_type='0' and del_flag = '0' and io_type='0'
<if test="entity.flag !=null and entity.flag != '' "> <if test="entity.flag !=null and entity.flag != '' ">
and flag = #{entity.flag} and flag = #{entity.flag}
</if> </if>
<if test="entity.ioType !=null and entity.ioType != '' "> <if test="entity.ioType !=null and entity.ioType != '' ">
and io_type = #{entity.ioType} and io_type = #{entity.ioType}
</if> </if>
<if test="entity.dealStatus !=null and entity.dealStatus != '' "> <if test="entity.dealStatus !=null and entity.dealStatus != '' ">
and deal_status = #{entity.dealStatus} and deal_status = #{entity.dealStatus}
</if> </if>
<if test="entity.goodsCounts !=null and entity.goodsCounts != '' "> <if test="entity.goodsCounts !=null and entity.goodsCounts != '' ">
and goods_counts = #{entity.goodsCounts} and goods_counts = #{entity.goodsCounts}
</if> </if>
<if test="entity.appCode !=null and entity.appCode != '' "> <if test="entity.appCode !=null and entity.appCode != '' ">
and app_code like concat('%',#{entity.appCode},'%') and app_code like concat('%',#{entity.appCode},'%')
</if> </if>
<if test="entity.shipper !=null and entity.shipper != '' "> <if test="entity.shipper !=null and entity.shipper != '' ">
and shipper like concat('%',#{entity.shipper},'%') and shipper like concat('%',#{entity.shipper},'%')
</if> </if>
<if test="entity.shipperAddress !=null and entity.shipperAddress != '' "> <if test="entity.shipperAddress !=null and entity.shipperAddress != '' ">
and shipper_address like concat('%',#{entity.shipperAddress},'%') and shipper_address like concat('%',#{entity.shipperAddress},'%')
</if> </if>
<if test="entity.shipperPhone !=null and entity.shipperPhone != '' "> <if test="entity.shipperPhone !=null and entity.shipperPhone != '' ">
and shipper_phone like concat('%',#{entity.shipperPhone},'%') and shipper_phone like concat('%',#{entity.shipperPhone},'%')
</if> </if>
<if test="entity.goodsCheck !=null and entity.goodsCheck != '' "> <if test="entity.goodsCheck !=null and entity.goodsCheck != '' ">
and goods_check = #{entity.goodsCheck} and goods_check = #{entity.goodsCheck}
</if> </if>
<if test="entity.salesman !=null and entity.salesman != '' "> <if test="entity.salesman !=null and entity.salesman != '' ">
and salesman like concat('%',#{entity.salesman},'%') and salesman like concat('%',#{entity.salesman},'%')
</if> </if>
<if test="entity.maker !=null and entity.maker != '' "> <if test="entity.maker !=null and entity.maker != '' ">
and maker like concat('%',#{entity.maker},'%') and maker like concat('%',#{entity.maker},'%')
</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}, '%')),
...@@ -143,7 +146,7 @@ ...@@ -143,7 +146,7 @@
and shipper_address like concat('%',#{entity.shipperAddress},'%') and shipper_address like concat('%',#{entity.shipperAddress},'%')
</if> </if>
<if test="entity.shipperPhone !=null and entity.shipperPhone != '' "> <if test="entity.shipperPhone !=null and entity.shipperPhone != '' ">
and shipper_phone like concat('%',#{entity.shipperPhone},'%') and shipper_phone like concat('%',#{entity.shipperPhone},'%')
</if> </if>
<if test="entity.goodsCheck !=null and entity.goodsCheck != '' "> <if test="entity.goodsCheck !=null and entity.goodsCheck != '' ">
and goods_check = #{entity.goodsCheck} and goods_check = #{entity.goodsCheck}
......
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