From e3bd647305c6f4e1c8c901741932deda10a8db34 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 16:13:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
index 250e09d..20beb21 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
@@ -67,6 +67,7 @@
and process_name in (select process_name from aps_standard_process where major='姘旀煖')
</if>
</if>
+ <if test="plant != null and plant != ''"> and plant = #{plant} </if>
</where>
</select>
@@ -181,7 +182,7 @@
id,work_order_no, road_process_number, current_process_number, production_quantity, standard_time,
process_total_time, process_plan_start_day, design_times, del_flag, create_by, process_name,
create_time, item_number, standard_dosage, process_total_dosage, design_capacity, major,
- plan_start_year, plan_start_month, plan_start_day,batch_number,process_plan_end_day,warning,order_plan_end_day
+ plan_start_year, plan_start_month, plan_start_day,batch_number,process_plan_end_day,warning,order_plan_end_day,plant
)
VALUES
<foreach collection="apsGasPipingRouteStatList" item="stat" separator=",">
@@ -190,7 +191,7 @@
#{stat.standardTime}, #{stat.processTotalTime}, #{stat.processPlanStartDay}, #{stat.designTimes}, #{stat.delFlag},
#{stat.createBy}, #{stat.processName}, #{stat.createTime}, #{stat.itemNumber}, #{stat.standardDosage},
#{stat.processTotalDosage}, #{stat.designCapacity}, #{stat.major}, #{stat.planStartYear},
- #{stat.planStartMonth}, #{stat.planStartDay}, #{stat.batchNumber}, #{stat.processPlanEndDay},#{stat.warning},#{stat.orderPlanEndDay}
+ #{stat.planStartMonth}, #{stat.planStartDay}, #{stat.batchNumber}, #{stat.processPlanEndDay},#{stat.warning},#{stat.orderPlanEndDay},#{stat.plant}
)
</foreach>
@@ -198,7 +199,7 @@
<select id="queryTempStat" resultMap="ApsGasPipingRouteStatResult" >
select row_number() over (partition by rt.work_order_no order by rt.process_number desc ) as num,
- rt.work_order_no,
+ rt.work_order_no,
rt.process_name,
cast(rt.process_number as numeric(18, 2)) as road_process_number,
cast(rt.process_number as numeric(18, 2)) as route_process_number,
@@ -209,9 +210,10 @@
rt.process_plan_start_day,
rt.process_plan_end_day,
pl.plan_end_day as order_plan_end_day,
- rt.item_no as item_number,
- pl.plan_type as major,
- false as warning
+ rt.item_no as item_number,
+ pl.plan_type as major,
+ false as warning,
+ pl.plant
from aps_gas_piping_plan as pl
left join aps_process_route as rt on pl.document_number = rt.work_order_no
where pl.document_number is not null and rt.work_order_no is not null and pl.plan_end_day is not null
--
Gitblit v1.9.3