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

PDA移位管理批次属性查询修改，库存查询修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-13 16:57:48 +08:00
parent f7fea55e23
commit d7dd8a4567
8 changed files with 447 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+14 -13
View File
@@ -282,35 +282,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
</resultMap>
<!-- 1-按货主 2-按物料 3-按批次 4-按库位 5-按物料/库位 6-按容器 0-全部 -->
<sql id="materialQueryListByGroup">
<choose>
<when test="queryType != null and queryType == 1">
group by b.shipper_id
order by b.shipper_id
group by a.shipper_id, a.shipper_code, a.shipper_name
order by a.shipper_name
</when>
<when test="queryType != null and queryType == 2">
group by b.material_base_info_id
order by b.material_base_info_id
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
</when>
<when test="queryType != null and queryType == 3">
group by a.batch_number
order by b.material_name,a.batch_number
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
</when>
<when test="queryType != null and queryType == 4">
group by a.storage_location_id
order by a.storage_location_id
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
</when>
<when test="queryType != null and queryType == 5">
group by b.material_base_info_id,a.storage_location_id
order by b.material_name,a.storage_location_id
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
</when>
<when test="queryType != null and queryType == 6">
group by a.container_id
order by a.container_type_name,b.material_name,a.storage_location_name
group by a.container_id, a.container_code, a.container_type, a.container_type_name
order by a.container_type_name, b.material_name, a.storage_location_name
</when>
<otherwise>
group by a.material_inventory_id
order by b.shipper_name,b.material_name,a.storage_location_name,a.batch_number
order by a.shipper_name, b.material_name, a.storage_location_name, a.batch_number
</otherwise>
</choose>
</sql>
mhd_wms/src/main/resources/mapper/outMaterialDetailSerialNumber/OutMaterialDetailSerialNumberMapper.xml
+3
View File
@@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialDetailUniqueId != null ">
and a.material_detail_unique_id = #{materialDetailUniqueId}
</if>
<if test="orderNumber != null and orderNumber != ''">
and a.order_number = #{orderNumber}
</if>
<if test="type != null ">
and a.type = #{type}
</if>
mhd_wms/src/main/resources/mapper/shiftMaterialDetail/ShiftMaterialDetailMapper.xml
+6
View File
@@ -54,6 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="containerCode" column="container_code" />
<result property="containerType" column="container_type" />
<result property="containerTypeName" column="container_type_name" />
<result property="level" column="level" />
<result property="parentUniqueId" column="parent_unique_id" />
<result property="netWeight" column="net_weight" />
<result property="grossWeight" column="gross_weight" />
<result property="volume" column="volume" />
<result property="area" column="area" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />