From ae9de858b0a514b6a129fa9fd985ce75079a68a0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 24 三月 2025 11:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue |   17 ++++++++++-------
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml             |   30 +++++++++++-------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index f845e9a..98a9ca4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -948,19 +948,22 @@
 
 let quantit = ref('')
 let weight = ref('')
-const handleCheckboxChange = ({row}) => {
-  const $grid = xGrid.value
-  //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
-  const checkedList = $grid.getCheckboxRecords()
+const handleCheckboxChange = ({ row }) => {
+  const $grid = xGrid.value;
+  // 鑾峰彇鍙宠竟琛ㄦ牸 checkbox 閫変腑鐨勬暟鎹�
+  const checkedList = $grid.getCheckboxRecords();
   let quantitySum = 0;
   let weightsum = 0;
+
   checkedList.forEach(item => {
-    quantitySum += item.baiscQuantity;
+    quantitySum += Number(item.baiscQuantity) || 0; // 纭繚杞崲涓烘暟瀛�
     weightsum += weightSum(item);
   });
-  quantit.value = quantitySum;
+
+  quantit.value = Number(quantitySum) || 0; // 纭繚鏈�缁堝�兼槸鏁板瓧
   weight.value = parseFloat(weightsum.toFixed(2));
-}
+};
+
 </script>
 
 <template>
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 183eb0a..89fc012 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -215,7 +215,7 @@
         LEFT JOIN sd.order_glass_detail AS ogd
                 ON od.order_id = ogd.order_id
                 AND od.order_number = ogd.order_number
-        <if test="process == '澶硅兌' or (process == '鎵撹兌鍜岀矘妗�')">
+        <if test="process == '澶硅兌'">
             AND ogd.`group` = (select `group`
                                from sd.order_glass_detail
                                where order_id = ogd.order_id
@@ -528,12 +528,10 @@
                rw.notes,
                rw.reviewed
         # (IF(rw.reviewed_state = 0, '鏈鏍�', IF(rw.reviewed_state = 1, '瀹℃牳閫氳繃', '瀹℃牳涓嶉�氳繃'))) as reviewed_state
-        from sd.order as o
-                 left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
-                 left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
-                 left join reporting_work_detail as rwd
-                           on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
-                              rwd.technology_number = ogd.technology_number
+        from
+            reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+            left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+            left join sd.`order` as o on o.order_id=rw.order_id
         where rw.reviewed_state != 2
           and rw.reporting_work_time >= #{selectTime1}
     AND rw.reporting_work_time &lt;  #{selectTime2}
@@ -572,12 +570,9 @@
     <select id="getPageTotal">
         select CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
                count(distinct rw.reporting_work_id) as 'total'
-             from sd.order as o
-                 left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id
-                 left join reporting_work as rw on rw.order_id = ogd.order_id and rw.production_id = ogd.production_id
-                 left join reporting_work_detail as rwd
-                           on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and
-                              rwd.technology_number = ogd.technology_number
+             from reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+        left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+        left join sd.`order` as o on o.order_id=rw.order_id
         where rw.reviewed_state != 2
           and rw.reporting_work_time >= #{selectTime1}
         AND rw.reporting_work_time &lt;  #{selectTime2} and position(#{orderId} in rw.order_id)
@@ -1027,12 +1022,9 @@
                      MAX(rw.this_worn_quantity) AS this_worn_quantity,
                      MAX(ogd.child_width) AS child_width,
                      MAX(ogd.child_height) AS child_height
-                 FROM sd.order AS o
-                          LEFT JOIN sd.order_glass_detail AS ogd
-                                    ON ogd.order_id = o.order_id
-                          LEFT JOIN reporting_work AS rw
-                                    ON rw.order_id = ogd.order_id
-                                        AND rw.production_id = ogd.production_id
+                 FROM reporting_work as rw left join reporting_work_detail as rwd on rw.reporting_work_id=rwd.reporting_work_id
+        left join sd.order_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number
+        left join sd.`order` as o on o.order_id=rw.order_id
                  WHERE rw.reviewed_state != 2
       and rw.reporting_work_time >= #{selectTime1}
                    AND rw.reporting_work_time &lt;  #{selectTime2}

--
Gitblit v1.8.0