bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lizhenhua 2025-09-08 17:04:20 +08:00
parent 7f5a5404d6 53fd3c067d
commit 713beeb9a1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
View File

@ -89,6 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="goodsType != null "> and cm.goods_type = #{goodsType}</if> <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
<if test="barCode != null and barCode != ''"> and cm.bar_code = #{barCode}</if> <if test="barCode != null and barCode != ''"> and cm.bar_code = #{barCode}</if>
<if test="unitId != null "> and cm.unit_id = #{unitId}</if> <if test="unitId != null "> and cm.unit_id = #{unitId}</if>
<if test="unitName != null and unitName != '' and unitName == 'CRKYTJ' ">
and (iu.unit_name = '斤' or iu.unit_name = '公斤')
</if>
<if test="unitName != null and unitName != '' and unitName != 'CRKYTJ' ">
and iu.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
</if>
<if test="salePrice != null "> and cm.sale_price = #{salePrice}</if> <if test="salePrice != null "> and cm.sale_price = #{salePrice}</if>
<if test="unitPrice != null "> and cm.unit_price = #{unitPrice}</if> <if test="unitPrice != null "> and cm.unit_price = #{unitPrice}</if>
<if test="salesMode != null "> and cm.sales_mode = #{salesMode}</if> <if test="salesMode != null "> and cm.sales_mode = #{salesMode}</if>

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml
View File

@ -54,6 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null "> and ii.warehouse_id = #{warehouseId}</if> <if test="warehouseId != null "> and ii.warehouse_id = #{warehouseId}</if>
<if test="materialId != null "> and ii.material_id = #{materialId}</if> <if test="materialId != null "> and ii.material_id = #{materialId}</if>
<if test="unitId != null "> and ii.unit_id = #{unitId}</if> <if test="unitId != null "> and ii.unit_id = #{unitId}</if>
<if test="unitName != null and unitName != '' and unitName == 'CRKYTJ' ">
and (iu.unit_name = '斤' or iu.unit_name = '公斤')
</if>
<if test="unitName != null and unitName != '' and unitName != 'CRKYTJ' ">
and iu.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
</if>
<if test="minNum != null "> and ii.min_num = #{minNum}</if> <if test="minNum != null "> and ii.min_num = #{minNum}</if>
<if test="maxNum != null "> and ii.max_num = #{maxNum}</if> <if test="maxNum != null "> and ii.max_num = #{maxNum}</if>
<if test="materialNum != null "> and ii.material_num = #{materialNum}</if> <if test="materialNum != null "> and ii.material_num = #{materialNum}</if>