From 26b286ab8c82614c6647aa1fbf364afebfda9dfa Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 14:03:15 +0800
Subject: [PATCH] 钣金

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPartRouteStatMapper.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

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 250f555..75d31fb 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
@@ -123,9 +123,7 @@
         from aps_part_plan  as pl
             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.del_flag='0' and rt.del_flag='0'
-            /*闆朵欢璁″垝鐘舵�佷负锛氶潪瀹屽伐 */
-            and ( pl.document_status is not null and ( pl.document_status!='3' or pl.order_status!='瀹屽伐') )
+        where  document_status in (0,1,2,4)
             /*宸ュ簭璁″垝寮�宸ユ棩 灏忎簬绛変簬 璧勬簮缁勭殑鎴鏃ユ湡*/
             and rt.process_plan_start_day  &lt;= rs.request_date
             order by rt.work_order_no,process_plan_start_day
@@ -155,7 +153,7 @@
              ,pl.resource_name
              , require_times
              , (gp.theory_hours * gp.devices_quantity)   as design_times
-             , ((gp.theory_hours * gp.devices_quantity) / require_times*100) as capacity_load
+             ,   cast (  require_times / cast (gp.theory_hours * gp.devices_quantity as numeric(18,4))  as numeric(18,4)) *100 as capacity_load
         from pl
                  left join aps_resource_group as gp on pl.resource_name = gp.resource_group_name
         where gp.del_flag = '0'

--
Gitblit v1.9.3