From ee9f09aa18566a29e5e112ce7c5300038e925351 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:08:00 +0800
Subject: [PATCH] 零件统计问题修复
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java | 2 +-
aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml | 1 +
4 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
index 29ae807..b7cf25d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
@@ -104,7 +104,7 @@
/**
* 1.鏍规嵁鐜版湁闆朵欢璁″垝 鍜屽伐鑹鸿矾绾裤�佽祫婧愭睜淇℃伅 鏇存柊缁熻琛�
* */
- @RequiresPermissions("apsPartRouteStat:edit")
+
@PostMapping("/updateStat")
public AjaxResult updateStat()
{
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index eb24cf0..e6646ec 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -175,6 +175,7 @@
last = stat;
stat.setId(IdUtils.fastUUID().toString());
stat.setBatchNumber(batchNum);
+ stat.setDelFlag("0");
apsPartRouteStatMapper.insertApsPartRouteStat(stat);
}
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
index 77781d3..32b5a9a 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml
@@ -124,6 +124,7 @@
left join aps_process_route as rt on pl.document_number=rt.work_order_no
left join aps_resource_group as rs on rs.resource_group_name=rt.process_name
where pl.document_number is not null and rt.work_order_no is not null
+ and pl.del_flag='0'
and rt.process_plan_start_day <= rs.request_date
order by rt.work_order_no,process_plan_start_day
</select>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
index dfc842a..cfac9e3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsProcessRouteMapper.xml
@@ -52,6 +52,7 @@
<if test="plant != null and plant != ''"> and plant = #{plant}</if>
<if test="workCenter != null and workCenter != ''"> and work_center = #{workCenter}</if>
</where>
+ order by process_number asc
</select>
<select id="selectApsProcessRouteById" parameterType="String" resultMap="ApsProcessRouteResult">
--
Gitblit v1.9.3