Kaynağa Gözat

Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

曹鹤洋 1 yıl önce
ebeveyn
işleme
a8755a4b59
1 değiştirilmiş dosya ile 7 ekleme ve 7 silme
  1. 7 7
      application/api/controller/WorkOrder.php

+ 7 - 7
application/api/controller/WorkOrder.php

@@ -204,20 +204,20 @@ class WorkOrder extends Api
                     '损耗率' => rtrim($value['Gy0_Rate1']),
                     '报废定额' => '',
                     '允损比例' => '',
-                    '难度系数' => rtrim($product['工价系数']),
-                    '损耗系数' => rtrim($product['损耗系数']),
+                    '难度系数' => isset($product['工价系数'])?rtrim($product['工价系数']):'',
+                    '损耗系数' => isset($product['损耗系数'])?rtrim($product['损耗系数']):'',
                     '人工检_次品板' => (int)$value['人工检_次品板']=0?'':$value['人工检_次品板'],
                     '人工检_废检' => (int)$value['人工检_废检']=0?'':$value['人工检_废检'],
                     '机检_正品板' => (int)$value['机检_正品板']=0?'':$value['机检_正品板'],
                     '机检_次品板' => (int)$value['机检_次品板']=0?'':$value['机检_次品板'],
                     '机检_废检' => (int)$value['机检_废检']=0?'':$value['机检_废检'],
                     '开数*联数' => rtrim($value['Gy0_ks']).'*'.rtrim($value['Gy0_ls']),
-                    '备注' => rtrim($value['工序备注']),
-                    '印刷方式' => rtrim($value['印刷方式']),
-                    '版距' => rtrim($value['版距']),
+                    '备注' => isset($value['工序备注'])?rtrim($value['工序备注']):'',
+                    '印刷方式' => isset($value['印刷方式'])?rtrim($value['印刷方式']):'',
+                    '版距' => isset($value['版距'])?rtrim($value['版距']):'',
                     '建档用户' => rtrim($value['Sys_id']),
-                    '建档日期' => rtrim($value['Sys_rq']),
-                    '更新时间' => rtrim($value['Mod_rq']),
+                    '建档日期' => isset($value['Sys_rq'])?rtrim($value['Sys_rq']):'',
+                    '更新时间' => isset($value['Mod_rq'])?rtrim($value['Mod_rq']):'',
                 ];
             }
         }