产品复制优化

application/api/controller/OvertimeVerification.php

@@ -219,7 +219,7 @@ class OvertimeVerification extends Api
             as 达标定额,千件工价,补产标准,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,Rate as 个人比例,
             sum(装版工时) as 装版工时,sum(保养工时) as 保养工时,sum(打样工时) as 打样工时,sum(计时补差额工资) as 计时补差')
             ->join('工单_印件资料 g','g.Yj_Gdbh = 绩效工资汇总.sczl_gdbh AND g.yj_Yjno = 绩效工资汇总.sczl_yjno','LEFT')
-            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh, "-", sczl_type),千件工价,工序难度系数,个人比例')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh,CONCAT(sczl_yjno, "-", sczl_gxh, "-", sczl_type),sczl_jtbh,千件工价,工序难度系数,个人比例')
             ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
             ->select();
         if(!$res){

application/api/controller/Product.php

@@ -329,6 +329,7 @@ class Product extends Api
         $res = db('产品_工艺资料')->where('Gy0_cpdh',$code)->distinct(true)->column('rtrim(Gy0_方案) as gy_plan');
         $data['gy'] = $res;
         $product = db('产品_基本资料')->where('产品编号',$code)->find();
+        $data['yj'] = db('产品_印件资料')->where('yj_cpdh',$code)->column('yj_yjno');
         $data['name'] = rtrim($product['产品名称']);
         $this->success('请求成功',$data);
     }
@@ -444,9 +445,9 @@ class Product extends Api
             // 事务处理
             db()->startTrans();
             try {
-                db($strategy['table'])
-                    ->where($strategy['source_field'], $params['to_code'])
-                    ->delete();
+//                db($strategy['table'])
+//                    ->where($strategy['source_field'], $params['to_code'])
+//                    ->delete();
 
                 if (!db($strategy['table'])->insertAll($processedData)) {
                     throw new \Exception("Insert failed");
@@ -1320,4 +1321,7 @@ class Product extends Api
         }
         $this->success('成功');
     }
+
+
+
 }

application/api/controller/WorkOrder.php

@@ -1909,7 +1909,9 @@ class WorkOrder extends Api
         $list[0]['gy'] = $res;
         foreach ($list as $key=>$value){
             $list[$key]['name'] = $value['产品编号'].'【'.$value['产品名称'].'】';
+            $list[$key]['yj'] = db('产品_印件资料')->where('yj_cpdh',$value['产品编号'])->column('yj_yjno');
         }
+
         $this->success('成功',$list);
     }