liuhairui 1 year ago
parent
commit
91ec962042

+ 3 - 0
application/api/controller/OrderSuperLoss.php

@@ -833,6 +833,9 @@ class OrderSuperLoss extends Api
         if (!isset($params['order']) || empty($params['order'])) {
             $this->error('参数错误');
         }
+        if (!isset($params['Yj_Yjno']) || empty($params['Yj_Yjno'])) {
+            $this->error('参数错误');
+        }
         $data =db('工单_印件资料')
             ->where('Yj_gdbh',$params['order'])
             ->where('Yj_Yjno', $params['Yj_Yjno'])

+ 10 - 3
application/api/controller/WorkOrderVerification.php

@@ -149,7 +149,7 @@ class WorkOrderVerification extends Api
 
         $total = db()->table('db_qczl')->where($where)->count();
         $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
-        
+
         foreach ($rows as $key=>$value){
             $rows[$key]['Gd_cpmc'] = array_key_exists($value['qczl_gdbh'],$gd) ? sprintf("%02d", $value['qczl_yjno']).'-'.trim($gd[$value['qczl_gdbh']]) : '';
 
@@ -490,12 +490,19 @@ class WorkOrderVerification extends Api
         if (!isset($params['order']) || empty($params['order'])){
             $this->error('参数错误');
         }
+        if (!isset($params['yjno']) || empty($params['yjno'])){
+            $this->error('参数错误');
+        }
         $field = '
         rtrim(fp_lb1) as fp_lb1,rtrim(fp_lb2) as fp_lb2,rtrim(fp_lb3) as fp_lb3,rtrim(fp_lb4) as fp_lb4,rtrim(fp_lb5) as fp_lb5,rtrim(fp_lb6) as fp_lb6,rtrim(fp_lb7) as fp_lb7,
         rtrim(fp_lb8) as fp_lb8,rtrim(fp_lb9) as fp_lb9,rtrim(fp_lb10) as fp_lb10,rtrim(fp_lb11) as fp_lb11,rtrim(fp_lb12) as fp_lb12,rtrim(fp_lb13) as fp_lb13,
-        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_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,qczl_yjno
         ';
-        $data = db('db_qczl')->name('db_qczl')->where('qczl_gdbh',$params['order'])->field($field)->select();
+//        $data = db('db_qczl')->name('db_qczl')->where('qczl_gdbh',$params['order'])->field($field)->select();
+        $data = db('db_qczl')->name('db_qczl')
+            ->where('qczl_gdbh',$params['order'])
+            ->where('qczl_yjno', $params['yjno'])
+            ->field($field)->select();
         if (empty($data)){
             $this->error('暂无废品数据');
         }