Parcourir la source

快递件流程结束

cqpCow il y a 1 an
Parent
commit
4fa54e55ba

+ 1 - 1
app/Service/ConstructionService.php

@@ -293,7 +293,7 @@ class ConstructionService extends Service
             }elseif ($value['type'] == ConstructionInfo::type_two){
                 $tmp = [
                     'id' => $value['employee_id'],
-                    'name' => $emp_map[$value['employee_id']],
+                    'name' => $emp_map[$value['employee_id']] ?? '',
                 ];
                 $construction['employee_one'][] = $tmp;
             }

+ 3 - 3
app/Service/CustomerService.php

@@ -347,19 +347,19 @@ class CustomerService extends Service
             }elseif ($value['type'] == CustomerInfo::type_two){
                 $tmp = [
                     'id' => $value['employee_id'],
-                    'name' => $emp_map[$value['employee_id']],
+                    'name' => $emp_map[$value['employee_id']] ?? '',
                 ];
                 $customer['employee_one'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_three){
                 $tmp = [
                     'id' => $value['employee_id'],
-                    'name' => $emp_map[$value['employee_id']],
+                    'name' => $emp_map[$value['employee_id']] ?? '',
                 ];
                 $customer['employee_two'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_four){
                 $tmp = [
                     'id' => $value['employee_id'],
-                    'name' => $emp_map[$value['employee_id']],
+                    'name' => $emp_map[$value['employee_id']] ?? '',
                 ];
                 $customer['employee_three'][] = $tmp;
             }elseif ($value['type'] == CustomerInfo::type_five){

+ 1 - 1
app/Service/InvoiceOrderService.php

@@ -211,7 +211,7 @@ class InvoiceOrderService extends Service
             $data['data'][$key]['depart_name'] = $depart_map[$value['depart_id']] ?? '';
             $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? '';
             $data['data'][$key]['send_name'] = $emp_map[$value['send']] ?? '';
-            $data['data'][$key]['state_name'] = InvoiceOrder::$name[$value['state']] ?? '';
+            $data['data'][$key]['state_title'] = InvoiceOrder::$name[$value['state']] ?? '';
             $data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
         }
 

+ 1 - 1
app/Service/ProductService.php

@@ -408,7 +408,7 @@ class ProductService extends Service
             }elseif ($value['type'] == ProductRange::type_two){
                 $tmp = [
                     'id' => $value['employee_id'],
-                    'name' => $emp_map[$value['employee_id']],
+                    'name' => $emp_map[$value['employee_id']] ?? '',
                 ];
                 $customer['employee'][] = $tmp;
             }

+ 1 - 1
app/Service/PurchaseOrderService.php

@@ -133,7 +133,7 @@ class PurchaseOrderService extends Service
         $emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$order['purchase_id']],[$order['crt_id']])))
             ->pluck('emp_name','id')
             ->toArray();
-        $order['purchase_title'] = $emp_map[$order['purchase_id']];
+        $order['purchase_title'] = $emp_map[$order['purchase_id']] ?? '';
 
         $info = PurchaseOrderInfo::where('del_time',0)
             ->where('order_number',$data['order_number'])

+ 3 - 3
app/Service/SalesOrderService.php

@@ -340,7 +340,7 @@ class SalesOrderService extends Service
         foreach ($sales_info as $value){
             $tmp = [
                 'id' => $value['employee_id'],
-                'name' => $emp_map[$value['employee_id']],
+                'name' => $emp_map[$value['employee_id']] ?? '',
             ];
             if($value['type'] == SalesOrderInfo::type_one){
                 $sales['employee_one'][] = $tmp;
@@ -561,7 +561,7 @@ class SalesOrderService extends Service
         try {
             DB::beginTransaction();
             SalesOrder::where('del_time',0)->where('id',$msg['id'])->update([
-                'state' => SalesOrder::State_two
+                'state' => SalesOrder::State_one
             ]);
 
             $time = time();
@@ -625,7 +625,7 @@ class SalesOrderService extends Service
         try {
             DB::beginTransaction();
             SalesOrder::where('del_time',0)->where('id',$msg['id'])->update([
-                'state' => SalesOrder::State_three
+                'state' => SalesOrder::State_two
             ]);
 
             $time = time();