first commit

application/api/controller/OrderSuperLoss.php

@@ -3,6 +3,8 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\service\AIGatewayService;
+use app\service\ImageService;
 use think\Cache;
 use \think\Request;
 use \think\Db;
@@ -13,48 +15,69 @@ class OrderSuperLoss extends Api
 {
     protected $noNeedLogin = ['*'];
     protected $noNeedRight = ['*'];
-
-    /**
-     * 首页-已核查成品编号
-     *
-     */
     public function index()
     {
         $this->success('请求成功');
     }
+
     /**
      * 获取左侧菜单栏
      * @ApiMethod GET
-    */
+     */
     public function getTab()
     {
-        if (Request::instance()->isGet() == false) {
+        // 检查请求类型是否为 GET
+        if (!Request::instance()->isGet()) {
             $this->error('非法请求');
         }
-        $num = config('product_code_digit');
-        $sql = "SELECT LEFT(a.jjcp_sj, 7) AS date,RTRIM(b.`编号`) AS 编号,RTRIM(b.`名称`) as 客户名称,COUNT(DISTINCT a.jjcp_gdbh) AS count
-                    FROM `成品入仓` a LEFT JOIN `物料_存货结构` b ON LEFT(a.`成品编码`, $num) = RTRIM(b.`编号`)
-                    WHERE LEFT(a.jjcp_sj, 7) >= LEFT(DATE_SUB(CURDATE(), INTERVAL 12 MONTH), 7) AND (a.jjcp_smb = '末 板' OR a.jjcp_smb = '末板') AND a.`成品编码` != ''
-                    GROUP BY LEFT(a.jjcp_sj, 7), RTRIM(b.`编号`) ORDER BY date DESC, 编号 ASC";
-        $data = Db::query($sql);
-        // 创建一个新数组来存储整理后的数据
+
+        // SQL 查询，连接 db3 数据库
+        $sql = "SELECT   
+                DATE_FORMAT(a.jjcp_sj, '%Y-%m') AS date,  -- 格式化为年月  
+                RTRIM(b.`编号`) AS 编号,  
+                RTRIM(b.`名称`) AS 客户名称,  
+                COUNT(DISTINCT a.jjcp_gdbh) AS count   
+            FROM   
+                `成品入仓` a  
+            LEFT JOIN   
+                `物料_存货结构` b   
+                ON (CASE   
+                        WHEN LEFT(a.`jjcp_cpdh`, 1) REGEXP '^[A-Za-z]' THEN LEFT(a.`jjcp_cpdh`, 5)   
+                        ELSE LEFT(a.`jjcp_cpdh`, 4)   
+                    END) = RTRIM(b.`编号`)  -- 根据字母/数字判断连接方式  
+            WHERE   
+                a.jjcp_sj >= DATE_SUB(CURDATE(), INTERVAL 12 MONTH)  -- 最近12个月  
+                AND a.jjcp_sj >= '2025-01-01 00:00:00'               -- 限定从2025年开始  
+                AND a.`成品编码` != ''                                -- 编码不为空  
+                AND a.jjcp_smb IN ('末 板', '末板')                 -- 状态筛选  
+            GROUP BY   
+                DATE_FORMAT(a.jjcp_sj, '%Y-%m'),  
+                RTRIM(b.`编号`)   
+            ORDER BY   
+                date DESC,  
+                编号 ASC";
+
+        // 执行查询，确保连接的是 db3 数据库
+        $db3 = \db()->connect(config('database.db3'));
+        $data = $db3->query($sql);
+        // 创建一个新数组存储整理后的数据
         $organizedData = [];
+
         // 遍历原始数据
         foreach ($data as $entry) {
-            $date = date('Ym',strtotime($entry['date']));
+            $date = date('Ym', strtotime($entry['date']));  // 格式化为年月，例如 202506
 
-            // 检查日期是否在已整理数据中存在
+            // 如果当前月份已经有数据，追加数据
             if (isset($organizedData[$date])) {
-                // 如果日期存在，将数据追加到该日期下
                 $organizedData[$date][] = [
                     '客户名称' => $entry['客户名称'],
                     '客户编号' => $entry['编号'],
                     'total' => $entry['count'],
                 ];
-                // 统计该日期下所有数据的总和
+                // 累加该月的总数
                 $organizedData[$date]['total_count'] += $entry['count'];
             } else {
-                // 如果日期不存在，创建新的日期项并添加数据
+                // 否则初始化该月数据
                 $organizedData[$date] = [
                     [
                         '客户名称' => $entry['客户名称'],
@@ -62,1382 +85,228 @@ class OrderSuperLoss extends Api
                         'total' => $entry['count'],
                     ]
                 ];
-                // 初始化该日期的总和
+                // 初始化总数
                 $organizedData[$date]['total_count'] = $entry['count'];
             }
         }
 
-        // 将整理后的数据调整为以日期和相加的总和为索引的格式
+        // 整理成最终格式，以 "年月-总数" 为键
         $finalData = [];
         foreach ($organizedData as $date => $entries) {
             $totalCount = $entries['total_count'];
             $index = $date . '-' . $totalCount;
-            unset($entries['total_count']);
+            unset($entries['total_count']);  // 删除临时统计字段
             $finalData[$index] = $entries;
         }
-        $this->success('请求成功',$finalData);
+
+        // 返回成功结果
+        $this->success('请求成功', $finalData);
     }
+
     /**
-     * 获取超节损工单列表
-     * @ApiMethod GET
-     * @params string date
-     * @params string code
-     * 报废定额=（基础损耗+损耗率*计划产量）*损耗系数*计损色数（特定工序会有，如果无就不乘）
-     * 允损比例=报废定额/计划产量
-     * 目标合格率 = 100%-超节损工单中显示工序的允损比例之和
-     * 节损奖 小盒0.02 大盒0.09
-     *
-    */
-    public function getList(){
-        if (Request::instance()->isGet() == false) {
+     * 超节损列表
+     */
+    public function getList()
+    {
+        if (!Request::instance()->isGet()) {
             $this->error('非法请求');
         }
+
         $params = Request::instance()->param();
         $where = [];
+
+        // 设置默认分页和限制
+        $limit = empty($params['limit']) ? 15 : intval($params['limit']);
+        $pages = empty($params['page']) ? 1 : intval($params['page']);
+
+        // 构建查询条件
         if (!empty($params['code'])) {
-            if (!empty($params['search'])) {
-                $this->error('参数错误');
-            }
+            $prefixLength = preg_match('/[A-Za-z]/', $params['code']) ? 5 : 4;
+            $where['a.jjcp_cpdh'] = ['LIKE', substr($params['code'], 0, $prefixLength) . '%'];
         }
+
         if (!empty($params['date'])) {
-            if (!empty($params['search'])) {
-                $this->error('参数错误');
-            }
-            $date_year = substr($params['date'],0,4);
-            $date_mon = substr($params['date'],4);
-            $date = $date_year.'-'.$date_mon;
-            $where['a.jjcp_sj' ] = array('like',$date.'%');
+            $year = substr($params['date'], 0, 4);
+            $month = substr($params['date'], 4, 2);
+            $formattedDate = $year . '-' . $month;
+            $where['a.jjcp_sj'] = ['like', $formattedDate . '%'];
         }
+
         if (!empty($params['search'])) {
             if (!empty($params['date']) || !empty($params['code'])) {
-               $this->error('参数错误');
+                $this->error('参数错误');
             }
-            $where['a.jjcp_gdbh|a.成品名称|a.jjcp_cpmc'] = array('like','%'.$params['search'].'%');
-        }
-        $where['b.行号' ] = 1;
-        $where['a.jjcp_smb' ] = array('IN', array('末 板', '末板'));
-        $limit = $params['limit'];
-        if (empty($limit)){
-            $limit = 15;
+            $where['a.jjcp_gdbh|a.jjcp_cpdh|a.jjcp_cpmc'] = ['like', '%' . $params['search'] . '%'];
         }
-        $pages = $params['page'];
-        if (empty($pages)){
-            $pages = 1;
-        }
-//        $str = '';
-//        if (empty($params['search'])){
-//            $str = '/'.$date . '/' . $params['code'].'/'.$pages;
-//        }
-//        $is_have_cache = Cache::get('OrderSuperLoss/getList'.$str);
-        $is_have_cache = false;
-        $num = config('product_code_digit');
-        if ($is_have_cache === false){
-            if (!empty($params['code'])){
-                $data = db('成品入仓')->alias('a')
-                    ->join('工单_基本资料 b', 'a.jjcp_gdbh = b.Gd_gdbh','left')
-                    ->join('工单_印件资料 c', 'a.jjcp_gdbh = c.Yj_Gdbh AND a.jjcp_cpdh = c.yj_Yjdh','left')
-                    ->join('物料_收发记录 d',' a.jjcp_gdbh = d.st_gdbh AND d.cpdh = a.jjcp_cpdh')
-                    ->where($where)
-                    ->where('d.仓库编号','Y101')
-                    ->whereRaw('LEFT(a.成品编码, ' . $num . ') = "' . $params['code'] . '"')
-                    ->field('DISTINCT(a.jjcp_gdbh) as Gd_gdbh,a.jjcp_yjno,rtrim(a.jjcp_cpdh) as 成品编码,rtrim(a.jjcp_cpmc) as 成品名称,a.jjcp_sj,a.jjcp_smb,b.计量单位,
-                b.Gd_khdh, SUM(d.st_sl) as 实际投料 ,c.yj_Yjno, c.yj_ls,c.yj_ks,c.质量考核')
-                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno,d.st_rq desc')
-                    ->group('a.jjcp_gdbh,a.jjcp_yjno')
-                    ->page($pages)
-                    ->limit($limit)
-                    ->select();
-                $total = db('成品入仓')->alias('a')
-                    ->join('工单_基本资料 b', 'a.jjcp_gdbh = b.Gd_gdbh','left')
-                    ->join('工单_印件资料 c', 'a.jjcp_gdbh = c.Yj_Gdbh','left')
-                    ->where($where)
-                    ->whereRaw('LEFT(a.成品编码, ' . $num . ') = "' . $params['code'] . '"')
-                    ->count();
-            }else{
-                $data = db('成品入仓')->alias('a')
-                    ->join('工单_基本资料 b', 'a.jjcp_gdbh = b.Gd_gdbh','left')
-                    ->join('工单_印件资料 c', 'a.jjcp_gdbh = c.Yj_Gdbh AND a.jjcp_cpdh = c.yj_Yjdh','left')
-                    ->join('物料_收发记录 d',' a.jjcp_gdbh = d.st_gdbh AND d.cpdh = a.jjcp_cpdh')
-                    ->where($where)
-                    ->where('d.仓库编号','Y101')
-                    ->field('DISTINCT(a.jjcp_gdbh) as Gd_gdbh,a.jjcp_yjno,rtrim(a.jjcp_cpdh) as 成品编码,rtrim(a.jjcp_cpmc) as 成品名称,a.jjcp_sj,a.jjcp_smb,b.计量单位,
-                b.Gd_khdh, SUM(d.st_sl) as 实际投料,c.yj_Yjno, c.yj_ls,c.yj_ks,c.质量考核')
-                    ->order('b.Gd_khdh,a.成品编码 asc,a.jjcp_yjno,d.st_rq desc')
-                    ->group('a.jjcp_gdbh,a.jjcp_yjno')
-                    ->page($pages)
-                    ->limit($limit)
-                    ->select();
-                $total = db('成品入仓')->alias('a')
-                    ->join('工单_基本资料 b', 'a.jjcp_gdbh = b.Gd_gdbh','left')
-                    ->join('工单_印件资料 c', 'a.jjcp_gdbh = c.Yj_Gdbh','left')
-                    ->where($where)
-                    ->count();
-            }
-            foreach ($data as $key => $value){
-                //查出成品数量及日期
-                $cp_sql = "SELECT SUM(jjcp_sl) as cp_sl,MAX(jjcp_sj) as jjcp_sj FROM `成品入仓` WHERE jjcp_gdbh = '{$value['Gd_gdbh']}' AND jjcp_yjno = '{$value['jjcp_yjno']}' GROUP BY jjcp_gdbh,jjcp_yjno";
-                $cp_data = Db::query($cp_sql);
-                $data[$key]['warehousing_num'] = $cp_data[0]['cp_sl'];
-                $data[$key]['warehousing_date'] = substr($cp_data[0]['jjcp_sj'],0,10);
-                //查出进入超节损的工序，有上报产量的工序就进入超节损
-                $gxh_sql = "SELECT sczl_gxh FROM 
-                        (SELECT sczl_gxh FROM 设备_产量计酬 WHERE sczl_gdbh = '{$value['Gd_gdbh']}' AND sczl_yjno = '{$value['jjcp_yjno']}'
-                        UNION SELECT sczl_gxh FROM db_sczl WHERE sczl_gdbh = '{$value['Gd_gdbh']}' AND sczl_yjno = '{$value['jjcp_yjno']}') AS combined_result";
-                $gxh_arr = Db::query($gxh_sql);
-                $gxh_values = array_column($gxh_arr, 'sczl_gxh');
-//                $gy_data =db('工单_工艺资料')
-//                    ->where('Gy0_gdbh',$value['Gd_gdbh'])
-//                    ->where('Gy0_yjno',$value['jjcp_yjno'])
-//                    ->where('Gy0_gxh','in',$gxh_values)
-//                    ->field('Gy0_gxmc,Gy0_计划接货数,Gy0_计划损耗')
-//                    ->select();
-                $gy_data =db('工单_工艺资料')
-                    ->alias('a')
-                    ->field([
-                        'a.Gy0_yjno', 'a.Gy0_gxh', 'RTRIM(a.Gy0_gxmc) as Gy0_gxmc','RTRIM(a.Add_gxmc) as Add_gxmc','a.Gy0_ks', 'a.Gy0_ls', 'a.Gy0_计划接货数',
-                        'a.Gy0_计划损耗', 'a.超节损承担比例','SUM(b.sczl_zcfp) as total_fp','SUM(b.sczl_cl) as total_cl','SUM(c.sczl_cl) as cl','SUM(c.sczl_fp) as fp',
-                    ])
-                    ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-                    ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-                    ->where([
-                        'a.Gy0_gdbh' => $value['Gd_gdbh'],
-                        'a.Gy0_yjno' =>$value['jjcp_yjno'],
-                        'a.Gy0_gxh' => ['in', $gxh_values]
-                    ])
-                    ->group('a.Gy0_yjno,a.Gy0_gxh')
-                    ->select();
-                $arr = [];
-                $plan_loss = [];//工单计划损耗
-                $machine_plan_loss = 0;//机检计划损耗
-                foreach ($gy_data as $k=>$v){
-                    if ($v['Gy0_计划接货数'] > 0){
-                        $rate =  round($v['Gy0_计划损耗'] / $v['Gy0_计划接货数'],5);
-                    }else{
-                        $rate = 0;
-                    }
-                    $arr[$k] = floor($rate * 10000) /10000;
-                    $plan_loss[$k] = $v['Gy0_计划损耗'];
 
-//                    if (strpos($v['Gy0_gxmc'],'机检') !== false){
-//                        $machine_plan_loss = $v['Gy0_计划损耗'];
-//                    }
-                }
-                if ((int)$value['yj_ls'] > 0){
-                    $value['实际投料'] = number_format(((int)$value['实际投料']/10000)*$value['yj_ls']*$value['yj_ks'],4);
-                }else{
-                    $value['实际投料'] = number_format($value['实际投料']/10000,4);
-                }
-                $data[$key]['实际投料'] = $value['实际投料'];
-                if ($value['实际投料'] >0 ){
-                    $target_rate =  (1-array_sum($arr))*100;
-                    $data[$key]['target_rate'] =$target_rate.'%'; //目标合格率
-                    $real_rate = $cp_data[0]['cp_sl'] / ($value['实际投料'] * 10000) *100;
-                    $data[$key]['real_rate'] = number_format($real_rate,2) . '%';//实际合格率
-                }else{
-                    $data[$key]['target_rate'] = ''; //目标合格率
-                    $data[$key]['real_rate'] = '';//实际合格率
-                }
-                //制程废品
-                $zzfp_data =db('设备_产量计酬')->where('sczl_gdbh',$value['Gd_gdbh'])->where('sczl_yjno',$value['jjcp_yjno'])->field('SUM(sczl_zcfp) as sczl_zcfp')->select();
-                $data[$key]['zcfp'] = $zzfp_data[0]['sczl_zcfp'] * $value['yj_ls'];//制程废品
-                //废品合计
-                $wasteTotal = db('db_qczl')->where('qczl_gdbh',$value['Gd_gdbh'])->where('qczl_yjno',$value['jjcp_yjno'])->sum('qczl_fp');
-                if (empty($wasteTotal)){
-                    $wasteTotal = 0;
-                }
-                $data[$key]['废品合计'] = $wasteTotal + $data[$key]['zcfp'];//废品合计
-                $data[$key]['工单无形损'] = (int)($value['实际投料'] *10000) - $cp_data[0]['cp_sl'] - $data[$key]['废品合计'];//工单无形损
-                $out_sql = "SELECT fp_sl1,fp_sl2,fp_sl3,fp_sl4,fp_sl5,fp_sl6,fp_sl7,fp_sl8,fp_sl9,fp_sl10,fp_sl11,fp_sl12,fp_sl13,
-                        fp_lb1,fp_lb2,fp_lb3,fp_lb4,fp_lb5,fp_lb6,fp_lb7,fp_lb8,fp_lb9,fp_lb10,fp_lb11,fp_lb12,fp_lb13, 
-                        fp_bh1,fp_bh2,fp_bh3,fp_bh4,fp_bh5,fp_bh6,fp_bh7,fp_bh8,fp_bh9,fp_bh10,fp_bh11,fp_bh12,fp_bh13,
-                        fp_gxmc1,fp_gxmc2,fp_gxmc3,fp_gxmc4,fp_gxmc5,fp_gxmc6,fp_gxmc7,fp_gxmc8,fp_gxmc9,fp_gxmc10,fp_gxmc11,fp_gxmc12,fp_gxmc13 
-                        FROM db_qczl WHERE qczl_gdbh = '{$value['Gd_gdbh']}' AND  qczl_yjno = '{$value['jjcp_yjno']}'";
-                $waste_out = Db::query($out_sql);
-                $list = []; //外发废数组
-                $quality = [];//质检废数组
-                $material = [];//材料废数组
-                $change = [];//零头处理数组
-                $machine = [];//机检废品数组
-                $j = 0;
-                $m = 0;
-                $n = 0;
-                $l = 0;
-                $o = 0;
-                foreach ($waste_out as $entry) {
-                    for ($i = 1; $i <= 13; $i++) {
-                        $labelKey = "fp_lb" . $i;
-                        $bhKey = "fp_bh" . $i;
-                        $gxmcKey = "fp_gxmc" . $i;
-                        $slKey = "fp_sl" . $i;
-//                        if (!empty($entry[$labelKey])) {
-//                            if (substr($entry[$gxmcKey],0,2) == '99'){
-//                                $list[$j]= $entry[$slKey];
-//                                $j++;
-//                            }
-//                            if (substr($entry[$labelKey],0,1) == 'L' ){
-//                                $material[$n]= $entry[$slKey];
-//                                $n++;
-//                            }
-//                            if (substr($entry[$labelKey],0,3) == 'M04' ){
-//                                $change[$l]= $entry[$slKey];
-//                                $l++;
-//                            }
-//                        }
-//                        if (!empty($entry[$bhKey])) {
-//                            if ($entry[$bhKey] != '000000' && $entry[$slKey] > 0){
-//                                $quality[$m]= $entry[$slKey];
-//                                $m++;
-//                            }
-////                            if ($entry[$bhKey] != '000000' && substr($entry[$labelKey],0,3) == 'K01'){
-////                                $machine[$o]= $entry[$slKey];
-////                                $o++;
-////                            }
-//                        }
-                        if (!empty($entry[$labelKey])) {
-                            if (substr($entry[$labelKey],0,3) == 'M04'){
-                                $list[$j]= $entry[$slKey];
-                                $j++;
-                            }
-                            if (substr($entry[$labelKey],0,1) == 'L' ){
-                                $material[$n]= $entry[$slKey];
-                                $n++;
-                            }
-                            if (substr($entry[$labelKey],0,3) == 'M01' ){
-                                $change[$l]= $entry[$slKey];
-                                $l++;
-                            }
-                        }
-//                if (!empty($entry[$bhKey])) {
-//                    if ($entry[$bhKey] != '000000' && $entry[$slKey] > 0){
-                        $quality[$m]= $entry[$slKey];
-                        $m++;
-//                    }
-//                }
+        // 数据库连接
+        $db3 = \db()->connect(config('database.db3'));
 
-                    }
-                }
-                $machine_waste = array_sum($machine);//机检废品
-                if ($data[$key]['Gd_gdbh'] == '2401746'){
-                    halt($machine_waste);
-                }
-                $data[$key]['工单计划损耗'] = array_sum($plan_loss);//工单计划损耗
-                /**
-                 * 奖惩系数及金额
-                 * 奖惩金额 = 工单节损数 * 0.02(0.09)
-                 * 工单节损数 = 工单计划损耗 - 废品总数 - 机检节损数
-                 * 机检节损数 = 机检计划损耗 - 机检质检废品
-                 */
-                $machine_loss = $machine_plan_loss - $machine_waste;
-                $order_loss = $data[$key]['工单计划损耗'] - ($data[$key]['废品合计'] - array_sum($list));
-                if (strpos($data[$key]['成品名称'],'小盒')){
-                    $moneyRate = 0.02;
-                }else{
-                    $moneyRate = 0.09;
-                }
+        // 定义查询字段
+        $field = '
+        b.sys_ny,
+        a.jjcp_gdbh AS Gd_gdbh,
+        a.jjcp_yjno AS jjcp_yjno,
+        a.jjcp_yjno AS yj_Yjno,
+        c.yj_Yjdh as yjdh,
+        c.yj_ls AS yj_ls,
+        c.yj_cpdh AS 成品编码,
+        c.yj_yjmc AS 成品名称,
+        b.`实际投料`,
+        b.`计量单位`,
+        DATE(a.jjcp_sj) AS warehousing_date,
+        total_sl.warehousing_num,
+        SUM(DISTINCT b.`计划损耗`) AS `工单计划损耗`,
+        b.`废品合计`,
+        SUM(b.`CjsJe`) AS reward_money,
+        b.`印件无形损` AS 工单无形损,
+        b.`材料废`,
+        b.`零头处理`,
+        b.`外发废`,
+        SUM(b.`班组制程废品`) AS zcfp,
+        `工单质检废` AS 工单质检废,
+        c.质量考核
+    ';
 
-                $reward = $order_loss * $moneyRate;
-                $data[$key]['reward_rate'] = '1';
-                if ($data[$key]['质量考核'] === 0){
-                    $data[$key]['reward_money'] = number_format($reward,2);
-                }else{
-                    $data[$key]['reward_money'] = '';
-                }
-//                $data[$key]['reward_money'] = '';
-                $data[$key]['材料废'] = array_sum($material); //材料废
-                $data[$key]['零头处理'] = array_sum($change); //零头处理
-                $data[$key]['外发废'] = array_sum($list);//外发废
-                $data[$key]['分摊废'] = '';//分摊废
-                $data[$key]['工单质检废'] =  array_sum($quality);  //质检废
-            }
-            $res = [
-                'data'=>$data,
-                'total' => $total
-            ];
-//            if ($str != false){
-//                Cache::set('OrderSuperLoss/getList'.$str,$res,3600);
-//            }
-        }else{
-//            $res = Cache::get('OrderSuperLoss/getList'.$str);
-        }
-        $this->success('请求成功',$res);
-    }
-    /**
-     * 获取工单超节损工艺
-     * @ApiMethod GET
-     * @params string order
-    */
-    public function getOrderSuperLossGy(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->param();
-        if (!isset($params['order']) || empty($params['order'])) {
-            $this->error('参数错误');
-        }
-        if (!isset($params['yjno']) || empty($params['yjno'])) {
-            $this->error('参数错误');
-        }
-        $sql = "SELECT a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh,rtrim(a.Gy0_gxmc) as Gy0_gxmc,rtrim(a.Add_gxmc) as Add_gxmc,a.Gy0_ls,a.Gy0_Rate0,a.Gy0_Rate1,a.损耗系数,a.Gy0_ms,
-                a.Gy0_计划接货数,a.Gy0_计划损耗,sum(b.sczl_cl) as total_cl,sum(b.sczl_zcfp) as total_fp,sum(c.sczl_cl) as cl,SUM(c.sczl_fp) as fp FROM `工单_工艺资料` a
-                LEFT JOIN `设备_产量计酬` b ON a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_gxh = b.sczl_gxh
-                LEFT JOIN `db_sczl` c ON a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_gxh = c.sczl_gxh
-                WHERE a.Gy0_gdbh = '{$params['order']}' AND a.Gy0_yjno = '{$params['yjno']}' GROUP BY a.Gy0_gxh";
-        $data = Db::query($sql);
-        foreach ($data as $key=>$value){
-            if (!empty($value['total_cl'])){
-                $data[$key]['total_cl'] = $value['total_cl'] *$value['Gy0_ls'];
-            }else{
-                $data[$key]['total_cl'] =$value['cl'] *$value['Gy0_ls'];
-            }
-            if (!empty($value['total_fp'])){
-                $data[$key]['total_fp'] = $value['total_fp'] *$value['Gy0_ls'];
-            }else{
-                $data[$key]['total_fp'] = $value['fp'] *$value['Gy0_ls'];
-            }
-            unset($data[$key]['cl']);
-            unset($data[$key]['fp']);
-        }
-        $this->success('请求成功',$data);
-    }
-    /**
-     * 工单超节损统计
-     * @ApiMethod GET
-     * @params string order
-     * 节损奖 小盒0.02 大盒0.09
-    */
-    public function getOrderSuperLossCount(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->param();
-        if (!isset($params['order']) || empty($params['order'])) {
-            $this->error('参数错误');
-        }
-        $order = $params['order'];
-        $field = 'a.Gd_gdbh,rtrim(a.成品代号) as 成品代号,rtrim(a.成品名称) as 成品名称,rtrim(a.销售订单号) as 销售订单号,a.订单数量,c.yj_ls as ls,c.yj_ks as ks,SUM(b.st_sl) as 投料';
-        $data =db('工单_基本资料')
+        // 子查询：计算入仓数量
+        $subQuery = $db3->name('成品入仓')
+            ->alias('a_sub')
+            ->field('
+            a_sub.jjcp_gdbh AS Gd_gdbh_sub,
+            a_sub.jjcp_yjno AS jjcp_yjno_sub,
+            SUM(a_sub.jjcp_sl) AS warehousing_num
+        ')
+            ->group('a_sub.jjcp_gdbh, a_sub.jjcp_yjno')
+            ->buildSql();
+
+        // 主查询
+        $list = $db3->name('成品入仓')
             ->alias('a')
-            ->join('物料_收发记录 b','a.Gd_gdbh = b.st_gdbh AND a.Gd_cpdh = b.cpdh')
-            ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh AND c.yj_Yjdh = a.Gd_cpdh')
-            ->where('a.Gd_Gdbh',$order)
-            ->where('a.行号',$params['yjno'])
-            ->where('c.yj_Yjno',$params['yjno'])
-            ->where('b.仓库编号','Y101')
-            ->where('c.质量考核',0)
+            ->join('工单_质量考核汇总 b', 'a.jjcp_gdbh = b.Gy0_gdbh AND a.jjcp_yjno = b.印件及工序', 'left')
+            ->join('工单_印件资料 c', 'a.jjcp_gdbh = c.Yj_Gdbh AND a.jjcp_yjno = c.yj_Yjno', 'left')
+            ->join([$subQuery => 'total_sl'], 'a.jjcp_gdbh = total_sl.Gd_gdbh_sub AND a.jjcp_yjno = total_sl.jjcp_yjno_sub', 'left')
             ->field($field)
-            ->find();
-        if (empty($data)){
-            $this->error('该工单不参与考核');
-        }
-        if ($data['ls'] == 0){
-            $data['ls'] === 1;
-        }
-        if ($data['ks'] == 0){
-            $data['ks'] === 1;
-        }
-        $data['实际投料'] = number_format($data['投料']*$data['ls']*$data['ks']/10000,4);
-        //查出成品数量及日期
-        $cp_sql = "SELECT SUM(jjcp_sl) as cp_sl,MAX(jjcp_sj) as jjcp_sj FROM `成品入仓` WHERE jjcp_gdbh = '{$order}' AND jjcp_yjno = '{$params['yjno']}' GROUP BY jjcp_gdbh,jjcp_yjno";
-        $cp_data = Db::query($cp_sql);
-        if (empty($cp_data)){
-            $this->success('此工单未查询到成品入库信息,请核查该工单是否已进入超节损');
-        }
-        $data['warehousing_num'] = $cp_data[0]['cp_sl'];
-        $data['warehousing_date'] = substr($cp_data[0]['jjcp_sj'],0,10);
-        //查出进入超节损的工序，有上报产量的工序就进入超节损
-        $gxh_sql = "SELECT sczl_gxh FROM
-                        (SELECT sczl_gxh FROM 设备_产量计酬 WHERE sczl_gdbh = '{$order}' AND sczl_yjno = '{$params['yjno']}'
-                        UNION SELECT sczl_gxh FROM db_sczl WHERE sczl_gdbh = '{$order}' AND sczl_yjno = '{$params['yjno']}' AND sczl_gxmc like '%拆片%') AS combined_result";
-        $gxh_arr = Db::query($gxh_sql);
-//        $gxh_arr = \db('工单_工艺资料')
-//            ->where('Gy0_gdbh',$order)
-//            ->where('Gy0_yjno',$params['yjno'])
-//            ->field('Gy0_gxh as sczl_gxh')
-//            ->select();
-        $gxh_values = array_column($gxh_arr, 'sczl_gxh');
-        foreach ($gxh_values as $k=>$v){
-            if ((int)$v < 10){
-                $gxh_values[$k] = '0'.$v;
-            }
-        }
-        $gy_data =db('工单_工艺资料')
-            ->alias('a')
-            ->field([
-                'a.Gy0_yjno', 'a.Gy0_gxh', 'RTRIM(a.Gy0_gxmc) as Gy0_gxmc','RTRIM(a.Add_gxmc) as Add_gxmc','a.Gy0_ks', 'a.Gy0_ls', 'a.Gy0_计划接货数',
-                'a.Gy0_计划损耗', 'a.无形损承担比例','a.超节损承担比例','SUM(b.sczl_zcfp) as total_fp','SUM(b.sczl_cl) as total_cl','SUM(c.sczl_cl) as cl','SUM(c.sczl_fp) as fp',
-            ])
-            ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-            ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-            ->where([
-                'a.Gy0_gdbh' => $order,
-                'a.Gy0_yjno' => $params['yjno'],
-                'a.Gy0_gxh' => ['in', $gxh_values]
-            ])
-            ->group('a.Gy0_yjno,a.Gy0_gxh')
+            ->where($where)
+            ->where('a.jjcp_smb', 'like', '末%')
+            ->group('Gd_gdbh, jjcp_yjno')
+            ->order('warehousing_date DESC')
+            ->page($pages, $limit)
             ->select();
-        $arr = [];
-        $plan_loss = [];//工单计划损耗
-        foreach ($gy_data as $k=>$v){
-            $rate =  round($v['Gy0_计划损耗'] / $v['Gy0_计划接货数'],5);
-            $arr[$k] = floor($rate * 10000) /10000;
-            $plan_loss[$k] = $v['Gy0_计划损耗'];
-        }
-        $target_rate =  (1-array_sum($arr))*100;
-        $data['target_rate'] =$target_rate.'%'; //目标合格率
-        $real_rate = $cp_data[0]['cp_sl'] / ($data['实际投料'] * 10000) *100;
-        $data['real_rate'] = number_format($real_rate,2) . '%';//实际合格率
-        //制程废品
-        $zzfp_data =db('设备_产量计酬')->where('sczl_gdbh',$order)->where('sczl_yjno',$params['yjno'])->field('SUM(sczl_zcfp) as sczl_zcfp')->select();
-        //联数
-        $ls =db('工单_工艺资料')->where('Gy0_gdbh',$order)->field('Gy0_ls,Gy0_ks')->find();
-        //制程废品*ls
-        $data['zcfp'] = $zzfp_data[0]['sczl_zcfp'] * $ls['Gy0_ls'] * $ls['Gy0_ks'];
-        //废品数量
-        $wasteTotal = db('db_qczl')->where('qczl_gdbh',$order)->where('qczl_yjno',$params['yjno'])->sum('qczl_fp');
-        if (empty($wasteTotal)){
-            $wasteTotal = 0;
-        }
-        //废品合计
-        $waste_total = $data['zcfp'] + $wasteTotal;
-        //工单无形损
-        $data['intangible_loss'] = (int)($data['实际投料'] *10000 - $cp_data[0]['cp_sl'] - $waste_total);
-        $out_sql = "SELECT fp_sl1,fp_sl2,fp_sl3,fp_sl4,fp_sl5,fp_sl6,fp_sl7,fp_sl8,fp_sl9,fp_sl10,fp_sl11,fp_sl12,fp_sl13,
-                        fp_lb1,fp_lb2,fp_lb3,fp_lb4,fp_lb5,fp_lb6,fp_lb7,fp_lb8,fp_lb9,fp_lb10,fp_lb11,fp_lb12,fp_lb13, 
-                        fp_bh1,fp_bh2,fp_bh3,fp_bh4,fp_bh5,fp_bh6,fp_bh7,fp_bh8,fp_bh9,fp_bh10,fp_bh11,fp_bh12,fp_bh13,
-                        fp_gxmc1,fp_gxmc2,fp_gxmc3,fp_gxmc4,fp_gxmc5,fp_gxmc6,fp_gxmc7,fp_gxmc8,fp_gxmc9,fp_gxmc10,fp_gxmc11,fp_gxmc12,fp_gxmc13,UniqId
-                        FROM db_qczl WHERE qczl_gdbh = '{$order}' AND qczl_yjno = '{$params['yjno']}'";
-        $waste_out = Db::query($out_sql);
-        $list = []; //外发废数组
-        $quality = [];//质检废数组
-        $material = [];//材料废数组
-        $change = [];//零头处理数组
-        $j = 0;
-        $m = 0;
-        $n = 0;
-        $l = 0;
-        foreach ($waste_out as $entry) {
-            for ($i = 1; $i <= 13; $i++) {
-                $labelKey = "fp_lb" . $i;
-                $bhKey = "fp_bh" . $i;
-                $gxmcKey = "fp_gxmc" . $i;
-                $slKey = "fp_sl" . $i;
-                if (!empty($entry[$labelKey])) {
-                    if (substr($entry[$labelKey],0,3) == 'M04'){
-                        $list[$j]= $entry[$slKey];
-                        $j++;
-                    }
-                    if (substr($entry[$labelKey],0,1) == 'L' ){
-                        $material[$n]= $entry[$slKey];
-                        $n++;
-                    }
-                    if (substr($entry[$labelKey],0,3) == 'M01' ){
-                        $change[$l]= $entry[$slKey];
-                        $l++;
-                    }
-                }
-//                if (!empty($entry[$bhKey])) {
-//                    if ($entry[$bhKey] != '000000' && $entry[$slKey] > 0){
-                        $quality[$m]= $entry[$slKey];
-                        $m++;
-//                    }
-//                }
 
-            }
-        }
-        $data['材料废'] = array_sum($material); //材料废
-        $data['零头处理'] = array_sum($change); //零头处理
-        $data['外发废'] = array_sum($list);//外发废
-        $data['工单质检废'] =  array_sum($quality);//质检废
-//        $data['分摊废'] = '';//分摊废
-        $plan_total =db('工单_工艺资料')->where(['Gy0_gdbh' => $order,'Gy0_yjno' => $params['yjno'], 'Gy0_gxh' => ['in', $gxh_values]])->value('SUM(Gy0_计划损耗 * Gy0_ls * Gy0_ks)');
-        //单据列表最后统计
-        $total = [];
-        $total['plan_loss'] = 0;
-        $total['total_fp'] = 0;
-        $total['waste_quality'] = 0;
-        $total['waste_intangible'] = 0;
-        $total['reward'] = 0; //超节损奖励数组
-        //按工序打印
-        if ($params['type'] == 1){
-            $total['total_waste'] = 0;
-            $total['loss'] = 0;
-            foreach ($gy_data as $k=>$item){
-                $gy_data[$k]['Gy0_计划损耗'] = $item['Gy0_计划损耗']*$item['Gy0_ls']*$item['Gy0_ks'];
-                $gy_data[$k]['waste_quality'] = 0;
-                $gy_data[$k]['total_fp'] = $item['total_fp'] * $item['Gy0_ls'];
-                $gy_data[$k]['total_cl'] = $item['total_cl'] * $item['Gy0_ls'];
-                //无形损
-                if (floatval($item['无形损承担比例']) > 0){
-                    $gy_data[$k]['intangible_loss'] = round(number_format($gy_data[$k]['Gy0_计划损耗']/$plan_total,4) * $data['intangible_loss'] * floatval($item['无形损承担比例']));
+        // 后续处理结果
+        foreach ($list as $key => $value) {
+            $status = $db3->name('工单_印件资料')
+                ->where('Yj_Gdbh', $value['Gd_gdbh'])
+                ->where('yj_Yjno', $value['jjcp_yjno'])
+                ->value('质量考核');
 
-                }else{
-                    $gy_data[$k]['intangible_loss'] = round(number_format($gy_data[$k]['Gy0_计划损耗']/$plan_total,4) * $data['intangible_loss']);
-                }
-//                $gy_data[$k]['intangible_loss'] = round(number_format($gy_data[$k]['Gy0_计划损耗']/$plan_total,4) * $data['intangible_loss']);
-                foreach ($waste_out as $entry) {
-                    for ($i = 1; $i <= 13; $i++) {
-                        $gxmcKey = "fp_gxmc" . $i;
-                        $slKey = "fp_sl" . $i;
-                        if ((int)substr($entry[$gxmcKey],0,2) == $item['Gy0_gxh']){
-                            $gy_data[$k]['waste_quality'] += $entry[$slKey];
+            $list[$key]['工单质检废'] = $value['废品合计'] - $value['zcfp'];
+            $list[$key]['质量考核'] = $status;
+            $list[$key]['考核'] = ($status == 1) ? '否' : '是';
 
-                        }
-                    }
-                }
-                //报废合计
-                if ($gy_data[$k]['intangible_loss'] < 0){
-                    $gy_data[$k]['total_waste'] = $gy_data[$k]['waste_quality']  +  $gy_data[$k]['total_fp'];
-                }else{
-                    $gy_data[$k]['total_waste'] = $gy_data[$k]['waste_quality'] + $gy_data[$k]['intangible_loss'] +  $gy_data[$k]['total_fp'];
-                }
-                //工序节损数
-                $gy_data[$k]['loss'] = $item['Gy0_计划损耗']*$item['Gy0_ls']*$item['Gy0_ks'] - $gy_data[$k]['total_waste'];
-                //占投料报废率
-                $gy_data[$k]['loss_rate'] = number_format($gy_data[$k]['loss'] / $item['Gy0_计划接货数'],4) * 100 .'%';
-                //工序目标报废率
-                $target_loss_rate = floor($item['Gy0_计划损耗'] / $item['Gy0_计划接货数'] * 10000) / 10000;
-                if ($target_loss_rate == 0){
-                    $target_loss_rate = round($item['Gy0_计划损耗'] / $item['Gy0_计划接货数'] * 10000) / 10000;
-                }
-                $gy_data[$k]['target_loss_rate'] = $target_loss_rate * 100 . '%';
-                //工序实际报废率
-                $gy_data[$k]['actual_loss_rate'] = number_format($gy_data[$k]['total_waste'] / ($data['实际投料']*10000),4) * 100 .'%';
-                $gy_data[$k]['超节损承担比例'] = number_format($item['超节损承担比例'],4) * 100 .'%';
-                //工序超节损金额
-                if (strpos($data['成品名称'],'小盒')){
-                    $moneyRate = 0.02;
-                }else{
-                    $moneyRate = 0.09;
-                }
-                if (strpos($item['Gy0_gxmc'],'机检') !== false){
-                    $gy_data[$k]['工序超节损金额'] = '0.000000';
-                }else{
-                    $gy_data[$k]['工序超节损金额'] = number_format($gy_data[$k]['loss'] * $item['超节损承担比例'] * $moneyRate,4);
-                }
-                $total['plan_loss'] += $gy_data[$k]['Gy0_计划损耗'];
-                $total['total_fp'] += $gy_data[$k]['total_fp'];
-                $total['waste_quality'] += $gy_data[$k]['waste_quality'];
-                $total['waste_intangible'] += $gy_data[$k]['intangible_loss'];
-                $total['total_waste'] += $gy_data[$k]['total_waste'];
-                $total['loss'] += $gy_data[$k]['loss'];
-                $total['reward'] += floatval(str_replace(',', '', $gy_data[$k]['工序超节损金额']));
+            if ($value['实际投料'] !== null) {
+                $actualMaterial = $value['实际投料'] * 10000;
+                $list[$key]['target_rate'] = $this->calculateRate($actualMaterial, $value['工单计划损耗']);
+                $realRate = $value['warehousing_num'] / $actualMaterial * 100;
+                $list[$key]['real_rate'] = number_format($realRate, 2) . '%';
+            } else {
+                $list[$key]['target_rate'] = null;
+                $list[$key]['real_rate'] = null;
             }
-            $total['reward'] = number_format($total['reward'],2);
-            $data['gy_data'] = $gy_data;
-            $data['total'] = $total;
-            $this->success('请求成功',$data);
-        }else{ //按班组打印
-            //总产量数据
-            $total_cl_data = \db('工单_工艺资料')->alias('a')
-                ->field(['a.Gy0_yjno', 'a.Gy0_gxh','a.Gy0_ls', 'SUM(b.sczl_cl) as total_cl', 'SUM(c.sczl_cl) as cl'])
-                ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-                ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-                ->where([
-                    'a.Gy0_gdbh' => $order,
-                    'a.Gy0_yjno' => $params['yjno'],
-                    'a.Gy0_gxh' => ['IN', $gxh_values],
-                    'b.sczl_cl|c.sczl_cl' => ['>', 0]
-                ])
-                ->group('b.sczl_gxh')
-                ->order('a.Gy0_gxh')
-                ->select();
-            //按班组分的产量数据
-            $gy_data =db('工单_工艺资料')
-                ->alias('a')
-                ->field([
-                    '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',
-                    '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',
-                    'rtrim(c.sczl_gxmc) as gxmc', 'SUM(c.sczl_cl) as cl', 'SUM(c.sczl_fp) as fp', 'c.sczl_bh1 as sczl_bh'
-                ])
-                ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-                ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-                ->where([
-                    'a.Gy0_gdbh' => $order,
-                    'a.Gy0_yjno' => $params['yjno'],
-                    'a.Gy0_gxh' => ['in', $gxh_values],
-                    'b.sczl_cl|c.sczl_cl' => ['>', 0]
-                ])
-                ->group('b.sczl_gxh, 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();
-            foreach ($gy_data as $key=>$value){
-                $gy_data[$key]['Gy0_yjno'] = $value['Gy0_yjno'] > 10 ? $value['Gy0_yjno'] : '0'.$value['Gy0_yjno'];
-                //每道工序的产量（按班组分）
-                $gy_data[$key]['total_cl'] = $value['total_cl'] * $value['Gy0_ls'];
-                if (empty($value['total_cl'])){
-                    $gy_data[$key]['total_cl'] = $value['cl'] * $value['Gy0_ls'];
-                }
-                $value['Gy0_计划损耗'] = $value['Gy0_计划损耗']*$value['Gy0_ls']*$value['Gy0_ks'];
-                //计算每道工序的计划损耗
-                foreach ($total_cl_data as $k=>$v){
-                    //每道工序的总产量
-                    $cl = $v['total_cl'] * $v['Gy0_ls'];
-                    if (empty($cl)){
-                        $cl = $v['cl'] * $v['Gy0_ls'];
-                    }
-                    if ($value['Gy0_yjno'] == $v['Gy0_yjno'] && $value['Gy0_gxh'] == $v['Gy0_gxh']){
-                        $gy_data[$key]['计划损耗'] = round($gy_data[$key]['total_cl'] / $cl  * $value['Gy0_计划损耗']);
-                    }
-                }
-                //每道工序的制程废品（按班组分）
-                $gy_data[$key]['sczl_zcfp'] = $value['sczl_zcfp'] * $value['Gy0_ls'];
-                if (empty($value['sczl_zcfp'])){
-                    $gy_data[$key]['sczl_zcfp'] = $value['fp'] * $value['Gy0_ls'];
-                }
-                //计算每道工序的质检废(按班组)
-                $gy_data[$key]['sczl_gxmc'] = $value['sczl_gxmc'];
-                if (empty($value['sczl_gxmc'])){
-                    $gy_data[$key]['sczl_gxmc'] = $value['gxmc'];
-                }
-                if (empty($value['sczl_bh1']) || is_null($value['sczl_bh1'])){
-                    $value['sczl_bh1'] = $value['sczl_bh'];
-                }
-                $gy_data[$key]['sczl_bh1'] = $value['sczl_bh1'];
-                $gy_data[$key]['质检废'] = 0;
-                foreach ($waste_out as $entry) {
-                    for ($i = 1; $i <= 13; $i++) {
-                        $gxmcKey = "fp_gxmc" . $i;
-                        $slKey = "fp_sl" . $i;
-                        $bhKey = "fp_bh" . $i;
-                        if ((int)substr($entry[$gxmcKey],0,2) == $value['Gy0_gxh'] && $entry[$bhKey] == $value['sczl_bh1']){
-                            $gy_data[$key]['质检废'] += $entry[$slKey];
-                        }
-                    }
-                }
-                //无形损分摊
-                if ($plan_total >0){
-                    $gy_data[$key]['无形损分摊'] = round($gy_data[$key]['计划损耗'] / $plan_total * $data['intangible_loss']);
-                }else{
-                    $gy_data[$key]['无形损分摊'] = 0;
-                }
 
-                //班组成员
-                $nameArr = [];
-                for ($j = 1; $j <= 10; $j++) {
-                    $bhKey = "sczl_bh" . $j;
-                    if (!empty($value[$bhKey])){
-                        $name = \db('人事_基本资料')->where('员工编号',$value[$bhKey])->value('rtrim(员工姓名)');
-                        array_push($nameArr,$name);
-                    }
-                }
-                $gy_data[$key]['member'] = implode(' ',$nameArr);
-                unset($gy_data[$key]['Gy0_计划损耗']);
-                unset($gy_data[$key]['gxmc']);
-                unset($gy_data[$key]['cl']);
-                unset($gy_data[$key]['fp']);
-                unset($gy_data[$key]['sczl_bh']);
+            $list[$key]['reward_rate'] = '1'; // 如有实际逻辑，可替换
+        }
 
-            }
-            //重新计算多班组同组长的质检废，质检废 = 班组产量 / 总产量 * 质检废
-            $totals = [];
-//            foreach ($gy_data as $item) {
-//                $sczl_bh1 = $item['sczl_bh1'];
-//                $total_cl = $item['total_cl'];
-//
-//                if (isset($totals[$sczl_bh1])) {
-//                    $totals[$sczl_bh1]['total'] += $total_cl;
-//                } else {
-//                    $totals[$sczl_bh1] = ['total' => $total_cl, 'count' => 0];
-//                }
-//                $totals[$sczl_bh1]['count']++;
-//            }
-            $i = 0;
-            foreach ($gy_data as &$item) {
-                $sczl_bh1 = $item['sczl_bh1'];
-                $total_cl = $item['total_cl'];
-//                $item['total'] = $totals[$sczl_bh1]['total'];
-//                if ($totals[$sczl_bh1]['count'] > 1) {
-//                    $item['质检废'] = round($total_cl / $totals[$sczl_bh1]['total'] * $item['质检废']);
-//                }
-                //节损数量
-                if ($item['无形损分摊'] > 0){
-                    $total_waste = $item['质检废']  +  $item['sczl_zcfp'] + $item['无形损分摊'];
-                }else{
-                    $total_waste = $item['质检废']  +  $item['sczl_zcfp'];
-                }
-                $gy_data[$i]['节损数量'] = $item['计划损耗'] - $total_waste;
-                //节损奖
-                if (strpos($data['成品名称'],'小盒')){
-                    $moneyRate = 0.02;
-                }else{
-                    $moneyRate = 0.09;
-                }
-                if (strpos($item['sczl_gxmc'],'机检') !== false){
-                    $gy_data[$i]['节损奖'] = 0;
-                }else{
-                    $gy_data[$i]['节损奖'] = number_format($gy_data[$i]['节损数量'] *  $item['超节损承担比例'] * $moneyRate,4);
-                }
-                $gy_data[$i]['超节损承担比例'] = number_format($item['超节损承担比例'],4) * 100 .'%';
 
-                $total['plan_loss'] += $item['计划损耗'];
-                $total['total_fp'] += $item['sczl_zcfp'];
-                $total['waste_quality'] += $item['质检废'];
-                $total['waste_intangible'] += $item['无形损分摊'];
-                $total['reward'] += floatval(str_replace(',', '', $gy_data[$i]['节损奖']));
-                $i++;
-            }
-            $total['reward'] = number_format($total['reward'],2);
-            $data['gy_data'] = $gy_data;
-            $data['total'] = $total;
-            $this->success('请求成功',$data);
-        }
-    }
-    /**
-     * 获取工单工艺
-     * @ApiMethod GET
-     * @params string order
-    */
-    public function getOrderGy(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->param();
-        if (!isset($params['order']) || empty($params['order'])) {
-            $this->error('参数错误');
-        }
-        $order = $params['order'];
-        $field = 'Gy0_yjno,Gy0_gxh,rtrim(Gy0_gxmc) as Gy0_gxmc,rtrim(Add_gxmc) as Add_gxmc,Gy0_rate0,Gy0_rate1,损耗系数,无形损承担比例 as loss_one,超节损承担比例 as loss_two,超节损核算单价 as loss_thr,UniqId';
-        $data =db('工单_工艺资料')->where('Gy0_gdbh',$order)->where('Gy0_yjno',$params['yjno'])->field($field)->select();
-        $this->success('请求成功',$data);
-    }
-    /**
-     * 更新工单工艺
-     * @ApiMethod POST
-     * @params array data
-    */
-    public function updateOrderGy(){
-        if (Request::instance()->isPost() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->post();
-        if (!isset($params) || !isset($params[0]['UniqId'])){
-            $this->error('参数不能为空');
-        }
-        $i = 0;
-        foreach ($params as $key=>$value){
-            $data = [];
-            $data['无形损承担比例'] = $value['loss_one'];
-            $data['超节损承担比例'] = $value['loss_two'];
-            $data['超节损核算单价'] = $value['loss_thr'];
-            $sql =db('工单_工艺资料')->where('UniqId',$value['UniqId'])->fetchSql(true)->update($data);
-            $res = Db::query($sql);
-            if ($res !== false){
-                $i++;
-            }
-        }
-        if ($i !== 0){
-            $this->success('更新成功');
-        }else{
-            $this->error('更新失败');
-        }
-    }
-    /**
-     * 获取工单印件考核资料
-     * @ApiMethod GET
-     * @params string order
-    */
-    public function getOrderYj(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->request();
-        if (!isset($params['order']) || empty($params['order'])) {
-            $this->error('参数错误');
-        }
-        if (!isset($params['yjno']) || empty($params['yjno'])) {
-            $this->error('参数错误');
-        }
-        $data =db('工单_印件资料')
-            ->where('Yj_gdbh',$params['order'])
-            ->where('Yj_Yjno', $params['yjno'])
-            ->field('Yj_gdbh,rtrim(yj_Yjdh) as yj_Yjdh,yj_Yjno,rtrim(yj_yjmc) as yj_yjmc,质量考核')->find();
-        $this->success('请求成功',$data);
-    }
-    /**
-     * 更新工单印件考核资料
-     * @ApiMethod POST
-     * @params array data
-    */
-    public function updateOrderYj(){
-        if ($this->request->isGet() === false){
-            $this->error('请求错误');
-        }
-        $params = $this->request->get();
-        if (!isset($params['order'])){
-            $this->error('参数不能为空');
-        }
-        if (!isset($params['yj_yjno'])){
-            $this->error('参数不能为空');
-        }
-        if (!isset($params['examine'])){
-            $this->error('参数不能为空');
-        }
-        if ($params['examine'] === '参与'){
-            $examine = 0;
-        }else{
-            $examine = 1;
-        }
-        $where['Yj_Gdbh'] = $params['order'];
-        $where['yj_Yjno'] = $params['yj_yjno'];
-        $sql =db('工单_印件资料')->where($where)->fetchSql(true)->update(['质量考核'=>$examine]);
-        $res = \db()->query($sql);
-        if ($res !== false){
-            $this->success('更新成功');
-        }else{
-            $this->error('更新失败');
-        }
-    }
-    /**
-     * 获取修正工单实际投料列表
-     * @ApiMethod GET
-     * @params string year
-     * @params string month
-    */
-    public function getOrderFeedList(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->request();
-        if (empty($params['workorder']) || empty($params['yjno'])) {
-            $this->error('参数错误');
-        }
-//        $search = $params['year'].'.'.$params['month'];
-        $field = "a.Gd_gdbh,rtrim(c.yj_Yjdh) as yj_yjdh,c.yj_Yjno, c.yj_ks,c.yj_ls,rtrim(c.yj_zzdh) as yj_zzdh,
-                  rtrim(b.BOM_物料名称) as BOM_物料名称,rtrim(c.yj_tlgg) as yj_tlgg,rtrim(b.BOM_投料单位) as BOM_投料单位,
-                  a.订单数量,c.yj_平张投料, b.BOM_实际用量,d.st_sl as 实际投料,a.投料确认,d.Uniqid as UniqId";
-        $data =db('工单_基本资料')->alias('a')
-            ->join('工单_印件资料 c','a.Gd_gdbh = c.Yj_Gdbh ','left')
-            ->join('工单_bom资料 b','c.Yj_Gdbh = b.BOM_工单编号 AND c.yj_zzdh = b.BOM_物料编码','left')
-            ->join('物料_收发记录 d','a.Gd_gdbh = d.st_gdbh AND d.cpdh = c.yj_Yjdh')
-//            ->where('a.投料确认','like','%'.$search.'%')
-            ->where('a.Gd_gdbh',$params['workorder'])
-            ->where('c.yj_Yjno',$params['yjno'])
-            ->where('d.仓库编号','Y101')
-            ->field($field)
-            ->group('a.Gd_gdbh,d.Uniqid')
-            ->order('b.BOM_投料单位,a.UniqId asc')
-            ->select();
-        if (empty($data)){
-            $this->success('请求成功');
-        }
-        foreach ($data as $key=>$value){
-//            if ($value['yj_ls'] > 0){
-//                $value['实际投料'] = number_format(((int)$value['实际投料']/10000)*$value['yj_ls']*$value['yj_ks'],4);
-//            }else{
-//                $value['实际投料'] = number_format($value['实际投料']/10000,4);
-//            }
-//            $data[$key]['实际投料'] = $value['实际投料'];
-            $len = stripos($value['yj_tlgg'],'/');
-            if ($len){
-                $name = substr($value['yj_tlgg'],0,$len);
-                $len_two = stripos($value['yj_tlgg'],'（');
-                if ($len_two){
-                    $name = substr($name,0,$len_two);
-                }
-                $data[$key]['yj_tlgg'] = $name;
-            }
-            $data[$key]['rate'] = '';
-        }
-        $this->success('请求成功',$data);
-    }
-    /**
-     * 更新工单实际投料
-     * @ApiMethod POST
-     * @params int UniqId
-     * @params string number
-    */
-    public function updateOrderFeed(){
-        if (Request::instance()->isPost() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->post();
-        if (!isset($params[0]['UniqId']) || empty($params[0]['UniqId'])){
-            $this->error('参数错误');
-        }
-        $i = 0;
-        $list = \db('物料_收发记录')->where('Uniqid',$params['0']['UniqId'])->find();
-        foreach ($params as $key=>$value){
-            if (!empty($value['number'])){
-                $tl_sql = \db('物料_收发记录')
-                    ->where('Uniqid',$value['UniqId'])
-                    ->fetchSql(true)
-                    ->update(['st_sl'=>$value['number']]);
-                $tlRes = Db::query($tl_sql);
-                if (!$tlRes){
-                    $i++;
-                }
-            }
-        }
-        $total_num = \db('物料_收发记录')
-            ->alias('a')
-            ->field('SUM(a.st_sl) as 投料数量,b.yj_ls,b.yj_ks')
-            ->join('工单_印件资料 b','a.st_gdbh = b.Yj_Gdbh AND a.cpdh = b.yj_yjdh')
-            ->where('a.st_gdbh',$list['st_gdbh'])
-            ->where('a.cpdh',$list['cpdh'])
-            ->where('a.仓库编号','Y101')
-            ->find();
-        $number = $total_num['投料数量']/10000*$total_num['yj_ls']*$total_num['yj_ks'];
-        $res_sql = db('工单_基本资料')->where('Gd_gdbh',$list['st_gdbh'])->where('Gd_cpdh',$list['cpdh'])->fetchSql(true)->setField('实际投料',$number);
-        $res = Db::query($res_sql);
-        $data['yj_实际投料'] = $number;
-        $yj_sql =db('工单_印件资料')->where('Yj_Gdbh',$list['st_gdbh'])->where('yj_Yjdh',$list['cpdh'])->fetchSql(true)->update($data);
-        $yjRes = Db::query($yj_sql);
-//        if ((int)$list['yj_ls'] !== 0 && (int)$list['yj_ks'] !== 0){
-//            $tl_num = number_format(((float)$value['number']*10000)/((int)$list['yj_ks']*(int)$list['yj_ls']),4);
-//        }else{
-//            $tl_num = (float)$value['number']*10000;
-//        }
-//        $tl_num = (float)str_replace(',', '', $tl_num);
-        if ($i != 0){
-            $this->success('更新成功');
-        }else{
-            $this->error('更新失败');
+        //只保留考核为“是”的数据
+        $list = array_filter($list, function ($item) {
+            return $item['考核'] === '是';
+        });
+        // 重新整理数组索引（重0开始）
+        $list = array_values($list);
+
+        if (!empty($list)) {
+            $this->success('成功', $list);
+        } else {
+            $this->error('未找到数据');
         }
     }
-    /**
-     * 工单工序产量统计
-     * @ApiMethod GET
-     * @params string order
-    */
-    public function getOrderProcessCount(){
-        if (Request::instance()->isGet() == false) {
-            $this->error('非法请求');
-        }
-        $params = Request::instance()->request();
-        if (empty($params['order']) || empty($params['order'])) {
-            $this->error('参数错误');
-        }
-        if (empty($params['yjno']) || empty($params['yjno'])) {
-            $this->error('参数错误');
-        }
-        $order = $params['order'];
-        $yjno = $params['yjno'];
-        $sql = "SELECT a.Gy0_yjno,a.Gy0_gxh,rtrim(a.Gy0_gxmc) as Gy0_gxmc,rtrim(a.Add_gxmc) as Add_gxmc,a.Gy0_计划接货数, a.Gy0_ls,a.Gy0_sbbh,a.PD_WG,SUM(b.sczl_cl) as sczl_cl,
-                SUM(b.sczl_zcfp) as sczl_zcfp,SUM(b.sczl_来料少数) as 来料异常,COUNT(DISTINCT b.sczl_num) as process_num,b.sczl_Pgcl,SUM(c.sczl_cl) as cl,b.sczl_rq
-                FROM `工单_工艺资料` a
-                LEFT JOIN `设备_产量计酬` b ON a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh
-                LEFT JOIN db_sczl c ON a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh
-                WHERE a.Gy0_gdbh = '{$order}' and a.GY0_Yjno = '{$yjno}' GROUP BY a.Gy0_yjno, a.Gy0_gxh ORDER BY a.Gy0_yjno, a.Gy0_gxh";
-        $data = Db::query($sql);
 
-        //手检数据
-        $handData =db('db_手工检验')->where('sczl_gdbh',$order)->field('sum(sczl_cl) as cl,rtrim(sczl_yjgx) as sczl_gxh')->select();
-        //包装及成品防护数据
-        $sql = "SELECT sczl_gdbh1,sczl_gdbh2,sczl_gdbh3,sczl_gdbh4,sczl_gdbh5,sczl_gdbh6,rtrim(sczl_gxmc1) as sczl_gxmc1,rtrim(sczl_gxmc2) as sczl_gxmc2,
-                rtrim(sczl_gxmc3) as sczl_gxmc3,rtrim(sczl_gxmc4) as sczl_gxmc4,rtrim(sczl_gxmc5) as sczl_gxmc5,rtrim(sczl_gxmc6) as sczl_gxmc6,
-                sczl_cl1,sczl_cl2,sczl_cl3,sczl_cl4,sczl_cl5,sczl_cl6,sczl_PgCl1,sczl_PgCl2,sczl_PgCl3,sczl_PgCl4,sczl_PgCl5,sczl_PgCl6
-                FROM `db_包装计件` WHERE `sczl_gdbh1` LIKE '%{$order}%' OR `sczl_gdbh2` LIKE '%{$order}%' 
-                OR `sczl_gdbh3` LIKE '%{$order}%' OR `sczl_gdbh4` LIKE '%{$order}%' OR `sczl_gdbh5` LIKE '%{$order}%' OR `sczl_gdbh6` LIKE '%{$order}%'";
-        $package = Db::query($sql);
-        $list = [];
-        $j = 0;
-        foreach ($package as $value){
-            for ($i = 1; $i <= 6; $i++) {
-                $gdbhlKey = "sczl_gdbh" . $i;
-                $gxmcKey = "sczl_gxmc" . $i;
-                $clKey = "sczl_cl" . $i;
-                $pgclKey = "sczl_PgCl" . $i;
-                if ($value[$gdbhlKey] == '2311743' && $value[$clKey] > 0) {
-                    $list[$j]['sczl_gdbh'] = $value[$gdbhlKey];
-                    $list[$j]['sczl_gxmc'] =  $value[$gxmcKey];
-                    $list[$j]['sczl_cl'] =  $value[$clKey];
-                    $list[$j]['sczl_PgCl'] =  $value[$pgclKey];
-                    $j++;
-                }
-            }
-        }
-        // 创建一个关联数组，用于存储相同 sczl_gxmc 的值和对应的乘积之和
-        $sumArray = [];
-        foreach ($list as $item) {
-            $key = $item['sczl_gxmc'];
-            $cl = floatval($item['sczl_cl']);
-            $pgCl = intval($item['sczl_PgCl']);
-            $product = $cl * $pgCl;
-            if (!isset($sumArray[$key])) {
-                $sumArray[$key] = 0;
-            }
-            $sumArray[$key] += $product;
-        }
-        $handGxh = substr($handData[0]['sczl_gxh'],-2);
-        foreach ($data as $key=>$item){
-            $data[$key]['折算车头产量'] = $item['Gy0_计划接货数'];
-            $data[$key]['Gy0_计划接货数'] = $item['Gy0_计划接货数']*$item['Gy0_ls'];
-            $data[$key]['制程废品率'] = '';
-            if ($item['sczl_zcfp'] > 0){
-                $data[$key]['制程废品率'] = number_format($item['sczl_zcfp']/$item['sczl_cl']*100,4).'%';
-            }
-            if ($item['cl'] > 0){
-                $data[$key]['sczl_cl'] = $item['cl'];
-            }
-            if ($item['sczl_Pgcl'] > 0){
-                $data[$key]['sczl_cl'] = $item['sczl_cl'] * $item['sczl_Pgcl'];
-            }
-            if ($item['Gy0_gxh'] == (int)$handGxh){
-                $data[$key]['sczl_cl'] = $handData[0]['cl'];
-            }
-            foreach ($sumArray as $k=>$v){
-                if ($item['Gy0_gxmc'] == $k){
-                    $data[$key]['sczl_cl'] = $v;
-                }
-            }
-            if (substr($item['PD_WG'],0,4) == '1900'){
-                $data[$key]['PD_WG'] = '计划';
-            }else{
-                $data[$key]['PD_WG'] = '完工';
-            }
+    // 计算合格率
+    private function calculateRate($actual, $loss)
+    {
+        if ($actual == 0) {
+            return '0.00%'; // 防止除以零
         }
-        $this->success('请求成功',$data);
+        $rate = ($actual - $loss) / $actual * 100;
+        return number_format($rate, 2) . '%';
     }
 
 
     /**
-     * 月份员工超节损数据汇总
-     * @return void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * AI 超节损分析（月度）
      */
-    public function EmployeeDataCollect()
-    {
-        if ($this->request->isPost() === false){
-            $this->error('请求错误');
-        }
-        $params = $this->request->post();
-        if (empty($params)){
-            $this->error('参数错误');
-        }
-        $date = $params['date'];
-        $workOrderData = \db('成品入仓')
-//            ->where('jjcp_gdbh','Y2406020')
-//            ->where('jjcp_yjno','4')
-            ->where('jjcp_sj','like',$date.'%')
-            ->group('jjcp_gdbh,jjcp_yjno')
-            ->order('UniqId desc')
-            ->select();
-        $datanumber = [
-            '印刷车间' => [
-                'A班'=>[],
-                'B班'=>[]
-            ],
-            '印后车间' => [
-                'A班'=>[],
-                'B班'=>[]
-            ]
-        ];
-        foreach ($workOrderData as $key=>$value){
-            $field = 'a.Gd_gdbh,rtrim(a.成品代号) as 成品代号,rtrim(a.成品名称) as 成品名称,rtrim(a.销售订单号) as 销售订单号,a.订单数量,c.yj_ls as ls,c.yj_ks as ks,SUM(b.st_sl) as 投料';
-            $data[$key] =db('工单_基本资料')
-                ->alias('a')
-                ->join('物料_收发记录 b','a.Gd_gdbh = b.st_gdbh AND a.Gd_cpdh = b.cpdh')
-                ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh AND c.yj_Yjdh = a.Gd_cpdh')
-                ->where('a.Gd_Gdbh',$value['jjcp_gdbh'])
-                ->where('c.yj_Yjno',$value['jjcp_yjno'])
-                ->where('b.仓库编号','Y101')
-                ->field($field)
-                ->find();
-            if ($data[$key]['ls'] == 0){
-                $data[$key]['ls'] === 1;
-            }
-            if ($data[$key]['ks'] == 0){
-                $data[$key]['ks'] === 1;
-            }
-            $data[$key]['实际投料'] = number_format($data[$key]['投料']*$data[$key]['ls']*$data[$key]['ks']/10000,4);
-            $data[$key]['warehousing_num'] = $value['jjcp_sl'];
-            $data[$key]['warehousing_date'] = substr($value['jjcp_sj'],0,10);
-            //查出进入超节损的工序，有上报产量的工序就进入超节损
-            $gxh_sql = "SELECT sczl_gxh FROM
-                        (SELECT sczl_gxh FROM 设备_产量计酬 WHERE sczl_gdbh = '{$value['jjcp_gdbh']}' AND sczl_yjno = '{$value['jjcp_yjno']}'
-                        UNION SELECT sczl_gxh FROM db_sczl WHERE sczl_gdbh = '{$value['jjcp_gdbh']}' AND sczl_yjno = '{$value['jjcp_yjno']}' AND sczl_gxmc like '%拆片%') AS combined_result";
-            $gxh_arr = Db::query($gxh_sql);
-            $gxh_values = array_column($gxh_arr, 'sczl_gxh');
-            foreach ($gxh_values as $k=>$v){
-                if ((int)$v < 10){
-                    $gxh_values[$k] = '0'.$v;
-                }
-            }
+//    public function oversizedloss() {
+//        $params = $this->request->param();
+//        $service = new ImageService();
+//        $service->chaojiesun_handleImage($params);
+//        $this->success('任务成功提交至队列');
+//    }
 
-            $arr = [];
-            $plan_loss = [];//工单计划损耗
-            $target_rate =  (1-array_sum($arr))*100;
-            $data['target_rate'] =$target_rate.'%'; //目标合格率
-            if ($data[$key]['实际投料'] == 0){
-                continue;
-            }
-            $real_rate = $value['jjcp_sl'] / ($data[$key]['实际投料'] * 10000) *100;
-            $data['real_rate'] = number_format($real_rate,2) . '%';//实际合格率
-            //制程废品
-            $zzfp_data =db('设备_产量计酬')->where('sczl_gdbh',$value['jjcp_gdbh'])->where('sczl_yjno',$value['jjcp_yjno'])->field('SUM(sczl_zcfp) as sczl_zcfp')->select();
-            //联数
-            $ls =db('工单_工艺资料')->where('Gy0_gdbh',$value['jjcp_gdbh'])->field('Gy0_ls,Gy0_ks')->find();
-            //制程废品*ls
-            $data[$key]['zcfp'] = $zzfp_data[0]['sczl_zcfp'] * $ls['Gy0_ls'] * $ls['Gy0_ks'];
-            //废品数量
-            $wasteTotal = db('db_qczl')->where('qczl_gdbh',$value['jjcp_gdbh'])->where('qczl_yjno',$value['jjcp_yjno'])->sum('qczl_fp');
-            if (empty($wasteTotal)){
-                $wasteTotal = 0;
-            }
-            //废品合计
-            $waste_total = $data[$key]['zcfp'] + $wasteTotal;
-            //工单无形损
-            $data[$key]['intangible_loss'] = (int)($data[$key]['实际投料'] *10000 - $value['jjcp_sl'] - $waste_total);
-            $out_sql = "SELECT fp_sl1,fp_sl2,fp_sl3,fp_sl4,fp_sl5,fp_sl6,fp_sl7,fp_sl8,fp_sl9,fp_sl10,fp_sl11,fp_sl12,fp_sl13,
-                        fp_lb1,fp_lb2,fp_lb3,fp_lb4,fp_lb5,fp_lb6,fp_lb7,fp_lb8,fp_lb9,fp_lb10,fp_lb11,fp_lb12,fp_lb13, 
-                        fp_bh1,fp_bh2,fp_bh3,fp_bh4,fp_bh5,fp_bh6,fp_bh7,fp_bh8,fp_bh9,fp_bh10,fp_bh11,fp_bh12,fp_bh13,
-                        fp_gxmc1,fp_gxmc2,fp_gxmc3,fp_gxmc4,fp_gxmc5,fp_gxmc6,fp_gxmc7,fp_gxmc8,fp_gxmc9,fp_gxmc10,fp_gxmc11,fp_gxmc12,fp_gxmc13,UniqId
-                        FROM db_qczl WHERE qczl_gdbh = '{$value['jjcp_gdbh']}' AND qczl_yjno = '{$value['jjcp_yjno']}'";
-            $waste_out = Db::query($out_sql);
-            $list = []; //外发废数组
-            $quality = [];//质检废数组
-            $material = [];//材料废数组
-            $change = [];//零头处理数组
-            $j = 0;
-            $m = 0;
-            $n = 0;
-            $l = 0;
-            foreach ($waste_out as $entry) {
-                for ($i = 1; $i <= 13; $i++) {
-                    $labelKey = "fp_lb" . $i;
-                    $bhKey = "fp_bh" . $i;
-                    $gxmcKey = "fp_gxmc" . $i;
-                    $slKey = "fp_sl" . $i;
-                    if (!empty($entry[$labelKey])) {
-                        if (substr($entry[$labelKey],0,3) == 'M04'){
-                            $list[$j]= $entry[$slKey];
-                            $j++;
-                        }
-                        if (substr($entry[$labelKey],0,1) == 'L' ){
-                            $material[$n]= $entry[$slKey];
-                            $n++;
-                        }
-                        if (substr($entry[$labelKey],0,3) == 'M01' ){
-                            $change[$l]= $entry[$slKey];
-                            $l++;
-                        }
-                    }
-                    $quality[$m]= $entry[$slKey];
-                    $m++;
-                }
-            }
-            $data['材料废'] = array_sum($material); //材料废
-            $data['零头处理'] = array_sum($change); //零头处理
-            $data['外发废'] = array_sum($list);//外发废
-            $data['工单质检废'] =  array_sum($quality);//质检废
-//        $data['分摊废'] = '';//分摊废
-            $plan_total =db('工单_工艺资料')->where(['Gy0_gdbh' => $value['jjcp_gdbh'],'Gy0_yjno' => $value['jjcp_yjno'], 'Gy0_gxh' => ['in', $gxh_values]])->value('SUM(Gy0_计划损耗 * Gy0_ls * Gy0_ks)');
-            //单据列表最后统计
-            $total = [];
-            $total['plan_loss'] = 0;
-            $total['total_fp'] = 0;
-            $total['waste_quality'] = 0;
-            $total['waste_intangible'] = 0;
-            $total['reward'] = 0; //超节损奖励数组
-            $total_cl_data = \db('工单_工艺资料')->alias('a')
-                ->field(['a.Gy0_yjno', 'a.Gy0_gxh','a.Gy0_ls', 'SUM(b.sczl_cl) as total_cl', 'SUM(c.sczl_cl) as cl'])
-                ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-                ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-                ->where([
-                    'a.Gy0_gdbh' => $value['jjcp_gdbh'],
-                    'a.Gy0_yjno' => $value['jjcp_yjno'],
-                    'a.Gy0_gxh' => ['IN', $gxh_values],
-                    'b.sczl_cl|c.sczl_cl' => ['>', 0],
-                ])
-                ->group('a.Gy0_gxh')
-                ->order('a.Gy0_gxh')
-                ->select();
 
-            //按班组分的产量数据
-            $gy_data =db('工单_工艺资料')
-                ->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',
-                    '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',
-                    'b.sczl_bzdh','b.sczl_rate1','b.sczl_rate2','b.sczl_rate3','b.sczl_rate4','b.sczl_rate5',
-                    'b.sczl_rate6','b.sczl_rate7','b.sczl_rate8','b.sczl_rate9','b.sczl_rate10',
-                    'rtrim(c.sczl_gxmc) as gxmc', 'SUM(c.sczl_cl) as cl', 'SUM(c.sczl_fp) as fp', 'c.sczl_bh1 as sczl_bh','d.使用部门 as 使用部门','c.sczl_bzdh as bzdh'
-                ])
-                ->join('设备_产量计酬 b', 'a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_yjno = b.sczl_yjno AND a.Gy0_gxh = b.sczl_gxh','left')
-                ->join('db_sczl c', 'a.Gy0_gdbh = c.sczl_gdbh AND a.Gy0_yjno = c.sczl_yjno AND a.Gy0_gxh = c.sczl_gxh','left')
-                ->join('设备_基本资料 d','d.设备编号 = b.sczl_jtbh','left')
-                ->where([
-                    'a.Gy0_gdbh' => $value['jjcp_gdbh'],
-                    'a.Gy0_yjno' => $value['jjcp_yjno'],
-                    'a.Gy0_gxh' => ['in', $gxh_values],
-                    'b.sczl_cl|c.sczl_cl' => ['>', 0],
-                ])
-                ->group('b.sczl_gxh, 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();
-            foreach ($gy_data as $kk=>$vv){
-                $gy_data[$kk]['Gy0_yjno'] = $vv['Gy0_yjno'] > 10 ? $vv['Gy0_yjno'] : '0'.$vv['Gy0_yjno'];
-                //每道工序的产量（按班组分）
-                $gy_data[$kk]['total_cl'] = $vv['total_cl'] * $vv['Gy0_ls'];
-                if (empty($vv['total_cl'])){
-                    $gy_data[$kk]['total_cl'] = $vv['cl'] * $vv['Gy0_ls'];
-                }
-                $vv['Gy0_计划损耗'] = $vv['Gy0_计划损耗']*$vv['Gy0_ls']*$vv['Gy0_ks'];
-                //计算每道工序的计划损耗
-                foreach ($total_cl_data as $k=>$v){
-                    //每道工序的总产量
-                    $cl = $v['total_cl'] * $v['Gy0_ls'];
-                    if (empty($cl)){
-                        $cl = $v['cl'] * $v['Gy0_ls'];
-                    }
-                    if ($vv['Gy0_yjno'] == $v['Gy0_yjno'] && $vv['Gy0_gxh'] == $v['Gy0_gxh']){
-                        $gy_data[$kk]['计划损耗'] = round($gy_data[$kk]['total_cl'] / $cl  * $vv['Gy0_计划损耗']);
-                    }
-                }
-                //每道工序的制程废品（按班组分）
-                $gy_data[$kk]['sczl_zcfp'] = $vv['sczl_zcfp'] * $vv['Gy0_ls'];
-                if (empty($vv['sczl_zcfp'])){
-                    $gy_data[$kk]['sczl_zcfp'] = $vv['fp'] * $vv['Gy0_ls'];
-                }
-                //计算每道工序的质检废(按班组)
-                $gy_data[$kk]['sczl_gxmc'] = $vv['sczl_gxmc'];
-                if (empty($vv['sczl_gxmc'])){
-                    $gy_data[$kk]['sczl_gxmc'] = $vv['gxmc'];
-                }
-                if (empty($vv['sczl_bh1']) || is_null($vv['sczl_bh1'])){
-                    $vv['sczl_bh1'] = $vv['sczl_bh'];
-                }
-                $gy_data[$kk]['sczl_bh1'] = $vv['sczl_bh1'];
-                $gy_data[$kk]['质检废'] = 0;
-                foreach ($waste_out as $entry) {
-                    for ($i = 1; $i <= 13; $i++) {
-                        $gxmcKey = "fp_gxmc" . $i;
-                        $slKey = "fp_sl" . $i;
-                        $bhKey = "fp_bh" . $i;
-                        if ((int)substr($entry[$gxmcKey],0,2) == $vv['Gy0_gxh'] && $entry[$bhKey] == $vv['sczl_bh1']){
-                            $gy_data[$kk]['质检废'] += $entry[$slKey];
-                        }
-                    }
-                }
-                //无形损分摊
-                if ($plan_total >0){
-                    $gy_data[$kk]['无形损分摊'] = round($gy_data[$kk]['计划损耗'] / $plan_total * $data[$key]['intangible_loss']);
-                }else{
-                    $gy_data[$kk]['无形损分摊'] = 0;
-                }
-                //班组成员
-                $nameArr = [];
-                for ($j = 1; $j <= 10; $j++) {
-                    $bhKey = "sczl_bh" . $j;
-                    if (!empty($vv[$bhKey])){
-                        $name = \db('人事_基本资料')->where('员工编号',$vv[$bhKey])->value('rtrim(员工姓名)');
-                        array_push($nameArr,$name);
-                    }
-                }
-                $gy_data[$kk]['member'] = implode(' ',$nameArr);
-                unset($gy_data[$kk]['Gy0_计划损耗']);
-                unset($gy_data[$kk]['gxmc']);
-                unset($gy_data[$kk]['cl']);
-                unset($gy_data[$kk]['fp']);
-                unset($gy_data[$kk]['sczl_bh']);
-
-            }
-            $i = 0;
-            foreach ($gy_data as $n => $item) {
-                //节损数量
-                if ($item['无形损分摊'] > 0){
-                    $total_waste = $item['质检废']  +  $item['sczl_zcfp'] + $item['无形损分摊'];
-                }else{
-                    $total_waste = $item['质检废']  +  $item['sczl_zcfp'];
-                }
-                $gy_data[$i]['节损数量'] = $item['计划损耗'] - $total_waste;
-                //节损奖
-                if (strpos($data[$key]['成品名称'],'小盒')){
-                    $moneyRate = 0.02;
-                }else{
-                    $moneyRate = 0.09;
-                }
-                if (strpos($item['sczl_gxmc'],'机检') !== false){
-                    $gy_data[$i]['节损奖'] = 0;
-                }else{
-                    $gy_data[$i]['节损奖'] = number_format($gy_data[$i]['节损数量'] *  $item['超节损承担比例'] * $moneyRate,4);
-                }
-                $gy_data[$i]['超节损承担比例'] = number_format($item['超节损承担比例'],4) * 100 .'%';
-
-                $total['plan_loss'] += $item['计划损耗'];
-                $total['total_fp'] += $item['sczl_zcfp'];
-                $total['waste_quality'] += $item['质检废'];
-                $total['waste_intangible'] += $item['无形损分摊'];
-                $total['reward'] += floatval(str_replace(',', '', $gy_data[$i]['节损奖']));
-                $i++;
-                if (strpos($gy_data[$n]['使用部门'],'印刷') !== false && strpos($gy_data[$n]['sczl_gxmc'],'拆片') === false){
-                    if (strpos($gy_data[$n]['sczl_bzdh'],'A') !== false){
-                        array_push($datanumber['印刷车间']['A班'],$gy_data[$n]);
-                    }else{
-                        array_push($datanumber['印刷车间']['B班'],$gy_data[$n]);
-                    }
-                }elseif(strpos($gy_data[$n]['sczl_gxmc'],'拆片') === false){
-                    if (strpos($gy_data[$n]['sczl_bzdh'],'A') !== false ){
-                        array_push($datanumber['印后车间']['A班'],$gy_data[$n]);
-                    }else{
-                        array_push($datanumber['印后车间']['B班'],$gy_data[$n]);
-                    }
-                }else{
-                    if (strpos($gy_data[$n]['bzdh'],'A') !== false ){
-                        array_push($datanumber['印后车间']['A班'],$gy_data[$n]);
-                    }else{
-                        array_push($datanumber['印后车间']['B班'],$gy_data[$n]);
-                    }
-                }
-            }
-        }
-        $res = [
-            '印刷车间' => [
-                'A班'=>[],
-                'B班'=>[]
-            ],
-            '印后车间' => [
-                'A班'=>[],
-                'B班'=>[]
-            ]
-        ];
-        //按人分配超节损数据
-        foreach ($datanumber as $key => $value){
-            foreach ($value as $n=>$m){
-                foreach ($m as $k=>$v){
-                    if (strpos($v['sczl_gxmc'],'拆片') === false){
-                        $gdbh = '';
-                        for ($i = 1;$i <=10;$i++){
-                            $bh = $v['sczl_bh'.$i];
-                            $rate = $v['sczl_rate'.$i];
-                            $name = explode(' ',$v['member']);
-                            $gdbh = $v['Gy0_gdbh'].','.$gdbh;
-                            if ($bh !== ''){
-                                $name_key = $bh.'('.$name[$i-1].')';
-                                if (!array_key_exists($name_key,$res[$key][$n])){
-                                    $res[$key][$n][$name_key]['money'] = 0;
-                                }
-                                $res[$key][$n][$name_key]['money'] = floatval($res[$key][$n][$name_key]) + floatval($v['节损奖'])*floatval($rate);
-                                $res[$key][$n][$name_key]['money'] = number_format($res[$key][$n][$name_key]['money'],2);
-                                $res[$key][$n][$name_key]['gdbh'] = $gdbh;
-                            }
-                        }
-                    }else{
-                        $name_key = $v['sczl_bh1'].'('.$v['member'].')';
-                        if (!array_key_exists($name_key,$res[$key][$n])){
-                            $res[$key][$n][$name_key] = 0;
-                        }
-                        $res[$key][$n][$name_key] = $res[$key][$n][$name_key] + $v['节损奖'];
-                        $res[$key][$n][$name_key] = number_format($res[$key][$n][$name_key],2);
-                    }
-                }
-            }
-        }
-        $res['日期'] = $params['date'];
-        $res['yinshuaA'] = floatval(number_format(array_sum($res['印刷车间']['A班']),2));
-        $res['yinshuaB'] = floatval(number_format(array_sum($res['印刷车间']['B班']),2));
-        $res['yinhouA'] = floatval(number_format(array_sum($res['印后车间']['A班']),2));
-        $res['yinhouB'] = floatval(number_format(array_sum($res['印后车间']['B班']),2));
-        $this->success('成功',$res);
-    }
+//    public function oversizedloss() {
+//        // 读取原始 POST JSON body
+//        $raw = $this->request->getInput();
+//        $params = json_decode($raw, true);
+//
+//        if (empty($params['content'])) {
+//            return json(['code' => 1, 'msg' => 'content 不能为空']);
+//        }
+//
+//        // 取出 content
+////        $promptData = $params['content']['content'];
+//        $promptData = $params['content'];
+//
+//        // 统一处理为字符串
+//        if (is_array($promptData)) {
+//            // 如果是二维数组（多个工单）
+//            if (isset($promptData[0]) && is_array($promptData[0])) {
+//                $lines = array_map(function($row) {
+//                    return implode(', ', array_map(
+//                        fn($k, $v) => "$k: $v",
+//                        array_keys($row),
+//                        array_values($row)
+//                    ));
+//                }, $promptData);
+//                $promptContent = implode("\n", $lines);
+//            }
+//            // 如果是一维数组（单个工单）
+//            else {
+//                $promptContent = implode(', ', array_map(
+//                    fn($k, $v) => "$k: $v",
+//                    array_keys($promptData),
+//                    array_values($promptData)
+//                ));
+//            }
+//        } else {
+//            // 已经是字符串，无需处理
+//            $promptContent = $promptData;
+//        }
+//
+//        // 查询模板内容
+//        $db3 = \db()->connect(config('database.db3'));
+//        $list = $db3->name('workorder_template')->where("id",1)->find();
+//
+//        $prompt = $list['content'] . "\n" . $promptContent;
+//
+//        // 调用 AI
+//        $ai = new AIGatewayService();
+//        $gptRes = $ai->chaojiesunGptApi($prompt);
+//
+//        $gptText = trim($gptRes['choices'][0]['message']['content'] ?? '');
+//
+//        return json(['code' => 0, 'data' => $gptText]);
+//    }
 }
 
 

application/api/controller/WorkOrder.php

@@ -33,7 +33,9 @@ class WorkOrder extends Api
     public function imgtowimg()
     {
         $prompt = $this->request->param('prompt', ''); // 用户传入的提示词
-        $imgRelPath = 'uploads/operate/ai/Preview/arr/0828004096727.png';
+//        $imgRelPath = 'uploads/operate/ai/Preview/arr/0828004096727.png';
+//        $imgRelPath = 'uploads/operate/ai/Preview/arr/1751019283787.jpg';
+        $imgRelPath = 'uploads/operate/ai/Preview/arr/圣诞主题复古油画圣诞老人和孩子们乘坐红色雪橇在雪地中滑行充满.png';
         $imgPath = ROOT_PATH . 'public/' . $imgRelPath;
 
         // 校验原图是否存在
@@ -41,43 +43,43 @@ class WorkOrder extends Api
             return json(['code' => 1, 'msg' => '原图不存在：' . $imgRelPath]);
         }
 
-        // -------- 固定参数定义 -------- //
-        $denoising = 0.6;                            // 重绘幅度（图像改动程度，0 = 很小变化，1 = 几乎全新图像）
-        $steps = 20;                                 // 迭代步数（采样次数，值越大越精细）
-        $cfgScale = 7;                               // 提示词引导系数（越高越贴近提示词）
-        $clipSkip = 7;                               // 跳过 CLIP 编码器层数（影响风格细节）
-        $sampler = 'DPM++ 2M SDE Heun';              // 使用的采样器算法
-        $modelName = 'realisticVisionV51_v51VAE-inpainting.safetensors [f0d4872d24]'; // 使用的 SD 模型
-        $vaeName = 'anything-v4.5.vae.pt';           // 外挂 VAE（色彩、对比度增强）
-        $seed = 611075477;                           // 固定随机种子（可复现）
-        $targetW = 1024;                             // 输出图像宽度
-        $targetH = 2048;                             // 输出图像高度
-
-        // -------- 图像编码为 base64 -------- //
+        // -------- 参数调整 -------- //
+        $denoising = 0.2;                           // 降低重绘幅度
+        $steps = 10;                                // 减少迭代步数
+        $cfgScale = 7;
+        $clipSkip = 7;
+        $sampler = 'DPM++ 2M SDE Heun';
+        $modelName = 'realisticVisionV51_v51VAE-inpainting.safetensors [f0d4872d24]';
+        $vaeName = 'anything-v4.5.vae.pt';
+        $seed = 611075477;
+        $targetW = 679;                             // 目标宽度
+        $targetH = 862;                             // 目标高度
+
+        // -------- 图像编码 -------- //
         $imgData = file_get_contents($imgPath);
         $base64Img = base64_encode($imgData);
         $initImage = 'data:image/png;base64,' . $base64Img;
 
-        // -------- 构建 POST 请求体 -------- //
+        // -------- 请求体构建 -------- //
         $postData = json_encode([
-            'prompt' => $prompt,                     // 提示词
-            'steps' => $steps,                       // 迭代步数
-            'cfg_scale' => $cfgScale,                // 提示词引导强度
-            'denoising_strength' => $denoising,      // 重绘幅度
-            'width' => $targetW,                     // 输出图像宽度
-            'height' => $targetH,                    // 输出图像高度
-            'resize_mode' => 2,                      // 缩放模式：2 = 缩放后填充空白
-            'sampler_name' => $sampler,              // 采样算法
-            'seed' => $seed,                         // 随机种子
-            'inpaint_full_res' => true,              // 使用原始分辨率处理 inpaint
-            'inpainting_fill' => 1,                  // 背景填充模式：1 = 灰色
-            'init_images' => [$initImage],           // 输入图像（base64）
-            'override_settings' => [                 // 覆盖默认模型设置
-                'sd_model_checkpoint' => $modelName, // 使用的模型
-                'sd_vae' => $vaeName,                // 外挂 VAE 文件
-                'CLIP_stop_at_last_layers' => $clipSkip // clip 跳过层
+            'prompt' => $prompt,
+            'steps' => $steps,
+            'cfg_scale' => $cfgScale,
+            'denoising_strength' => $denoising,
+            'width' => $targetW,
+            'height' => $targetH,
+            'resize_mode' => 0,
+            'sampler_name' => $sampler,
+            'seed' => $seed,
+            'inpaint_full_res' => true,            // 关闭高分辨率重绘
+            'inpainting_fill' => 1,
+            'init_images' => [$initImage],
+            'override_settings' => [
+                'sd_model_checkpoint' => $modelName,
+                'sd_vae' => $vaeName,
+                'CLIP_stop_at_last_layers' => $clipSkip
             ],
-            'override_settings_restore_afterwards' => true // 调用后恢复模型设置
+            'override_settings_restore_afterwards' => true
         ]);
 
         // -------- 发送请求到 SD API -------- //

application/job/ImageToImageJob.php

@@ -124,110 +124,7 @@ class ImageToImageJob{
         echo "ImageJob failed: " . json_encode($data);
     }
 
-    public function ImageToImage($fileName, $outputDirRaw, $new_image_url,$img_name, $width, $height)
-    {
-        // 统一路径分隔符
-        $rootPath = str_replace('\\', '/', ROOT_PATH);
-
-        // 输出目录，如：ROOT/public/uploads/operate/ai/dall-e/hua/
-        $outputDir = rtrim($rootPath . 'public/' . $outputDirRaw, '/') . '/';
-
-        // 当前日期目录，如：2025-06-16/
-        $dateDir = date('Y-m-d') . '/';
-
-        // 完整基本路径，如：ROOT/public/uploads/operate/ai/dall-e/hua/2025-06-16/
-        $fullBaseDir = $outputDir . $dateDir;
-
-        // 只创建 img_679x862 目录
-        $saveDir = $fullBaseDir . 'new_679x862/';
-        if (!is_dir($saveDir)) {
-            mkdir($saveDir, 0755, true);
-        }
-
-        // 从数据库中查询原图记录
-        $record = Db::name('text_to_image')
-            ->where('old_image_url', 'like', "%{$fileName}")
-            ->order('id desc')
-            ->find();
-
-        if (!$record) {
-            return json([
-                'code' => 1,
-                'msg' => '没有找到匹配的图像记录'
-            ]);
-        }
-
-        // 调用图生图 API
-        $ai = new AIGatewayService();
-        $res = $ai->imgtoimgGptApi('', $new_image_url);
-
-        // 检查返回结果
-        if (!isset($res['code']) || $res['code'] !== 0) {
-            return json([
-                'code' => 1,
-                'msg' => $res['msg'] ?? '图像生成失败'
-            ]);
-        }
-
-        // 保存图片路径
-        $img_name = mb_substr(preg_replace('/[^\x{4e00}-\x{9fa5}A-Za-z0-9_\- ]/u', '', $img_name), 0, 30);
-        $filename = $img_name . '.png';
-        $path = $saveDir . $filename;
-
-        // 解码图像 base64 数据
-        $imgData = base64_decode($res['data']['url']);
-
-        // 解析图像内容
-        try {
-            $im = \imagecreatefromstring($imgData);
-            if (!$im) {
-                file_put_contents('/tmp/corrupted.png', $imgData);
-                throw new \Exception("❌ 图像无法解析，写入 /tmp/corrupted.png");
-            }
-        } catch (\Throwable $e) {
-            file_put_contents('/tmp/corrupted.png', $imgData);
-            throw new \Exception("❌ 图像处理异常：" . $e->getMessage());
-        }
-
-        // 裁剪
-        $srcW = imagesx($im);
-        $srcH = imagesy($im);
-        $srcRatio = $srcW / $srcH;
-        $dstRatio = $width / $height;
-
-        if ($srcRatio > $dstRatio) {
-            $cropW = intval($srcH * $dstRatio);
-            $cropH = $srcH;
-            $srcX = intval(($srcW - $cropW) / 2);
-            $srcY = 0;
-        } else {
-            $cropW = $srcW;
-            $cropH = intval($srcW / $dstRatio);
-            $srcX = 0;
-            $srcY = intval(($srcH - $cropH) / 2);
-        }
-
-        $dstImg = imagecreatetruecolor($width, $height);
-        imagecopyresampled($dstImg, $im, 0, 0, $srcX, $srcY, $width, $height, $cropW, $cropH);
-
-        // 保存裁剪图
-        imagepng($dstImg, $path);
-        imagedestroy($im);
-        imagedestroy($dstImg);
-
-        // 更新数据库记录
-        Db::name('text_to_image')->where('id', $record['id'])->update([
-            'imgtoimg_url' => str_replace($rootPath . 'public/', '', $path),
-            'status_name' => '图生图',
-            'error_msg' => '',
-            'update_time' => date('Y-m-d H:i:s')
-        ]);
-
-        return '成功';
-    }
-
-
-//    public function ImageToImage($fileName, $outputDirRaw, $new_image_url, $width, $height)
+//    public function ImageToImage($fileName, $outputDirRaw, $new_image_url,$img_name, $width, $height)
 //    {
 //        // 统一路径分隔符
 //        $rootPath = str_replace('\\', '/', ROOT_PATH);
@@ -241,11 +138,10 @@ class ImageToImageJob{
 //        // 完整基本路径，如：ROOT/public/uploads/operate/ai/dall-e/hua/2025-06-16/
 //        $fullBaseDir = $outputDir . $dateDir;
 //
-//        // 创建输出目录，包括原图目录、1024x2048目录、自定义尺寸目录
-//        foreach ([$fullBaseDir, $fullBaseDir . '1024x2048/', $fullBaseDir . "{$width}x{$height}/"] as $dir) {
-//            if (!is_dir($dir)) {
-//                mkdir($dir, 0755, true);
-//            }
+//        // 只创建 img_679x862 目录
+//        $saveDir = $fullBaseDir . 'new_679x862/';
+//        if (!is_dir($saveDir)) {
+//            mkdir($saveDir, 0755, true);
 //        }
 //
 //        // 从数据库中查询原图记录
@@ -273,18 +169,55 @@ class ImageToImageJob{
 //            ]);
 //        }
 //
+//        // 保存图片路径
+//        $img_name = mb_substr(preg_replace('/[^\x{4e00}-\x{9fa5}A-Za-z0-9_\- ]/u', '', $img_name), 0, 30);
+//        $filename = $img_name . '.png';
+//        $path = $saveDir . $filename;
+//
 //        // 解码图像 base64 数据
-//        $originalBaseName = pathinfo($new_image_url, PATHINFO_FILENAME);
-//        $finalFileName = $originalBaseName . '.png';
+//        $imgData = base64_decode($res['data']['url']);
+//
+//        // 解析图像内容
+//        try {
+//            $im = \imagecreatefromstring($imgData);
+//            if (!$im) {
+//                file_put_contents('/tmp/corrupted.png', $imgData);
+//                throw new \Exception("❌ 图像无法解析，写入 /tmp/corrupted.png");
+//            }
+//        } catch (\Throwable $e) {
+//            file_put_contents('/tmp/corrupted.png', $imgData);
+//            throw new \Exception("❌ 图像处理异常：" . $e->getMessage());
+//        }
+//
+//        // 裁剪
+//        $srcW = imagesx($im);
+//        $srcH = imagesy($im);
+//        $srcRatio = $srcW / $srcH;
+//        $dstRatio = $width / $height;
+//
+//        if ($srcRatio > $dstRatio) {
+//            $cropW = intval($srcH * $dstRatio);
+//            $cropH = $srcH;
+//            $srcX = intval(($srcW - $cropW) / 2);
+//            $srcY = 0;
+//        } else {
+//            $cropW = $srcW;
+//            $cropH = intval($srcW / $dstRatio);
+//            $srcX = 0;
+//            $srcY = intval(($srcH - $cropH) / 2);
+//        }
+//
+//        $dstImg = imagecreatetruecolor($width, $height);
+//        imagecopyresampled($dstImg, $im, 0, 0, $srcX, $srcY, $width, $height, $cropW, $cropH);
 //
-//        // 保存到 1024x2048 子目录
-//        $targetDir = $fullBaseDir . '1024x2048/';
-//        $savePath = $targetDir . $finalFileName;
-//        file_put_contents($savePath, base64_decode($res['data']['url']));
+//        // 保存裁剪图
+//        imagepng($dstImg, $path);
+//        imagedestroy($im);
+//        imagedestroy($dstImg);
 //
-//        // ✅ 修正：数据库中记录相对路径一致
+//        // 更新数据库记录
 //        Db::name('text_to_image')->where('id', $record['id'])->update([
-//            'imgtoimg_url' => $outputDirRaw . '/' . $dateDir . '1024x2048/' . $finalFileName,
+//            'imgtoimg_url' => str_replace($rootPath . 'public/', '', $path),
 //            'status_name' => '图生图',
 //            'error_msg' => '',
 //            'update_time' => date('Y-m-d H:i:s')
@@ -293,4 +226,71 @@ class ImageToImageJob{
 //        return '成功';
 //    }
 
+
+    public function ImageToImage($fileName, $outputDirRaw, $new_image_url, $width, $height)
+    {
+        // 统一路径分隔符
+        $rootPath = str_replace('\\', '/', ROOT_PATH);
+
+        // 输出目录，如：ROOT/public/uploads/operate/ai/dall-e/
+        $outputDir = rtrim($rootPath . 'public/' . $outputDirRaw, '/') . '/';
+
+        // 当前日期目录，如：2025-06-16/
+        $dateDir = date('Y-m-d') . '/';
+
+        // 完整基本路径，如：ROOT/public/uploads/operate/ai/dall-e/hua/2025-06-16/
+        $fullBaseDir = $outputDir . $dateDir;
+
+        // 创建输出目录，包括原图目录、目录、自定义尺寸目录
+        foreach ([$fullBaseDir, $fullBaseDir . 'newimg_679x862/', $fullBaseDir . "{$width}x{$height}/"] as $dir) {
+            if (!is_dir($dir)) {
+                mkdir($dir, 0755, true);
+            }
+        }
+
+        // 从数据库中查询原图记录
+        $record = Db::name('text_to_image')
+            ->where('old_image_url', 'like', "%{$fileName}")
+            ->order('id desc')
+            ->find();
+
+        if (!$record) {
+            return json([
+                'code' => 1,
+                'msg' => '没有找到匹配的图像记录'
+            ]);
+        }
+
+        // 调用图生图 API
+        $ai = new AIGatewayService();
+        $res = $ai->imgtoimgGptApi('', $new_image_url);
+
+        // 检查返回结果
+        if (!isset($res['code']) || $res['code'] !== 0) {
+            return json([
+                'code' => 1,
+                'msg' => $res['msg'] ?? '图像生成失败'
+            ]);
+        }
+
+        // 解码图像 base64 数据
+        $originalBaseName = pathinfo($new_image_url, PATHINFO_FILENAME);
+        $finalFileName = $originalBaseName . '.png';
+
+        // 保存到 子目录
+        $targetDir = $fullBaseDir . 'newimg_679x862/';
+        $savePath = $targetDir . $finalFileName;
+        file_put_contents($savePath, base64_decode($res['data']['url']));
+
+        // ✅ 修正：数据库中记录相对路径一致
+        Db::name('text_to_image')->where('id', $record['id'])->update([
+            'imgtoimg_url' => $outputDirRaw . '/' . $dateDir . 'newimg_679x862/' . $finalFileName,
+            'status_name' => '图生图',
+            'error_msg' => '',
+            'update_time' => date('Y-m-d H:i:s')
+        ]);
+
+        return '成功';
+    }
+
 }

application/service/AIGatewayService.php

@@ -171,9 +171,11 @@ class AIGatewayService{
     /**
      * 图生图
      * @param string $prompt 用户输入的文本提示内容
-     * @param string $new_image_url 原图
+     * @param string $new_image_url 原图路径
+     * @param array $options 可选参数，可覆盖默认配置
+     * @return array
      */
-    public function imgtoimgGptApi($prompt, $new_image_url)
+    public function imgtoimgGptApi($prompt, $new_image_url, $options = [])
     {
         $imgPath = ROOT_PATH . 'public/' . $new_image_url;
 
@@ -181,34 +183,34 @@ class AIGatewayService{
             return ['code' => 1, 'msg' => '原图不存在：' . $new_image_url];
         }
 
-        // 原图 base64 编码
-        $imgData = file_get_contents($imgPath);
-        $base64Img = base64_encode($imgData);
-        $initImage = 'data:image/png;base64,' . $base64Img;
-
-        //请求参数
-        $postData = json_encode([
+        // 默认参数配置
+        $defaultParams = [
             'prompt' => $prompt,
-            'steps' => 20,
+            'steps' => 15,
             'cfg_scale' => 7,
-            'denoising_strength' => 0.6,
-            'width' => 1024,
-            'height' => 2048,
-//            'width' => 679,
-//            'height' => 862,
+            'denoising_strength' => 0.2,
+            'width' => 679,
+            'height' => 862,
             'resize_mode' => 2,
             'sampler_name' => 'DPM++ 2M SDE Heun',
-            'seed' => -1,
+            'seed' => 611075477, // 使用-1表示随机种子
             'inpaint_full_res' => true,
             'inpainting_fill' => 1,
-            'init_images' => [$initImage],
             'override_settings' => [
                 'sd_model_checkpoint' => 'realisticVisionV51_v51VAE-inpainting.safetensors [f0d4872d24]',
                 'sd_vae' => 'anything-v4.5.vae.pt',
                 'CLIP_stop_at_last_layers' => 7
             ],
-            'override_settings_restore_afterwards' => true // 调用后恢复模型设置
-        ]);
+            'override_settings_restore_afterwards' => true
+        ];
+
+        // 合并用户自定义选项
+        $params = array_merge($defaultParams, $options);
+
+        // 原图 base64 编码
+        $imgData = file_get_contents($imgPath);
+        $base64Img = base64_encode($imgData);
+        $params['init_images'] = ['data:image/png;base64,' . $base64Img];
 
         $apiUrl = "http://20.0.17.233:45001/sdapi/v1/img2img";
         $headers = ['Content-Type: application/json'];
@@ -218,19 +220,32 @@ class AIGatewayService{
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($params));
         curl_setopt($ch, CURLOPT_TIMEOUT, 90);
+
         $response = curl_exec($ch);
-        $error = curl_error($ch);
-        curl_close($ch);
 
-        if ($error) {
+        if (curl_errno($ch)) {
+            $error = curl_error($ch);
+            curl_close($ch);
             return ['code' => 1, 'msg' => '请求失败：' . $error];
         }
 
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+
+        if ($httpCode !== 200) {
+            return ['code' => 1, 'msg' => 'API请求失败，HTTP状态码：' . $httpCode];
+        }
+
         $data = json_decode($response, true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return ['code' => 1, 'msg' => 'API返回数据解析失败：' . json_last_error_msg()];
+        }
+
         if (!isset($data['images'][0])) {
-            return ['code' => 1, 'msg' => 'API未返回图像数据'];
+            $errorMsg = $data['error'] ?? $data['message'] ?? '未知错误';
+            return ['code' => 1, 'msg' => 'API未返回图像数据：' . $errorMsg];
         }
 
         return [