purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据中商品的选择增加批次和序列号过滤的接口字段

Browse Source
This commit is contained in:
季圣华
2022-05-22 23:48:42 +08:00
parent f52a4c34b0
commit 286bc0c375
4 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -290,7 +290,7 @@
where m.enabled=1 and me.id is not null
<if test="q != null and q !=''">
<bind name="bindKey" value="'%'+q+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or m.color like #{bindKey})
</if>
<if test="idList.size()>0">
and m.category_id in
@@ -298,6 +298,12 @@
#{item}
</foreach>
</if>
<if test="enableSerialNumber != null and enableSerialNumber !=''">
and m.enable_serial_number = #{enableSerialNumber}
</if>
<if test="enableBatchNumber != null and enableBatchNumber !=''">
and m.enable_batch_number = #{enableBatchNumber}
</if>
and ifnull(m.delete_flag,'0') !='1'
ORDER BY m.id desc, me.default_flag desc, me.id asc
<if test="offset != null and rows != null">
@@ -320,6 +326,12 @@
#{item}
</foreach>
</if>
<if test="enableSerialNumber != null and enableSerialNumber !=''">
and m.enable_serial_number = #{enableSerialNumber}
</if>
<if test="enableBatchNumber != null and enableBatchNumber !=''">
and m.enable_batch_number = #{enableBatchNumber}
</if>
and ifnull(m.delete_flag,'0') !='1'
</select>