From 96d81526d94f2949e7ab2fbd51b4c719739a1d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Thu, 16 Apr 2026 09:57:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/materialBaseInfo/MaterialBaseInfoMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml index 1a9db473a..58e8451c9 100644 --- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -65,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_classify_name, a.material_type, a.material_type_name, a.pack_id, a.pack_code, a.pack_name, a.unit_code, a.unit_name, a.brand_id, a.brand_code, a.brand_name, a.shelf_life, a.weight_limit, a.volume_limit, a.material_shape, material_shape_name, a.material_size, a.material_length, a.material_width, a.material_height, a.remark, a.nullify, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.common, sku_code, a.unit_price, a.currency, a.origin_country, a.hs_code, a.declaration_unit, a.statutory_unit, a.statutory_second_unit, - specification_model as specification_model,nvl(sum(b.INVENTORY_QUANTITY),0) as stock_quantity from material_base_info a left join MATERIAL_INVENTORY b on a.material_base_info_id = b.material_base_info_id + specification_model as specification_model,nvl(b.stock_qty,0) as stock_quantity from material_base_info a left join ( + select material_base_info_id, sum(INVENTORY_QUANTITY) as stock_qty from MATERIAL_INVENTORY group by material_base_info_id + ) b on a.material_base_info_id = b.material_base_info_id From eec90b054bc783207c3fbbb4e968dd3f89c282df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 16 Apr 2026 11:02:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderMapper.xml | 36 ++++++++-------- .../ReservationStockOutOrderMapper.xml | 42 +++++++++---------- .../service/menu/MenuApplicationService.java | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index c64827d4f..d3af7a522 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -89,24 +89,24 @@ a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number, a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity, -- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总 - (select ifnull(sum(imd.quantity), 0) - from in_material_detail imd - where imd.in_order_number = a.in_order_number - and imd.del_flag = 1 - and (imd.level is null or imd.level = 1) - ) as plan_in_quantity, - -- 收货数量：收货单表 stock_receipt_order 的 receipt_quantity 汇总 - (select ifnull(sum(sro.receipt_quantity), 0) - from stock_receipt_order sro - where sro.in_order_number = a.in_order_number - and sro.del_flag = 1 - ) as receipt_quantity, - -- 上架数量：上架单表 stock_shelf_order 的 shelves_quantity 汇总 - (select ifnull(sum(sso.shelves_quantity), 0) - from stock_shelf_order sso - where sso.in_order_number = a.in_order_number - and sso.del_flag = 1 - ) as shelves_quantity, + + + + + + + + + + + + + + + + + + a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by, a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, over_stock_id, over_stock_status, over_stock_type, diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index ad9c5ac13..082de0269 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -287,27 +287,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd} - - and exists ( - select 1 from out_material_detail omd - left join material_base_info mb on omd.material_base_info_id = mb.material_base_info_id and mb.del_flag = 1 - where omd.out_order_number = a.out_order_number - and omd.del_flag = 1 - and (omd.level is null or omd.level = 1) - - and ( - omd.material_name like concat('%', #{materialName}, '%') - or mb.material_name like concat('%', #{materialName}, '%') - ) - - - and ( - omd.material_code like concat('%', #{materialCode}, '%') - or mb.material_code like concat('%', #{materialCode}, '%') - ) - - ) - + + + + + + + + + + + + + + + + + + + + + and a.del_flag = #{delFlag} and a.del_flag = 1 diff --git a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java index 4df9671c6..5e6e848af 100644 --- a/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java +++ b/mhd_product/src/main/java/com/linke/product/application/service/menu/MenuApplicationService.java @@ -422,7 +422,7 @@ public class MenuApplicationService { if (CollectionUtil.isNotEmpty(customAuthList)){ customAuthList.forEach(e->{ Map map = new HashMap<>(); - map.put("menuId",e.getMenuId().toString()); + map.put("menuId",e.getMenuId() == null ? "" : e.getMenuId().toString()); map.put("tableJson",e.getTableJson()); map.put("formJson",e.getFormJson()); map.put("buttonJson",e.getButtonJson());