From ffcb32f9a3848cea1a93d6425805a97bcc9273af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Sat, 18 Apr 2026 17:09:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8Dlot=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shiftManage/repository/persistence/ShiftManageImpl.java | 4 ++++ .../mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java index 972ceb913..3dd7c6647 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java @@ -161,6 +161,8 @@ public class ShiftManageImpl extends ServiceImpl shiftMaterialDetailDOChild.setOldStorageLocationCode(e.getOldStorageLocationCode()); shiftMaterialDetailDOChild.setOldStorageLocationName(e.getOldStorageLocationName()); shiftMaterialDetailDOChild.setBatchNumber(e.getBatchNumber()); + shiftMaterialDetailDOChild.setLotNumber(e.getLotNumber()); + shiftMaterialDetailDOChild.setInOrderNumber(e.getInOrderNumber()); shiftMaterialDetailDOChild.setMaterialStatusCode(e.getMaterialStatusCode()); shiftMaterialDetailDOChild.setMaterialStatusName(e.getMaterialStatusName()); shiftMaterialDetailDOChild.setContainerId(e.getContainerId()); @@ -400,6 +402,8 @@ public class ShiftManageImpl extends ServiceImpl shiftMaterialDetailDO.setOldStorageLocationCode(materialInventoryPO.getStorageLocationCode()); shiftMaterialDetailDO.setOldStorageLocationName(materialInventoryPO.getStorageLocationName()); shiftMaterialDetailDO.setBatchNumber(materialInventoryPO.getBatchNumber()); + shiftMaterialDetailDO.setLotNumber(materialInventoryPO.getLotNumber()); + shiftMaterialDetailDO.setInOrderNumber(materialInventoryPO.getInOrderNumber()); shiftMaterialDetailDO.setMaterialStatusCode(materialInventoryPO.getMaterialStatusCode()); shiftMaterialDetailDO.setMaterialStatusName(materialInventoryPO.getMaterialStatusName()); //没有选择容器并且选择的同期和原库位不一样 diff --git a/mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml index 64a3036b4..dca729c2f 100644 --- a/mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml @@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -73,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select shift_io_detail_id, organization_id, organization_name, top_organization_id, unique_id, material_inventory_id, material_base_info_id, material_code, material_name, bar_code, shift_number, shift_status, inventory_quantity, quantity, already_shift_quantity, shift_quantity, batch_number,shift_type,old_warehouse_id, old_warehouse_code, old_warehouse_name, old_storage_section_id, old_storage_code, old_storage_name, old_storage_location_id, old_storage_location_code, old_storage_location_name, new_warehouse_id, new_warehouse_code, new_warehouse_name, new_storage_section_id, new_storage_code, new_storage_name, new_storage_location_id, new_storage_location_code, new_storage_location_name, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, container_id, container_code, container_type, container_type_name, level, parent_unique_id, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,material_status_code,material_status_name,net_weight,gross_weight,volume,area from shift_material_detail + select shift_io_detail_id, organization_id, organization_name, top_organization_id, unique_id, material_inventory_id, material_base_info_id, material_code, material_name, bar_code, shift_number, shift_status, inventory_quantity, quantity, already_shift_quantity, shift_quantity, batch_number, in_order_number, lot_number, shift_type, old_warehouse_id, old_warehouse_code, old_warehouse_name, old_storage_section_id, old_storage_code, old_storage_name, old_storage_location_id, old_storage_location_code, old_storage_location_name, new_warehouse_id, new_warehouse_code, new_warehouse_name, new_storage_section_id, new_storage_code, new_storage_name, new_storage_location_id, new_storage_location_code, new_storage_location_name, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, container_id, container_code, container_type, container_type_name, level, parent_unique_id, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag, material_status_code, material_status_name, net_weight, gross_weight, volume, area from shift_material_detail