From c9394f133993673b3fc2aa67e5328215871d12fb Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 8 Sep 2025 15:14:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/ims/ImsInventoryMapper.xml | 6 ++++++
1 file changed, 6 insertions(+)
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 392faa9..dc215c7 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}
From 53fd3c067de9d386167aecaf9dcd79fe6abe0c94 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 8 Sep 2025 16:22:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/cook/CookMaterialMapper.xml | 6 ++++++
1 file changed, 6 insertions(+)
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}