From d9eb7a0193094c5aa7e6361ce6cd0793144eccdf Mon Sep 17 00:00:00 2001 From: lizhenhua <1075222162@qq.com> Date: Fri, 30 Jan 2026 11:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E4=BA=BA=E5=91=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beans/DrpInventoryoutDetailVO.java | 7 + .../beans/InventoryGoodsSummaryVO.java | 3 + .../controller/DrpInventoryController.java | 12 +- .../DrpInventoryIntoDetailController.java | 1 + .../mapper/DrpInventoryhzMapper.java | 6 + .../service/DrpInventoryService.java | 3 + .../DrpInventoryIntoDetailServiceImpl.java | 6 +- .../service/impl/DrpInventoryServiceImpl.java | 26 +- .../mapper/reportforms/DrpInventorMapper.xml | 130 +++++++ .../DrpInventoryIntoDetailMapper.xml | 344 ++++++++++++++++-- .../mapper/reportforms/OrgConsumerMapper.xml | 2 +- 11 files changed, 494 insertions(+), 46 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/DrpInventoryoutDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/DrpInventoryoutDetailVO.java index 3b4edfd2..5b392948 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/DrpInventoryoutDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/DrpInventoryoutDetailVO.java @@ -18,6 +18,13 @@ import java.util.Date; @Data public class DrpInventoryoutDetailVO { + /** + * 记录类型标识 + * 0: 正常入库记录 + * 1: 退款记录（数量金额为负） + */ + private Integer recordTypeFlag; + /** 仓库ID */ private Long warehouseId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/InventoryGoodsSummaryVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/InventoryGoodsSummaryVO.java index cc2a571e..a4f4007c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/InventoryGoodsSummaryVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/beans/InventoryGoodsSummaryVO.java @@ -67,4 +67,7 @@ public class InventoryGoodsSummaryVO { @Excel(name = "仓库名称") private String warehouseName; + private String supplierName; + private Long supplierId; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryController.java index c8ee4994..6af599ab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryController.java @@ -9,6 +9,7 @@ import com.bonus.canteen.core.reportforms.service.DrpInventoryService; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -75,5 +76,14 @@ public class DrpInventoryController extends BaseController{ ajax.put("summary", summary); return ajax; } - + /** + * 供应商汇总 + */ + @GetMapping("/summarylist") + public TableDataInfo summarylist(DrpInventoryIntoDetailQueryDTO inventoryInOutSummaryVO) + { + startPage(); + List list = drpInventoryService.selectInventoryInOutSummaryList(inventoryInOutSummaryVO); + return getDataTable(list); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryIntoDetailController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryIntoDetailController.java index 77bb066f..93f99272 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryIntoDetailController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/controller/DrpInventoryIntoDetailController.java @@ -146,4 +146,5 @@ public class DrpInventoryIntoDetailController extends BaseController List list = drpInventoryIntoDetailService.getGoodsCategoryDict(); return AjaxResult.success(list); } + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/mapper/DrpInventoryhzMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/mapper/DrpInventoryhzMapper.java index d335ebb5..f9df837a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/mapper/DrpInventoryhzMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/mapper/DrpInventoryhzMapper.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.reportforms.mapper; import com.bonus.canteen.core.reportforms.beans.*; import java.util.List; +import org.apache.ibatis.annotations.Param; public interface DrpInventoryhzMapper { @@ -13,4 +14,9 @@ public interface DrpInventoryhzMapper { List queryInventoryWarehouseSummaryList(DrpInventoryIntoDetailWrapper wrapper); InventoryIntoSummaryVO queryInventoryWarehouseSummarySum(DrpInventoryIntoDetailWrapper wrapper); + + List queryInventorySupplierSummaryList(DrpInventoryIntoDetailWrapper wrapper); + + List queryWarehouseInventorySupplierSummaryList(@Param("idList") List idList, + @Param("wrapper") DrpInventoryIntoDetailWrapper wrapper); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/DrpInventoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/DrpInventoryService.java index c7bdefd6..4d9b3bc5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/DrpInventoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/DrpInventoryService.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.reportforms.service; import com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailQueryDTO; import com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailVO; import com.bonus.canteen.core.reportforms.beans.InventoryGoodsSummaryVO; +import com.bonus.canteen.core.reportforms.beans.InventoryIntoSummaryVO; import java.util.List; import java.util.Map; @@ -16,4 +17,6 @@ public interface DrpInventoryService { List pageInventoryIntoDetailExport(DrpInventoryIntoDetailQueryDTO queryDTO); Map pageInventoryWarehouseSummary(DrpInventoryIntoDetailQueryDTO queryDTO); + + List selectInventoryInOutSummaryList(DrpInventoryIntoDetailQueryDTO inventoryInOutSummaryVO); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java index 909863bb..739d9576 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryIntoDetailServiceImpl.java @@ -94,7 +94,7 @@ public class DrpInventoryIntoDetailServiceImpl implements IDrpInventoryIntoDetai wrapper.setWarehouseAuthority(warehouseAuthority); wrapper.setAreaAuth(areaAuth); List drpInventoryoutDetailVOS = drpInventoryIntoDetailMapper.queryInventoryOutDetail(wrapper); - for ( DrpInventoryoutDetailVO c : drpInventoryoutDetailVOS) { + /* for ( DrpInventoryoutDetailVO c : drpInventoryoutDetailVOS) { try { // 姓名解密 if (c.getOperatorName() != null && !c.getOperatorName().isEmpty()) { @@ -103,9 +103,11 @@ public class DrpInventoryIntoDetailServiceImpl implements IDrpInventoryIntoDetai } catch (Exception e) { e.printStackTrace(); } - } + }*/ // 查询合计数据 - 这里应该返回 InventoryIntoSummaryVO InventoryIntoSummaryVO sumRow = drpInventoryIntoDetailMapper.queryInventoryIntoDocDetailoutSum(wrapper); + //有关退款问题进行处理 + // 创建一个Map来返回明细和合计数据 Map result = new HashMap<>(); result.put("list", drpInventoryoutDetailVOS); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryServiceImpl.java index 0c7c859c..dca4b037 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/reportforms/service/impl/DrpInventoryServiceImpl.java @@ -4,17 +4,18 @@ import com.bonus.canteen.core.reportforms.beans.*; import com.bonus.canteen.core.reportforms.mapper.DrpInventoryIntoDetailMapper; import com.bonus.canteen.core.reportforms.mapper.DrpInventoryhzMapper; import com.bonus.canteen.core.reportforms.service.DrpInventoryService; -import com.bonus.common.houqin.utils.SM4EncryptUtils; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.domain.SysUser; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Collectors; @Service public class DrpInventoryServiceImpl implements DrpInventoryService { @@ -76,4 +77,25 @@ public class DrpInventoryServiceImpl implements DrpInventoryService { result.put("summary", sumRow); // 这里直接放入 sumRow 对象 return result; } + + @Override + public List selectInventoryInOutSummaryList(DrpInventoryIntoDetailQueryDTO queryDTO) { + + SysUser currentUser = SecurityUtils.getLoginUser().getSysUser(); + List areaAuth = drpInventoryIntoDetailMapper.getTenantAreaIds(currentUser.getUserId()); + PageHelper.startPage(queryDTO); + DrpInventoryIntoDetailWrapper wrapper = new DrpInventoryIntoDetailWrapper(); + wrapper.setParam(queryDTO); + wrapper.setAreaAuth(areaAuth); + List list = this.drpInventoryMapper.queryInventorySupplierSummaryList(wrapper); + List idList = new ArrayList(); + for (InventoryGoodsSummaryVO vo : list) { + Long supplierId = vo.getSupplierId(); + if (supplierId != null) { + idList.add(supplierId); + } + } + List warhouseVOList = this.drpInventoryMapper.queryWarehouseInventorySupplierSummaryList(idList, wrapper); + return warhouseVOList; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventorMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventorMapper.xml index 3d056419..bf2952fb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventorMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventorMapper.xml @@ -288,6 +288,136 @@ + + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml index fc8c77a0..fd573777 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/DrpInventoryIntoDetailMapper.xml @@ -220,7 +220,8 @@ resultType="com.bonus.canteen.core.reportforms.beans.DrpInventoryoutDetailVO" parameterType="com.bonus.canteen.core.reportforms.beans.DrpInventoryIntoDetailWrapper"> - select de.material_id, + SELECT + de.material_id, mm.material_name as goods_name, mm.material_code as goods_code, mmc.category_id, @@ -240,11 +241,12 @@ de.out_into_amount intoAmount, de.total_amount balance_amount, de.fetch_user_id as operator_id, - IF (mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName, + IF(mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName, de.product_date as production_date, de.expire_time as expiry_date, de.record_id, - mm.size as specification + mm.size as specification, + 0 as record_type_flag -- 0表示正常入库记录 from report_drp_inventory_base de LEFT JOIN menu_material mm ON de.material_id = mm.material_id LEFT JOIN drp_unit du ON de.unit_id = du.unit_id @@ -252,13 +254,7 @@ left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id left join alloc_area aa on aa.area_id = dw.area_id LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id - left join order_info oi on oi.order_time = de.record_time where de.record_type = 2 and de.out_into_type in (1,3,5,6) - and not exists ( - select 1 from order_info oi - where oi.order_time = de.record_time - and oi.order_state = 3 - ) and de.record_date >= #{param.startDate} @@ -325,7 +321,112 @@ - + UNION ALL + + -- 退款记录（负数） + SELECT + de.material_id, + mm.material_name as goods_name, + mm.material_code as goods_code, + mmc.category_id, + mmc.category_name as goods_category_name, + de.unit_id, + du.unit_name, + de.unit_price as price, + aa.area_name, + dw.warehouse_id, + dw.warehouse_name, + de.out_into_type intoType, + de.fetch_user_id as supplier_id, + null as supplier_name, + de.record_time intoDate, + de.out_into_num intoNum, -- 负值表示退款 + de.inventory_num balance_num, + -de.out_into_amount intoAmount, -- 负值表示退款 + de.total_amount balance_amount, + de.fetch_user_id as operator_id, + IF(mu.real_name IS NULL OR mu.real_name = '', mu.username, mu.real_name) operatorName, + de.product_date as production_date, + de.expire_time as expiry_date, + de.record_id, + mm.size as specification, + 1 as record_type_flag -- 1表示退款记录 + from report_drp_inventory_base de + LEFT JOIN menu_material mm ON de.material_id = mm.material_id + LEFT JOIN drp_unit du ON de.unit_id = du.unit_id + LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id + left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id + left join alloc_area aa on aa.area_id = dw.area_id + LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id + INNER JOIN order_info oi ON oi.inventory_out_id = de.record_id -- 关联order_info + INNER JOIN order_refund rr ON rr.order_id = oi.order_id AND rr.check_state = 2 -- 关联order_refund，只查询已审核的退款 + where de.record_type = 2 and de.out_into_type in (1,3,5,6) + + + and rr.apply_time >= #{param.startDate} -- 退款申请时间条件 + + + and rr.apply_time <= #{param.endDate} -- 退款申请时间条件 + + + + and de.fetch_user_id in + + #{id} + + + + + and (mm.material_name like concat('%', #{param.materialName}, '%') + or mm.material_code like concat('%', #{param.materialName}, '%')) + + + + and mmc.category_id in + + #{id} + + + + + and de.out_into_type in + + #{id} + + + + + and de.record_id like concat('%', #{param.recordId}, '%') + + + + and dw.area_id in + + #{id} + + + + + and dw.warehouse_id in + + #{id} + + + + + and dw.warehouse_id in + + #{id} + + + + + and dw.area_id in + + #{id} + + + SELECT - SUM(de.out_into_num) as totalInQty, - SUM(de.out_into_amount) as totalInAmount, - SUM(de.inventory_num) as totalStockQty, - SUM(de.total_amount) as totalStockAmount - from report_drp_inventory_base de + SUM(intoNum) as totalInQty, + SUM(intoAmount) as totalInAmount, + -- 库存总计（直接从主表查询，不包含退款记录） + (SELECT SUM(de2.inventory_num) + FROM report_drp_inventory_base de2 + LEFT JOIN menu_material mm2 ON de2.material_id = mm2.material_id + LEFT JOIN drp_warehouse dw2 ON de2.warehouse_id = dw2.warehouse_id + LEFT JOIN alloc_area aa2 ON aa2.area_id = dw2.area_id + WHERE de2.record_type = 2 + AND de2.out_into_type IN (1,3,5,6) + + AND de2.record_date >= #{param.startDate} + + + AND de2.record_date <= #{param.endDate} + + + AND (mm2.material_name like concat('%', #{param.materialName}, '%') + OR mm2.material_code like concat('%', #{param.materialName}, '%')) + + + AND dw2.area_id in + + #{id} + + + + AND dw2.warehouse_id in + + #{id} + + + + AND dw2.warehouse_id in + + #{id} + + + + AND dw2.area_id in + + #{id} + + + ) as totalStockQty, + (SELECT SUM(de2.total_amount) + FROM report_drp_inventory_base de2 + LEFT JOIN menu_material mm2 ON de2.material_id = mm2.material_id + LEFT JOIN drp_warehouse dw2 ON de2.warehouse_id = dw2.warehouse_id + LEFT JOIN alloc_area aa2 ON aa2.area_id = dw2.area_id + WHERE de2.record_type = 2 + AND de2.out_into_type IN (1,3,5,6) + + AND de2.record_date >= #{param.startDate} + + + AND de2.record_date <= #{param.endDate} + + + AND (mm2.material_name like concat('%', #{param.materialName}, '%') + OR mm2.material_code like concat('%', #{param.materialName}, '%')) + + + AND dw2.area_id in + + #{id} + + + + AND dw2.warehouse_id in + + #{id} + + + + AND dw2.warehouse_id in + + #{id} + + + + AND dw2.area_id in + + #{id} + + + ) as totalStockAmount + FROM ( + -- 正常入库记录 + SELECT + de.out_into_num as intoNum, + de.out_into_amount as intoAmount + FROM report_drp_inventory_base de LEFT JOIN menu_material mm ON de.material_id = mm.material_id LEFT JOIN drp_unit du ON de.unit_id = du.unit_id LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id - left join drp_warehouse dw on dw.warehouse_id = de.warehouse_id - left join alloc_area aa on aa.area_id = dw.area_id - LEFT JOIN drp_supplier ds ON de.supplier_id = ds.supplier_id - LEFT JOIN mgr_user mu ON de.operator_id = mu.username - left join order_info oi on oi.order_time = de.record_time - where de.record_type=2 and de.out_into_type in (1,3,5,6) - and not exists ( - select 1 from order_info oi - where oi.order_time = de.record_time - and oi.order_state = 3 - ) + LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id + LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id + LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id + WHERE de.record_type = 2 + AND de.out_into_type IN (1,3,5,6) - and de.record_date >= #{param.startDate} + AND de.record_date >= #{param.startDate} - - and de.record_date <= #{param.endDate} + AND de.record_date <= #{param.endDate} - and de.supplier_id in + AND de.fetch_user_id in #{id} - and (mm.material_name like concat('%', #{param.materialName}, '%') - or mm.material_code like concat('%', #{param.materialName}, '%')) + AND (mm.material_name like concat('%', #{param.materialName}, '%') + OR mm.material_code like concat('%', #{param.materialName}, '%')) - and mmc.category_id in + AND mmc.category_id in #{id} - and de.out_into_type in + AND de.out_into_type in #{id} - and de.record_id like concat('%', #{param.recordId}, '%') + AND de.record_id like concat('%', #{param.recordId}, '%') - and dw.area_id in + AND dw.area_id in #{id} - and dw.warehouse_id in + AND dw.warehouse_id in #{id} - and dw.warehouse_id in + AND dw.warehouse_id in #{id} - and dw.area_id in + AND dw.area_id in #{id} + UNION ALL - + -- 退款记录（负数） + SELECT + de.out_into_num as intoNum, -- 注意：这里需要改成负数，或者保持正数在外部处理 + -de.out_into_amount as intoAmount -- 金额为负数 + FROM report_drp_inventory_base de + LEFT JOIN menu_material mm ON de.material_id = mm.material_id + LEFT JOIN drp_unit du ON de.unit_id = du.unit_id + LEFT JOIN menu_material_category mmc ON mmc.category_id = mm.category_id + LEFT JOIN drp_warehouse dw ON dw.warehouse_id = de.warehouse_id + LEFT JOIN alloc_area aa ON aa.area_id = dw.area_id + LEFT JOIN mgr_user mu ON de.fetch_user_id = mu.user_id + INNER JOIN order_info oi ON oi.inventory_out_id = de.record_id + INNER JOIN order_refund rr ON rr.order_id = oi.order_id AND rr.check_state = 2 + WHERE de.record_type = 2 + AND de.out_into_type IN (1,3,5,6) + + + AND rr.apply_time >= #{param.startDate} + + + AND rr.apply_time <= #{param.endDate} + + + + AND de.fetch_user_id in + + #{id} + + + + + AND (mm.material_name like concat('%', #{param.materialName}, '%') + OR mm.material_code like concat('%', #{param.materialName}, '%')) + + + + AND mmc.category_id in + + #{id} + + + + + AND de.out_into_type in + + #{id} + + + + + AND de.record_id like concat('%', #{param.recordId}, '%') + + + + AND dw.area_id in + + #{id} + + + + + AND dw.warehouse_id in + + #{id} + + + + + AND dw.warehouse_id in + + #{id} + + + + + AND dw.area_id in + + #{id} + + + ) AS combined_data + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml index 97fc71dd..ae348564 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/reportforms/OrgConsumerMapper.xml @@ -623,7 +623,7 @@