From 0c5bd7e43ae887844c14b0f16d9f49d192be6cbf Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期四, 08 五月 2025 17:59:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml index f8b2461..ee20061 100644 --- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml +++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml @@ -5,6 +5,7 @@ <mapper namespace="com.aps.core.mapper.ApsPlateOrderPlanManagerMapper"> <resultMap type="ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult"> + <result property="id" column="id" /> <result property="require_id" column="requireId" /> <result property="requireTrackId" column="require_track_id" /> <result property="workOrderNo" column="doc_no" /> @@ -38,7 +39,8 @@ plan.plan_start_day, plan.plan_end_day, plan.unmatched_quantity, - plan.has_risk + plan.has_risk, + plan.id from aps_plate_standard_require_bom_order_detail detail left join aps_plate_plan plan on detail.doc_no = plan.document_number <where> -- Gitblit v1.9.3