diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml index 73bb8d9..8b2e53c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml @@ -89,6 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cm.goods_type = #{goodsType} and cm.bar_code = #{barCode} and cm.unit_id = #{unitId} + + and (iu.unit_name = '斤' or iu.unit_name = '公斤') + + + and iu.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%') + and cm.sale_price = #{salePrice} and cm.unit_price = #{unitPrice} and cm.sales_mode = #{salesMode} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml index c6d734c..a29d339 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml @@ -54,6 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ii.warehouse_id = #{warehouseId} and ii.material_id = #{materialId} and ii.unit_id = #{unitId} + + and (iu.unit_name = '斤' or iu.unit_name = '公斤') + + + and iu.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%') + and ii.min_num = #{minNum} and ii.max_num = #{maxNum} and ii.material_num = #{materialNum}