From dc199cb4d536e36098a806c96ab1fdd21d89ebeb Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 09:00:20 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】修改计算产能开始结束日期
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
index e79be4d..32539f0 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
@@ -77,10 +77,12 @@
<result property="productionQuantity" column="production_quantity" />
<result property="processNumber" column="process_number" />
<result property="planType" column="plan_type" />
+ <result property="planEndDay" column="plan_end_day" />
<collection property="apsProcessRoutes" javaType="java.util.ArrayList" ofType="com.aps.core.domain.ApsProcessRoute">
<result property="processNumber" column="process_number_sub" />
<result property="processName" column="process_name" />
<result property="processPlanStartDay" column="process_plan_start_day" />
+ <result property="processPlanEndDay" column="process_plan_end_day" />
<result property="standardTime" column="standard_time" />
</collection>
</resultMap>
@@ -285,9 +287,9 @@
</update>
<select id="selectApsGasPipingPlanWithProcess" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResultWithProcess">
- select c.* from (select a.document_number,a.item_number,a.process_number,a.production_quantity,a.plan_type,b.process_name,b.process_number as process_number_sub,b.standard_time,b.process_plan_start_day from aps_gas_piping_plan a
+ select c.* from (select a.document_number,a.item_number,a.process_number,a.production_quantity,a.plan_type,a.plan_end_day,b.process_name,b.process_number as process_number_sub,b.standard_time,b.process_plan_start_day,b.process_plan_end_day from aps_gas_piping_plan a
left join aps_process_route b on a.document_number = b.work_order_no
- where a.document_status in ('0','1','2','4') and b.process_plan_start_day is not null and b.process_name in(select process_name from aps_standard_process where major='姘旀煖' or major='绠¤矾') ORDER BY a.document_number,b.process_number) c GROUP BY c.document_number,c.item_number,c.process_number,c.production_quantity,c.process_name,c.process_number_sub,c.standard_time,c.process_plan_start_day,c.plan_type
+ where a.document_status in ('0','1','2','4') and b.process_plan_start_day is not null and b.process_name in(select process_name from aps_standard_process where major='姘旀煖' or major='绠¤矾') ORDER BY a.document_number,b.process_number) c GROUP BY c.document_number,c.item_number,c.process_number,c.production_quantity,c.process_name,c.process_number_sub,c.standard_time,c.process_plan_start_day,c.plan_type,c.process_plan_end_day,c.plan_end_day
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3