From b330328c07eae2bc612130f32f4b7674a02adcee Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 15:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java | 10 ++++++++--
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml | 8 ++++----
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
index 02dabe3..41687aa 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingRouteStatController.java
@@ -109,9 +109,15 @@
@Operation(summary = "璁＄畻姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
@PostMapping("/computeCapacity")
- public void computeCapacity()
+ public AjaxResult computeCapacity()
{
- apsGasPipingRouteStatService.computeCapacity();
+ try {
+ apsGasPipingRouteStatService.saveGasPipingRoutStateList();
+ return AjaxResult.success();
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ return AjaxResult.error("鏇存柊澶辫触锛�");
+ }
}
@Operation(summary = "鑾峰彇姘斾綋绠¤矾浜ц兘璐熻浇缁熻", description = "璁＄畻")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index 4defd34..0844907 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -704,7 +704,7 @@
}
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!cptStateList.isEmpty()) {
- int batchSize = 500;
+ int batchSize = 1000;
int size = cptStateList.size();
for (int i = 0; i < size; i += batchSize) {
int end = Math.min(i + batchSize, size);
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 ff25722..16fac43 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
@@ -181,7 +181,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
+ plan_start_year, plan_start_month, plan_start_day,batch_number,process_plan_end_day,warning,order_plan_end_day
)
VALUES
<foreach collection="apsGasPipingRouteStatList" item="stat" separator=",">
@@ -190,7 +190,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.planStartMonth}, #{stat.planStartDay}, #{stat.batchNumber}, #{stat.processPlanEndDay},#{stat.warning},#{stat.orderPlanEndDay}
)
</foreach>
@@ -205,7 +205,7 @@
cast(pl.process_number as numeric(18, 2)) as current_process_number,
pl.production_quantity,
rt.standard_time,
- (rt.standard_time * pl.production_quantity) as process_total_time,
+ cast( (rt.standard_time * pl.production_quantity) as numeric(18, 4) ) as process_total_time,
rt.process_plan_start_day,
rt.process_plan_end_day,
pl.plan_end_day as order_plan_end_day,
@@ -214,7 +214,7 @@
false as warning
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
+ where pl.document_number is not null and rt.work_order_no is not null and pl.plan_end_day is not null
order by rt.work_order_no asc, rt.process_number desc
</select>
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 e924c26..9f9a7ca 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
@@ -144,7 +144,7 @@
pl.plan_end_day as order_plan_end_day
from aps_plate_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
+ where pl.document_number is not null and rt.work_order_no is not null and pl.plan_end_day is not null
order by rt.work_order_no asc, rt.process_number desc
</select>
<update id="removeOtherStat" parameterType="String">
--
Gitblit v1.9.3