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

WMS入库管理模块bug修改

Browse Source
This commit is contained in:
秦鸿展
2026-01-23 15:42:37 +08:00
parent ca4b1ce2a3
commit 186c5d1b94
16 changed files with 200 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/mapper/receiptMaterialDetail/ReceiptMaterialDetailMapper.xml
+10 -10
View File
@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="receiptOrderNumber" column="receipt_order_number" />
<result property="materialBaseInfoId" column="material_base_info_id" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="materialName" column="MATERIAL_NAME" />
<result property="barCode" column="bar_code" />
<result property="quantity" column="quantity" />
<result property="receiptQuantity" column="receipt_quantity" />
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectReceiptMaterialDetailPo">
select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, receipt_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_receipt_quantity, receipt_quantity, receipt_status, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, level, parent_unique_id, in_unique_id, allow_modify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name, gen_stock_shelf, del_flag from receipt_material_detail
select MATERIAL_DETAIL_ID, ORGANIZATION_ID, ORGANIZATION_NAME, TOP_ORGANIZATION_ID, UNIQUE_ID, RECEIPT_ORDER_NUMBER, MATERIAL_BASE_INFO_ID, MATERIAL_CODE, MATERIAL_NAME, BAR_CODE, QUANTITY, ALREADY_RECEIPT_QUANTITY, RECEIPT_QUANTITY, RECEIPT_STATUS, PACK_ID, PACK_CODE, PACK_NAME, PACK_DETAIL_ID, UNIT_CODE, UNIT_NAME, UNIT_NUMBER, MATERIAL_WAREHOUSE_CONTROL_ID, SERIAL_NUMBER_MANAGE, QUALITY_INSPECTION_MANAGE, QUALITY_INSPECTION_STAGE, QUALITY_INSPECTION_RULE, QUALITY_INSPECTION_RATIO, QUALITY_INSPECTION_TERM, QUALITY_INSPECTION_RESULTS, ALLOW_OVERCHARGE, OVERCHARGE_RATIO, BATCH_NUMBER, MATERIAL_STATUS_CODE, MATERIAL_STATUS_NAME, DISTRIBUTE_RULE_ID, DISTRIBUTE_RULE_CODE, DISTRIBUTE_RULE_NAME, CONTAINER_ID, CONTAINER_CODE, CONTAINER_TYPE, CONTAINER_TYPE_NAME, LEVEL, PARENT_UNIQUE_ID, IN_UNIQUE_ID, ALLOW_MODIFY, REMARK, CREATE_TIME, CREATE_BY, CREATE_BY_NAME, UPDATE_TIME, UPDATE_BY, UPDATE_BY_NAME, GEN_STOCK_SHELF, DEL_FLAG from RECEIPT_MATERIAL_DETAIL
</sql>
<sql id="selectReceiptMaterialDetailPo1">
@@ -78,16 +78,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and unique_id = #{uniqueId}
</if>
<if test="receiptOrderNumber != null and receiptOrderNumber != ''">
and receipt_order_number = #{receiptOrderNumber}
and RECEIPT_ORDER_NUMBER = #{receiptOrderNumber}
</if>
<if test="materialBaseInfoId != null ">
and material_base_info_id = #{materialBaseInfoId}
and MATERIAL_BASE_INFO_ID = #{materialBaseInfoId}
</if>
<if test="materialCode != null and materialCode != ''">
and material_code = #{materialCode}
and MATERIAL_CODE = #{materialCode}
</if>
<if test="materialName != null and materialName != ''">
and material_name like concat('%', #{materialName}, '%')
and MATERIAL_NAME like concat('%', #{materialName}, '%')
</if>
<if test="barCode != null and barCode != ''">
and bar_code = #{barCode}
@@ -198,15 +198,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and gen_stock_shelf = #{genStockShelf}
</if>
<if test="compoundOrQuery != null and compoundOrQuery != ''">
and ( instr(material_name, #{compoundOrQuery}) > 0
and ( instr(MATERIAL_NAME, #{compoundOrQuery}) > 0
or
instr(material_code, #{compoundOrQuery}) > 0
instr(MATERIAL_CODE, #{compoundOrQuery}) > 0
or
instr(bar_code, #{compoundOrQuery}) > 0
instr(BAR_CODE, #{compoundOrQuery}) > 0
)
</if>
<if test="receiptOrderNumberList != null and receiptOrderNumberList.size > 0 ">
and receipt_order_number in
and RECEIPT_ORDER_NUMBER in
<foreach collection="receiptOrderNumberList" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>