From f4e8f069d050293232cfe68ebd38b2b05c4ad4b4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 七月 2024 11:41:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 98403f5..68ca981 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -125,12 +125,13 @@
             fc.quantity AS quantity_card,
             ogd.child_width,
             ogd.child_height,
-            od.shape,
+            if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
             fc.quantity -odpd.reporting_work_num -odpd.broken_num  as quantity,
             fc.quantity -odpd.reporting_work_num -odpd.broken_num  as completedQuantity,
             odpd.reporting_work_num as completed,
             odpd.broken_num as onceBroken,
-            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+            od.other_columns
         FROM
             sd.order_detail AS od
         LEFT JOIN sd.order_glass_detail AS ogd
@@ -163,7 +164,7 @@
             fc.quantity AS quantity_card,
             ogd.child_width,
             ogd.child_height,
-            od.shape,
+        if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
             if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) &lt; 0,
                 0,
         odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
@@ -173,8 +174,8 @@
             odpd.reporting_work_num as completed,
             odpd.broken_num as onceBroken,
             ogd.`group`,
-            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
-
+            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+            od.other_columns
 
         FROM
             sd.order_detail AS od
@@ -382,7 +383,7 @@
             c.quantity as quantity_card,
             d.child_width,
             d.child_height,
-            e.shape,
+            if(e.shape=1,'鏅舰',if(e.shape=2,'寮傚舰','')) as shape,
             if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
                 c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
                 ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 鍙姤宸ユ暟
@@ -390,6 +391,7 @@
             ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 鐮存崯鏁�
             ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 鏈伐搴忓畬宸ュ拰
             if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
+            e.other_columns,
             <if test="nextProcess != null and nextProcess != ''">  -- 闈炴渶鍚庝竴閬撳伐搴�
                 ifnull(g.completed_quantity,0) as nextQuantitySum,  -- 鍚庡伐搴忓凡瀹屾垚
                 if((f.completed_quantity

--
Gitblit v1.8.0