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

application/api/controller/WorkOrder.php

@@ -1176,9 +1176,6 @@ class WorkOrder extends Api
             $this->success('未找到工单信息');
         }
         $materiel = $this->MaterielDetailGet($param['workOrder']);
-        if (empty($materiel)){
-            $this->success('未找到物料信息');
-        }
         $printDetail = $this->PrintDetailGet($param['workOrder'],$param['yjno'],$param['gxh']);
         if (empty($printDetail)){
             $this->success('未找到工艺信息');
@@ -1264,13 +1261,12 @@ class WorkOrder extends Api
         ];
         $filed = 'rtrim(BOM_物料编码) as 物料编码,rtrim(BOM_物料名称) as 物料名称,rtrim(BOM_投料单位) as 投料单位,rtrim(BOM_计划用量) as 计划用量';
         $list = \db('工单_bom资料')->where($where)->field($filed)->select();
-        if (empty($list)){
-            $this->success('未找到物料资料信息');
-        }
-        foreach ($list as $key=>$value){
-            $list[$key]['物料代码及名称'] = $value['物料编码'].' '.$value['物料名称'];
-            $list[$key]['计划用量'] = (float)$value['计划用量'];
-            unset($list[$key]['物料编码'],$list[$key]['物料名称']);
+        if (!empty($list)){
+            foreach ($list as $key=>$value){
+                $list[$key]['物料代码及名称'] = $value['物料编码'].' '.$value['物料名称'];
+                $list[$key]['计划用量'] = (float)$value['计划用量'];
+                unset($list[$key]['物料编码'],$list[$key]['物料名称']);
+            }
         }
         return $list;
     }