weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
王奎兴
2026-04-18 17:17:06 +08:00
parent e5441eb415 ffcb32f9a3
commit 38d497392b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
+4
View File
@@ -161,6 +161,8 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
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<ShiftManageMapper, ShiftManage>
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());
//没有选择容器并且选择的同期和原库位不一样
mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml
+3 -1
View File
@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="quantity" column="quantity" />
<result property="shiftQuantity" column="shift_quantity" />
<result property="batchNumber" column="batch_number" />
<result property="inOrderNumber" column="in_order_number" />
<result property="lotNumber" column="lot_number" />
<result property="shiftType" column="shift_type" />
<result property="oldWarehouseId" column="old_warehouse_id" />
<result property="oldWarehouseCode" column="old_warehouse_code" />
@@ -73,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectShiftMaterialDetailPo">
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
</sql>
<sql id="selectShiftMaterialDetailPo1">