diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 75114e70a..09c6743dd 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -326,24 +326,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - group by a.shipper_id, a.shipper_code, a.shipper_name - order by a.shipper_name + group by a.shipper_id + order by max(a.shipper_name) - group by b.material_base_info_id, a.shipper_id, b.material_code, b.material_name, a.shipper_code, a.shipper_name - order by b.material_name, a.shipper_name + group by b.material_base_info_id, a.shipper_id + order by max(b.material_name), max(a.shipper_name) - group by b.material_base_info_id, a.shipper_id, a.batch_number, b.material_code, b.material_name, a.shipper_code, a.shipper_name - order by b.material_name, a.shipper_name, a.batch_number + group by b.material_base_info_id, a.shipper_id, a.batch_number + order by max(b.material_name), max(a.shipper_name), a.batch_number - group by a.storage_location_id, a.storage_location_code, a.storage_location_name, a.storage_section_id, a.storage_code, a.storage_name - order by a.storage_location_code + group by a.storage_location_id + order by max(a.storage_location_code) - group by b.material_base_info_id, a.storage_location_id, a.shipper_id, b.material_code, b.material_name, a.storage_location_code, a.storage_location_name, a.shipper_code, a.shipper_name - order by b.material_name, a.storage_location_code, a.shipper_name + group by b.material_base_info_id, a.storage_location_id, a.shipper_id + order by max(b.material_name), max(a.storage_location_code), max(a.shipper_name) group by a.container_id, a.container_code, a.container_type, a.container_type_name