|
|
|
@ -14,7 +14,7 @@
|
|
|
|
(select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName,
|
|
|
|
(select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName,
|
|
|
|
(select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
|
|
|
|
(select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
|
|
|
|
(select name from basic_corp bc where bc.erpId = io.customerId) customerName
|
|
|
|
(select name from basic_corp bc where bc.erpId = io.customerId) customerName
|
|
|
|
from io_order as io
|
|
|
|
from io_order as io
|
|
|
|
<if test="uploadKey != null and uploadKey != ''">
|
|
|
|
<if test="uploadKey != null and uploadKey != ''">
|
|
|
|
INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
|
|
|
|
INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
@ -29,6 +29,9 @@
|
|
|
|
<if test="action != null and action != ''">
|
|
|
|
<if test="action != null and action != ''">
|
|
|
|
AND action = #{action}
|
|
|
|
AND action = #{action}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="remark != null and remark != ''">
|
|
|
|
|
|
|
|
AND remark like concat('%', #{remark}, '%')
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="mainAction != null and mainAction != ''">
|
|
|
|
<if test="mainAction != null and mainAction != ''">
|
|
|
|
AND mainAction = #{mainAction}
|
|
|
|
AND mainAction = #{mainAction}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
@ -77,7 +80,10 @@
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="unionRemark != null and unionRemark != ''">
|
|
|
|
|
|
|
|
AND (io.remark like concat('%', #{unionRemark}, '%')
|
|
|
|
|
|
|
|
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="statuses != null and statuses.size() != 0">
|
|
|
|
<if test="statuses != null and statuses.size() != 0">
|
|
|
|
AND status in
|
|
|
|
AND status in
|
|
|
|
<foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
<foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
@ -139,8 +145,8 @@
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
<choose>
|
|
|
|
<choose>
|
|
|
|
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
|
|
|
|
<when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
|
|
|
|
order by ${orderBy} ${sort}
|
|
|
|
order by ${orderBy} ${sort}
|
|
|
|
</when>
|
|
|
|
</when>
|
|
|
|
<otherwise>
|
|
|
|
<otherwise>
|
|
|
|
order by updateTime desc
|
|
|
|
order by updateTime desc
|
|
|
|
@ -294,8 +300,8 @@
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
<choose>
|
|
|
|
<choose>
|
|
|
|
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
|
|
|
|
<when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
|
|
|
|
order by ${orderBy} ${sort}
|
|
|
|
order by ${orderBy} ${sort}
|
|
|
|
</when>
|
|
|
|
</when>
|
|
|
|
<otherwise>
|
|
|
|
<otherwise>
|
|
|
|
order by updateTime desc
|
|
|
|
order by updateTime desc
|
|
|
|
@ -340,6 +346,10 @@
|
|
|
|
<if test="syncStatus != null">
|
|
|
|
<if test="syncStatus != null">
|
|
|
|
AND syncStatus = #{syncStatus}
|
|
|
|
AND syncStatus = #{syncStatus}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="unionRemark != null and unionRemark != ''">
|
|
|
|
|
|
|
|
AND (io.remark like concat('%', #{unionRemark}, '%')
|
|
|
|
|
|
|
|
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="busType != null">
|
|
|
|
<if test="busType != null">
|
|
|
|
AND busType = #{busType}
|
|
|
|
AND busType = #{busType}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
@ -441,7 +451,7 @@
|
|
|
|
<if test="thirdSys != null and thirdSys != ''">
|
|
|
|
<if test="thirdSys != null and thirdSys != ''">
|
|
|
|
AND t1.thirdSys = #{thirdSys}
|
|
|
|
AND t1.thirdSys = #{thirdSys}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="orderStartTime != null ">
|
|
|
|
<if test="orderStartTime != null">
|
|
|
|
<![CDATA[
|
|
|
|
<![CDATA[
|
|
|
|
and updateTime >= DATE_FORMAT(#{orderStartTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
and updateTime >= DATE_FORMAT(#{orderStartTime}, '%Y-%m-%d %H:%i:%S')
|
|
|
|
]]>
|
|
|
|
]]>
|
|
|
|
@ -462,43 +472,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectOrderIdList" resultType="java.lang.String">
|
|
|
|
<select id="selectOrderIdList" resultType="java.lang.String">
|
|
|
|
SELECT billNo
|
|
|
|
SELECT billNo
|
|
|
|
FROM io_order
|
|
|
|
FROM io_order
|
|
|
|
LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
|
|
|
|
LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
|
|
|
|
WHERE basic_bussiness_type.inStock = 1
|
|
|
|
WHERE basic_bussiness_type.inStock = 1
|
|
|
|
and io_order.`status` = 7
|
|
|
|
and io_order.`status` = 7
|
|
|
|
AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data},'%Y-%m-%d')
|
|
|
|
AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data}, '%Y-%m-%d')
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectOrderfirstAndLastIdList" resultType="java.lang.String">
|
|
|
|
<select id="selectOrderfirstAndLastIdList" resultType="java.lang.String">
|
|
|
|
SELECT billNo
|
|
|
|
SELECT billNo
|
|
|
|
FROM io_order
|
|
|
|
FROM io_order
|
|
|
|
LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
|
|
|
|
LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
|
|
|
|
WHERE basic_bussiness_type.inStock = 1
|
|
|
|
WHERE basic_bussiness_type.inStock = 1
|
|
|
|
and io_order.`status` = 7
|
|
|
|
and io_order.`status` = 7
|
|
|
|
AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
|
|
|
|
AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{lastData}, '%Y-%m-%d') and
|
|
|
|
date_format(#{firstData}, '%Y-%m-%d')
|
|
|
|
date_format(#{firstData}, '%Y-%m-%d')
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
|
|
|
|
<select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
|
|
|
|
SELECT io.*,
|
|
|
|
SELECT io.*,
|
|
|
|
bus.NAME AS billTypeName,
|
|
|
|
bus.NAME AS billTypeName,
|
|
|
|
ad.NAME AS deptName,
|
|
|
|
ad.NAME AS deptName,
|
|
|
|
aw.NAME AS invName,
|
|
|
|
aw.NAME AS invName,
|
|
|
|
bc.NAME AS fromCorpName
|
|
|
|
bc.NAME AS fromCorpName
|
|
|
|
FROM io_order io
|
|
|
|
FROM io_order io
|
|
|
|
LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
|
|
|
|
LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
|
|
|
|
LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
|
|
|
|
LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
|
|
|
|
LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
|
|
|
|
LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
|
|
|
|
LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
|
|
|
|
LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
|
|
|
|
LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
|
|
|
|
LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
|
|
|
|
<where>
|
|
|
|
<where>
|
|
|
|
<if test="id != null and id != ''">
|
|
|
|
<if test="id != null and id != ''">
|
|
|
|
AND io.id = #{id}
|
|
|
|
AND io.id = #{id}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="corpName != null and corpName != ''">
|
|
|
|
<if test="corpName != null and corpName != ''">
|
|
|
|
AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
|
|
|
|
AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
|
|
|
|
concat('%', #{corpName}, '%')
|
|
|
|
concat('%', #{corpName}, '%')
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
<if test="action != null and action != ''">
|
|
|
|
<if test="action != null and action != ''">
|
|
|
|
AND io.action = #{action}
|
|
|
|
AND io.action = #{action}
|
|
|
|
@ -506,6 +516,10 @@
|
|
|
|
<if test="mainAction != null and mainAction != ''">
|
|
|
|
<if test="mainAction != null and mainAction != ''">
|
|
|
|
AND io.mainAction = #{mainAction}
|
|
|
|
AND io.mainAction = #{mainAction}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="unionRemark != null and unionRemark != ''">
|
|
|
|
|
|
|
|
AND (io.remark like concat('%', #{unionRemark}, '%')
|
|
|
|
|
|
|
|
or io.outSickInfo like concat('%', #{unionRemark}, '%'))
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="billNo != null and billNo != ''">
|
|
|
|
<if test="billNo != null and billNo != ''">
|
|
|
|
AND io.billNo like concat('%', #{billNo}, '%')
|
|
|
|
AND io.billNo like concat('%', #{billNo}, '%')
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
@ -586,12 +600,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
<if test="invoiceActions1 == null and invoiceActions2 != null">
|
|
|
|
<if test="invoiceActions1 == null and invoiceActions2 != null">
|
|
|
|
and (
|
|
|
|
and (
|
|
|
|
io.`action` in
|
|
|
|
io.`action` in
|
|
|
|
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
and io.status = 7
|
|
|
|
and io.status = 7
|
|
|
|
)
|
|
|
|
)
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
|
|
<if test="invoiceActions1 != null and invoiceActions2 != null">
|
|
|
|
<if test="invoiceActions1 != null and invoiceActions2 != null">
|
|
|
|
@ -600,13 +614,13 @@
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
and io.status = 10)
|
|
|
|
and io.status = 10)
|
|
|
|
or (
|
|
|
|
or (
|
|
|
|
io.`action` in
|
|
|
|
io.`action` in
|
|
|
|
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
and io.status = 7)
|
|
|
|
and io.status = 7)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
</where>
|
|
|
|
</where>
|
|
|
|
|
薛宇
2 years ago