超节损计算优化

application/api/controller/OrderSuperLoss.php

@@ -1317,7 +1317,7 @@ class OrderSuperLoss extends Api
         //从设备产量计酬和sczl查出进入超节损的工序，有上报产量的工序就进入超节损
         $gxh_sql = "SELECT sczl_gxh FROM
                         (SELECT sczl_gxh FROM 设备_产量计酬 WHERE sczl_gdbh = '{$workOrderData['jjcp_gdbh']}' AND sczl_yjno = '{$workOrderData['jjcp_yjno']}'
-                        UNION SELECT sczl_gxh FROM db_sczl WHERE sczl_gdbh = '{$workOrderData['jjcp_gdbh']}' AND sczl_yjno = '{$workOrderData['jjcp_yjno']}' AND sczl_gxmc like '%拆片%') AS combined_result";
+                        UNION SELECT sczl_gxh FROM db_sczl WHERE sczl_gdbh = '{$workOrderData['jjcp_gdbh']}' AND sczl_yjno = '{$workOrderData['jjcp_yjno']}') AS combined_result";
         $gxh_arr = Db::query($gxh_sql);
         //整理查询处理的工序编号
         $gxh_values = array_column($gxh_arr, 'sczl_gxh');
@@ -1441,7 +1441,7 @@ class OrderSuperLoss extends Api
             ->alias('a')
             ->field([
                 'a.Gy0_gdbh', 'a.Gy0_yjno', 'a.Gy0_gxh', 'a.Gy0_ls', 'a.Gy0_ks', 'a.Gy0_计划损耗', 'a.超节损承担比例',
-                'b.sczl_gxmc', 'SUM(b.sczl_zcfp) as sczl_zcfp', 'SUM(b.sczl_cl) as total_cl',
+                'CONCAT(`a`.`Gy0_gxmc`, "【", a.Add_gxmc,"】") AS sczl_gxmc', 'SUM(b.sczl_zcfp) as sczl_zcfp', 'SUM(b.sczl_cl) as total_cl',
                 'b.sczl_bh1', 'b.sczl_bh2', 'b.sczl_bh3', 'b.sczl_bh4', 'b.sczl_bh5', 'b.sczl_bh6',
                 'b.sczl_bh7', 'b.sczl_bh8', 'b.sczl_bh9', 'b.sczl_bh10', 'GROUP_CONCAT(DISTINCT b.sczl_num SEPARATOR ",") AS 流程单',
                 'b.sczl_bzdh', 'b.sczl_rate1', 'b.sczl_rate2', 'b.sczl_rate3', 'b.sczl_rate4', 'b.sczl_rate5',
@@ -1461,7 +1461,7 @@ class OrderSuperLoss extends Api
                 'a.Gy0_gxh' => ['in', $gxh_values],
                 'b.sczl_cl|c.sczl_cl' => ['>', 0],
             ])
-            ->group('b.sczl_gxh,b.sczl_jtbh,b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
+            ->group('a.Gy0_gxh,b.sczl_jtbh,b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
                          b.sczl_bh4, b.sczl_bh5, b.sczl_bh6, b.sczl_bh7, b.sczl_bh8, b.sczl_bh9, c.sczl_bh1')
             ->order('a.Gy0_gxh asc, b.开工时间 asc, c.sczl_rq desc')
             ->select();