Merge remote-tracking branch 'origin/main'

main
Comair 7 months ago
commit ca8bab3443
  1. 4
      shkj-admin/src/main/resources/application-yun.yml
  2. 104
      shkj-wms/src/main/resources/mapper/wms/BaseBarcodesInMapper.xml
  3. 41
      shkj-wms/src/main/resources/mapper/wms/BaseBarcodesOutMapper.xml
  4. 22
      shkj-wms/src/main/resources/mapper/wms/BaseContainerMapper.xml

@ -65,13 +65,13 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 120.77.94.227
# 端口,默认为6379
port: 6379
# 数据库索引
database: 3
# 密码
password:
password: rvGUoUFAIg4nESp9
# 连接超时时间
timeout: 10s
lettuce:

@ -1,104 +0,0 @@
<?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.shkj.wms.mapper.BaseBarcodesInMapper">
<resultMap type="com.shkj.wms.domain.BaseBarcodesIn" id="BaseBarcodesInResult">
<result property="qrCode" column="qr_Code"/>
<result property="vehicheModel" column="vehiche_Model"/>
<result property="color" column="color"/>
<result property="location" column="location"/>
<result property="isSplit" column="is_Split"/>
<result property="isPunching" column="is_Punching"/>
<result property="isRepair" column="is_Repair"/>
<result property="goodsNo" column="goods_No"/>
<result property="locationCode" column="location_Code"/>
<result property="orientation" column="orientation"/>
<result property="punchingResult" column="punching_Result"/>
</resultMap>
<select id="getBaseBarcodesInByQuery" resultMap="BaseBarcodesInResult"
parameterType="String">
SELECT
*
FROM
base_barcodes_in
<if test="qrCode !=null and qrCode != '' ">
WHERE
base_barcodes_in.qr_code =#{qrCode}
</if>
</select>
<select id="getBaseBarcodesInByDerice" resultMap="BaseBarcodesInResult"
parameterType="com.shkj.wms.domain.BaseDerive">
SELECT
*
FROM
base_barcodes_in
WHERE 1=1
<if test="color != null and color != ''">
AND color = #{color}
</if>
<if test="vehicheModel != null and vehicheModel != '' ">
AND vehiche_model = #{vehicheModel}
</if>
<if test="isSplit != null and isSplit != '' ">
AND is_split = #{isSplit}
</if>
<if test="isPunching != null and isPunching != '' ">
AND is_punching = #{isPunching}
</if>
<if test="orientation != null and orientation != '' ">
AND orientation = #{orientation}
</if>
<if test="locationCode != null and locationCode != '' ">
AND location_code = #{locationCode}
</if>
LIMIT 1
</select>
<select id="getBillInPlanData" resultMap="BaseBarcodesInResult"
parameterType="com.shkj.wms.bo.BaseBarcodesInQueryBo">
SELECT
*
FROM
base_barcodes_in
WHERE 1=1
<if test="color != null and color != '' ">
AND color = #{color}
</if>
<if test="vehicheModel != null and vehicheModel != '' ">
AND vehiche_model = #{vehicheModel}
</if>
<if test="isSplit != null and isSplit != '' ">
AND is_split = #{isSplit}
</if>
<if test="isPunching != null and isPunching != '' ">
AND is_punching = #{isPunching}
</if>
<if test="orientation != null and orientation != '' ">
AND orientation = #{orientation}
</if>
<if test="locationCode != null and locationCode != ''">
AND location_code = #{locationCode}
</if>
<if test="qrCode != null and qrCode != '' ">
AND qr_code = #{qrCode}
</if>
<if test="inStatus != null and inStatus != ''">
AND in_status = #{inStatus}
</if>
<if test="createTimeS != null ">
AND create_Time &gt;= #{createTimeS}
</if>
<if test="createTimeE != null ">
AND create_Time &lt;= #{createTimeE}
</if>
</select>
</mapper>

@ -1,41 +0,0 @@
<?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.shkj.wms.mapper.BaseBarcodesOutMapper">
<select id="selectVinOutboundList" resultType="com.shkj.wms.bo.BaseBarcodesOutAddBo">
select vin, derive, traverse_date, color, bumper_type, vehicle_code, out_status ,'0' as isUrgent from base_barcodes_out
where out_status="0"
order by traverse_date asc
</select>
<select id="getBarcodesOutData" resultType="com.shkj.wms.vo.BaseBarcodesOutVo">
select outs.vin,derive,vehicle_code,bumper_type,color,outs.batch,head.id as transId,out_status,outs.traverse_date,'1' as isUrgent
from base_barcodes_out outs left join busin_billhead head
on outs.vin=head.vin
where ifnull(audit_flg,0)!=1
<if test="queryKeywords !=null and queryKeywords !='' ">
and ( outs.vehicle_code like concat('%', #{queryKeywords}, '%') or outs.derive like concat('%', #{queryKeywords}, '%'))
</if>
</select>
<select id="getBarcodesnoOutData" resultType="com.shkj.wms.vo.BaseBarcodesOutVo">
SELECT o.derive,
o.goods_no,
o.color,
o.bumper_type,
o.vehicle_code,
o.traverse_date,
b.batch,
b.is_cancle,
o.id
FROM base_barcodes_out o
LEFT JOIN busin_billhead b ON o.vin = b.vin
WHERE out_status = '1'
and ifnull(audit_flg, '0')!='1'
and ifnull(is_cancle,'0')!='1'
ORDER BY batch ASC
</select>
</mapper>

@ -110,28 +110,6 @@
</where>
</select>
<select id="getContainerUpkeepDay" resultType="com.shkj.wms.vo.BusinContainerUpkeepVo"
parameterType="com.shkj.wms.bo.BusinContainerUpkeepQueryBo">
select conttainer.id as container_id, upkeep.id,conttainer.container_name,conttainer.container_code,
next_upkeep,ifnull(upkeep_time,create_time) as upkeep_time,DATEDIFF(CURTIME(),ifnull(upkeep_time,create_time))
days_used from base_container conttainer
left join
(
select id, container_id,next_upkeep,upkeep_time
from busin_container_upkeep
where ifnull(is_upkeep,0) =0
)upkeep on conttainer.id=upkeep.container_id
<where>
<if test="containerCode !=null and containerCode !='' ">
conttainer.container_code =#{containerCode}
</if>
<if test="branchId != null">
and conttainer.branch_id = #{branchId}
</if>
</where>
</select>
<select id="getContainerNoInv" resultType="com.shkj.wms.vo.BaseContainerVo">
select distinct
a.container_code,b.container_name from sys_stock_detail a

Loading…
Cancel
Save