From df20214207804ba2fffc601f20284b26e800ffef Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 16 四月 2025 18:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
index 59c905b..6f26ce2 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
@@ -25,7 +25,7 @@
</resultMap>
<sql id="selectApsPlateProcessStatVo">
- select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_end_day, compute_plan_end_day, design_times, batch_number, create_by, del_flag from aps_plate_process_stat
+ select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity, standard_time, process_total_time, process_plan_end_day,process_plan_start_day, order_plan_end_day, design_times, batch_number, create_by, del_flag from aps_plate_process_stat
</sql>
<select id="selectApsPlateProcessStatList" parameterType="ApsPlateProcessStat" resultMap="ApsPlateProcessStatResult">
@@ -65,6 +65,7 @@
<if test="processTotalTime != null">process_total_time,</if>
<if test="processPlanEndDay != null">process_plan_end_day,</if>
<if test="processPlanStartDay != null">process_plan_start_day,</if>
+ <if test="processPlanStartDay != null">process_plan_start_day,</if>
<if test="designTimes != null">design_times,</if>
<if test="batchNumber != null">batch_number,</if>
<if test="createBy != null">create_by,</if>
--
Gitblit v1.9.3