From e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 四月 2024 15:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/target/classes/mapper/pp/FolwCard.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index a5e2346..0c9b1fd 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -174,7 +174,7 @@
         od.product_name,
         SUM( od.quantity) as quantity,
         SUM(od.compute_gross_area) as compute_gross_area,
-        od.perimeter
+        sum(od.perimeter) as perimeter
         from sd.order_detail as od left join
         (select order_id,order_number,production_id,splitting_status from sd.order_glass_detail
         GROUP BY order_id,order_number
@@ -192,7 +192,7 @@
                 on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
         set ogd.splitting_status=0
         where ogd.order_id = #{orderId}
-          and fc.process_id = #{processId}
+          and ogd.production_id = left(#{processId},11)
 
     </update>
 

--
Gitblit v1.8.0