From 4ce7b3afec6dcce0bc12aa5a6e0b9991c1339d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 6 Jul 2026 22:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=AE=A2=E6=88=B7=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E7=89=A9=E6=96=99=E5=90=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml | 2 +- .../ReserveOutMaterialDetailMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml index 0f30ba04c..e7f7193cb 100644 --- a/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveInMaterialDetail/ReserveInMaterialDetailMapper.xml @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.lot_no ,a.reserve_quantity,a.reserve_gross_weight,a.reserve_net_weight,a.reserve_volume,a.reserve_area,a.reserve_price,a.reserve_unit_price,a.shelf_life, a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id, a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity, - a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.RESERVE_MATERIAL_NAMEļ¼Œ + a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.RESERVE_MATERIAL_NAME, CASE WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL ELSE CAST(a.pack_detail_id AS BIGINT) diff --git a/mhd_oms/src/main/resources/mapper/reserveOutMaterialDetail/ReserveOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reserveOutMaterialDetail/ReserveOutMaterialDetailMapper.xml index 44b866f48..4dd7114dd 100644 --- a/mhd_oms/src/main/resources/mapper/reserveOutMaterialDetail/ReserveOutMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveOutMaterialDetail/ReserveOutMaterialDetailMapper.xml @@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.pack_id, a.pack_code, a.pack_name, a.pack_detail_id, a.unit_code, a.unit_name, a.material_warehouse_control_id, a.serial_number_manage, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.storage_section_id, a.storage_code, a.storage_name, a.storage_location_id, a.storage_location_code, a.storage_location_name, a.level, a.parent_unique_id, a.allow_modify, a.material_inventory_id, a.batch_number, a.container_id, a.container_code, a.container_type, a.container_type_name, a.material_status_code, a.material_status_name, - a.remark, a.create_time, a.create_by,gen_picking_order, + a.remark, a.create_time, a.create_by,gen_picking_order,a.RESERVE_MATERIAL_NAME, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type, a.COMMODITY_NAME, a.COMMODITY_NO,