修改

app/Service/ProductionOrderService.php

@@ -61,15 +61,17 @@ class ProductionOrderService extends Service
         try{
             DB::beginTransaction();
 
+            $time = time();
+
             //主表数据写入
-            OrdersProductMain::insert(['production_no' => $production_no,'crt_time' => time(),'crt_id' => $user['id']]);
+            OrdersProductMain::insert(['production_no' => $production_no,'crt_time' => $time,'crt_id' => $user['id']]);
 
             //生产数据的源数据
             $result = $msg[0];
             $quantity_map = $msg[1];
 
             $boom = $process = [];
-            $time = time();
+
             foreach ($result as $key => $value){
                 $result[$key]['production_no'] = $production_no;
                 $result[$key]['production_quantity'] = $quantity_map[$value['sale_orders_product_id']];
@@ -189,7 +191,7 @@ class ProductionOrderService extends Service
     public function orderRule($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据！'];
         if($this->isEmpty($data,'quantity')) return [false,'数量不能为空！'];
-        if(in_array(false, $data['quantity'], true) || in_array(0, $data['quantity'], true) || in_array('', $data['quantity'], true))return [false,'数量不能为空！'];
+        if(in_array(false, $data['quantity'], true) || in_array(0, $data['quantity'], true) || in_array('', $data['quantity'], true)) return [false,'数量不能为空！'];
 
         $map = [];
         foreach ($data['id'] as $key => $value){
@@ -284,7 +286,10 @@ class ProductionOrderService extends Service
     }
 
     public function productionExport($data){
+        if(empty($data['id']) || ! is_array($data['id'])) return [false, '请选择导出的数据'];
+
         $model = OrdersProduct::where('del_time',0)
+            ->whereIn('id',$data['id'])
             ->select('production_time', 'production_no', 'out_order_no_time','out_order_no','customer_no','customer_name','table_header_mark','product_no','product_title','product_size','product_unit','order_quantity','production_quantity','technology_material','technology_name','wood_name','process_mark','table_body_mark','out_crt_man','sale_orders_product_id')
             ->orderBy('id','desc');
 

routes/api.php

@@ -121,45 +121,44 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('scrappDel', 'Api\ScrappController@scrappDel');
     $route->any('scrappList', 'Api\ScrappController@scrappList');
 
-    //福羊羊销售订单
+    //销售订单----------------------
     $route->any('fyyAdd', 'Api\FyyOrderController@add');
-    $route->any('fyyEdit', 'Api\FyyOrderController@edit');
-    $route->any('fyyDel', 'Api\FyyOrderController@del');
     $route->any('fyyList', 'Api\FyyOrderController@orderList');
     $route->any('fyyRefreshOnHandQuantity', 'Api\FyyOrderController@fyyRefreshOnHandQuantity');
     $route->any('fyyMobileList', 'Api\FyyOrderController@orderMobileList');
+    //销售订单----------------------
 
     //获取发货单
     $route->any('getShipmentOrder', 'Api\FyyOrderController@getShipmentOrder');
 
-    //生产订单
+    //生产订单----------------------
     $route->any('productionAdd', 'Api\ProductionOrderController@add');
-    $route->any('productionEdit', 'Api\ProductionOrderController@edit');
-    $route->any('productionDel', 'Api\ProductionOrderController@del');
     $route->any('productionList', 'Api\ProductionOrderController@orderList');
     $route->any('productionExport', 'Api\ProductionOrderController@productionExport');
+    //生产订单----------------------
 
-    //派工界面
+    //(生产订单下派工)派工界面-------------------
     $route->any('dispatchAdd', 'Api\DispatchController@add');
-    $route->any('dispatchEdit', 'Api\DispatchController@edit');
-    $route->any('dispatchDel', 'Api\DispatchController@del');
     $route->any('dispatchList', 'Api\DispatchController@orderList');
+    //(生产订单下派工)派工界面-------------------
 
-    //工序派工单
+    //工序派工单列表 pc端-------
     $route->any('dispatchOrderList', 'Api\DispatchController@dispatchOrderList');
-    $route->any('dispatchOrderDel', 'Api\DispatchController@dispatchOrderDel');
+    //工序派工单列表 pc端-------
 
-    //设备上的工序去完工列表
+    //工序派工单列表 手机端-------
     $route->any('finishedOrderList', 'Api\DispatchController@dispatchMobileOrderList');
+    //工序派工单列表 手机端-------
+
+    //手机端 工序完工-----------
     $route->any('finishedOrderDetailsList', 'Api\DispatchController@dispatchMobileOrderDetailsList');
     $route->any('mobileFinishedOrderAdd', 'Api\FinishedOrderController@mobileAdd');
+    //手机端 工序完工-----------
 
-    //工序完工(暂时没用)
+    //pc端 工序完工------------
     $route->any('finishedOrderAdd', 'Api\FinishedOrderController@add');
-    $route->any('finishedOrderEdit', 'Api\FinishedOrderController@edit');
     $route->any('finishedOrderDetail', 'Api\FinishedOrderController@orderDetail');
-//    $route->any('finishedOrderDel', 'Api\FinishedOrderController@del');
-//    $route->any('finishedOrderList', 'Api\FinishedOrderController@orderList');
+    //pc端 工序完工------------
 
     //删除单据统一入口
     $route->any('delOrders','Api\DeleteOrderController@del');