cqpCow hai 10 meses
pai
achega
e556740bf5
Modificáronse 2 ficheiros con 16 adicións e 5 borrados
  1. 7 0
      app/Service/BasicTypeService.php
  2. 9 5
      app/Service/SalesOrderService.php

+ 7 - 0
app/Service/BasicTypeService.php

@@ -178,6 +178,13 @@ class BasicTypeService extends Service
         return $data;
     }
 
+    public function basicTypeSearch($data){
+        $basic = BasicType::where('title', 'LIKE', '%'.$data.'%')
+            ->select('id')
+            ->get()->toArray();
+        return array_column($basic,'id');
+    }
+
     public function maked(){
         $list = BasicType::where('del_time',0)
             ->select('title','type','top_depart_id')

+ 9 - 5
app/Service/SalesOrderService.php

@@ -766,6 +766,10 @@ class SalesOrderService extends Service
         if(isset($data['invoice_state'])) $model->where('invoice_state',$data['invoice_state']);
         if(! empty($data['order_type'])) $model->where('order_type',$data['order_type']);
         if(! empty($data['plat_type'])) $model->where('plat_type',$data['plat_type']);
+        if(! empty($data['plat_type_title'])) {
+            $id = (new BasicTypeService())->basicTypeSearch($data['plat_type_title']);
+            $model->whereIn('plat_type',$id);
+        }
         if(! empty($data['plat_order'])) $model->where('plat_order','LIKE', '%'.$data['plat_order'].'%');
         if(! empty($data['customer'])) {
             $model2 = Customer::Clear($user,$data);
@@ -1445,11 +1449,11 @@ class SalesOrderService extends Service
         if(empty($result)) return [false, '未找到数据'];
         $result = array_column($result,null,'order_number');
 
-        foreach ($data as $value){
-            if(! isset($result[$value['order_number']])) return [false, $value['order_number'] . '不存在或已被删除'];
-            $tmp =  $result[$value['order_number']];
-            if($tmp['model_type'] != SalesOrder::Model_type_four) return [false, '单据'. $value['order_number'] . '非线上订单,操作失败'];
-            if($tmp['state'] != SalesOrder::State_zero) return [false, '请确认单据'. $value['order_number'] . '的状态,操作失败'];
+        foreach ($data['order_number'] as $value){
+            if(! isset($result[$value])) return [false, $value . '不存在或已被删除'];
+            $tmp =  $result[$value];
+            if($tmp['model_type'] != SalesOrder::Model_type_four) return [false, '单据'. $value . '非线上订单,操作失败'];
+            if($tmp['state'] != SalesOrder::State_zero) return [false, '请确认单据'. $value . '的状态,操作失败'];
         }
 
         SalesOrder::whereIn('order_number',$data['order_number'])->update(['state' => SalesOrder::State_two]);