cqpCow před 2 roky
rodič
revize
955052c2d5

+ 2 - 2
app/Service/FinishedOrderService.php

@@ -236,7 +236,7 @@ class FinishedOrderService extends Service
         if($bool) return [false,'正在队列中,请不要重复操作!'];
 
         $result = DispatchSub::whereIn('id',$data['id'])
-            ->select('id','finished_num','dispatch_quantity','out_order_no_time','process_id','dispatch_no','order_product_id','sale_orders_product_id','order_no','product_no','product_title','price','customer_name')
+            ->select('id','finished_num','dispatch_quantity','out_order_no_time','process_id','dispatch_no','order_product_id','sale_orders_product_id','order_no','product_no','product_title','price','customer_name','technology_material','technology_name','wood_name')
             ->orderBy('id','desc')
             ->get()->toArray();
 
@@ -497,7 +497,7 @@ class FinishedOrderService extends Service
         }
 
         $result = DispatchSub::whereIn('id',$dispatch_id)
-            ->select('id','finished_num','dispatch_quantity','out_order_no_time','process_id','dispatch_no','order_product_id','sale_orders_product_id','order_no','product_no','product_title','price','customer_name')
+            ->select('id','finished_num','dispatch_quantity','out_order_no_time','process_id','dispatch_no','order_product_id','sale_orders_product_id','order_no','product_no','product_title','price','customer_name','technology_material','technology_name','wood_name')
             ->orderBy('id','desc')
             ->get()->toArray();
 

+ 3 - 2
app/Service/FyySqlServerService.php

@@ -321,8 +321,9 @@ class FyySqlServerService extends Service
             "cmocode"=> "",
             "imoseq"=> "",
             "cbmemo"=> "",
-            "cfree1"=> "",
-            "cfree2"=> "",
+            "cfree1"=> $data['technology_name'],
+            "cfree2"=> $data['wood_name'],
+            "cdefine28" => $data['technology_material']
         ];
         $post = [
             "password"=>"cloud@123456",