1

app/Service/InvoiceOrderService.php

@@ -30,14 +30,16 @@ class InvoiceOrderService extends Service
             DB::beginTransaction();
             $material_model = InvoiceOrder::where('order_number',$data['order_number'])->first();
             $material_model->sales_order_id = $data['sales_order_id'];
-            $material_model->send = $data['send'];
-            $material_model->send_time = $data['send_time'];
-            $material_model->take = $data['take'];
-            $material_model->take_address = $data['take_address'];
-            $material_model->take_phone = $data['take_phone'];
-            $material_model->logistics_company = $data['logistics_company'];
-            $material_model->logistics_number = $data['logistics_number'];
-            $material_model->mark = $data['mark'];
+            $material_model->send = $data['send'] ?? 0;
+            $material_model->send_time = $data['send_time'] ?? 0;
+            $material_model->take = $data['take'] ?? "";
+            $material_model->take_address = $data['take_address'] ?? "";
+            $material_model->take_phone = $data['take_phone'] ?? "";
+            $material_model->logistics_company = $data['logistics_company'] ?? "";
+            $material_model->logistics_number = $data['logistics_number'] ?? "";
+            $material_model->depart_id = $data['depart_id'] ?? 0;
+            $material_model->top_depart_id = $data['top_depart_id'] ?? 0;
+            $material_model->mark = $data['mark'] ?? "";
             $material_model->storehouse_id = $data['storehouse_id'];
             $material_model->save();
 
@@ -86,16 +88,16 @@ class InvoiceOrderService extends Service
             $material_model = new InvoiceOrder();
             $material_model->order_number = $data['order_number'];
             $material_model->sales_order_id = $data['sales_order_id'];
-            $material_model->send = $data['send'];
-            $material_model->send_time = $data['send_time'];
-            $material_model->take = $data['take'];
-            $material_model->take_address = $data['take_address'];
-            $material_model->take_phone = $data['take_phone'];
-            $material_model->logistics_company = $data['logistics_company'];
-            $material_model->logistics_number = $data['logistics_number'];
+            $material_model->send = $data['send'] ?? 0;
+            $material_model->send_time = $data['send_time'] ?? 0;
+            $material_model->take = $data['take'] ?? "";
+            $material_model->take_address = $data['take_address'] ?? "";
+            $material_model->take_phone = $data['take_phone'] ?? "";
+            $material_model->logistics_company = $data['logistics_company'] ?? "";
+            $material_model->logistics_number = $data['logistics_number'] ?? "";
             $material_model->depart_id = $data['depart_id'] ?? 0;
             $material_model->top_depart_id = $data['top_depart_id'] ?? 0;
-            $material_model->mark = $data['mark'];
+            $material_model->mark = $data['mark'] ?? "";
             $material_model->crt_id = $user['id'];
             $material_model->storehouse_id = $data['storehouse_id'];
             $material_model->save();
@@ -306,6 +308,7 @@ class InvoiceOrderService extends Service
     public function orderRule(&$data, $user, $is_check = true){
         if($this->isEmpty($data,'send')) return [false,'发货人不能为空！'];
         if($this->isEmpty($data,'product')) return [false,'产品不能为空！'];
+        if(empty($data['logistics_number'])) return [false,'物流单号不能为空'];
         if(empty($data['storehouse_id'])) return [false,'请选择仓库'];
         if(! empty($data['send_time'])) $data['send_time'] = $this->changeDateToDateMin($data['send_time']);
         if(! empty($data['sales_order_id'])) {
@@ -392,14 +395,14 @@ class InvoiceOrderService extends Service
 
         $invoice = InvoiceOrder::where('del_time',0)
             ->whereIn('sales_order_id',array_column($sale_order,'id'))
-            ->select('sales_order_id','order_number')
+            ->select('sales_order_id','order_number','logistics_number')
             ->get()->toArray();
 
         $return = [];
         foreach ($invoice as $value){
             if(isset($sale_order_map[$value['sales_order_id']])){
                 $purchase_order_number = $sale_order_map[$value['sales_order_id']];
-                $return[$purchase_order_number][] = $value['order_number'];
+                $return[$purchase_order_number][] = $value['logistics_number'];
             }
         }
 

app/Service/SalesOrderService.php

@@ -1059,11 +1059,11 @@ class SalesOrderService extends Service
 
         $invoice = InvoiceOrder::where('del_time',0)
             ->whereIn('sales_order_id',$search_id)
-            ->select('sales_order_id','order_number')
+            ->select('sales_order_id','order_number','logistics_number')
             ->get()->toArray();
         $invoice_array = [];
         foreach ($invoice as $value){
-            $invoice_array[$value['sales_order_id']][] = $value['order_number'];
+            $invoice_array[$value['sales_order_id']][] = $value['logistics_number'];
         }
 
         return $invoice_array;