Merge branch 'dev_WMS20260401' into dev

This commit is contained in:
秦鸿展
2026-04-22 21:46:05 +08:00
@@ -60,7 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectTaskReceiptMaterialDetailPo"> <sql id="selectTaskReceiptMaterialDetailPo">
select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, task_number, material_base_info_id, select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, task_number, material_base_info_id,
material_code, material_name, bar_code, quantity, receipt_quantity, receipt_status, pack_id, pack_code, pack_name, pack_detail_id, unit_code, material_code, material_name, bar_code, quantity, receipt_quantity, receipt_status, pack_id, pack_code, pack_name,
CASE
WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL
ELSE CAST(pack_detail_id AS BIGINT)
END as pack_detail_id, unit_code,
unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, 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, 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, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id,