Skip to content

W
warehouse
Commit f6bc673f by anxiaohe
Options

Merge remote-tracking branch 'origin/master'

parents ce32fbcf 7e783147
Showing with 1 addition and 1 deletion
src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/mapper/xml/ProfitWarehousingInfoMapper.xml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
AND a.type = #{type.id} AND a.type = #{type.id}
</if> </if>
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''"> <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
AND profitWarehousing.time &gt;= #{beginTime} AND profitWarehousing.time &lt;= #{endTime} AND (qrCode.state = '2') AND profitWarehousing.time &gt;= #{beginTime} AND profitWarehousing.time &lt;= #{endTime} AND (qrCode.state = '2' or qrCode.state = '3')
</if> </if>
</where> </where>
<choose> <choose>
......
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