1

app/Model/SalesOrder.php

@@ -70,14 +70,17 @@ class SalesOrder extends UseScopeBaseModel
     const State_eight = 8;//完结 客户
 
     const special_status = -100;
+    //已审核
+    const search = "(sales_order_type = " . SalesOrder::Order_type_one . " and state >= " . SalesOrder::State_one." and dispatch_time_second = 0)";
+
     //审核通过条件  安装件 且 线上订单 补贴订单 的已审核是2  其它是3
-    const search = "(sales_order_type = " . SalesOrder::Order_type_one . " and ((model_type IN( " . SalesOrder::Model_type_four ." , " . SalesOrder::Model_type_seven .") and state = " . SalesOrder::State_two.") or (model_type Not IN (" . SalesOrder::Model_type_four ." , " . SalesOrder::Model_type_seven .") and state = " . SalesOrder::State_three.")))";
+    const search1 = "(sales_order_type = " . SalesOrder::Order_type_one . " and ((model_type IN( " . SalesOrder::Model_type_four ." , " . SalesOrder::Model_type_seven .") and state = " . SalesOrder::State_two.") or (model_type Not IN (" . SalesOrder::Model_type_four ." , " . SalesOrder::Model_type_seven .") and state = " . SalesOrder::State_three.")))";
     public static $state = [
         self::State_minus_one => '已驳回',
         self::State_zero => '待创建人确认',
         self::State_one => '待审批人审核',
         self::State_two => '审核通过',
-        self::State_three => '待被指派门店接收',
+        self::State_three => '已线上派单',
         self::State_four => '已门店派单',
         self::State_five => '施工中',
         self::State_six => '退换货',

app/Service/PurchaseOrderService.php

@@ -116,6 +116,16 @@ class PurchaseOrderService extends Service
             return [false,$e->getMessage()];
         }
 
+        if(! empty($data['check'])) {
+            list($status,$msg) = (new CheckService())->checkAll([
+                "id" => $material_model->id,
+                "order_number" => $data['order_number'],
+                "opt_case" => CheckService::seven,
+                "menu_id" => $data['menu_id']
+            ],$user);
+//            if(! $status) return [true, '保存成功，采购单确认失败，异常信息：' . $msg];
+        }
+
         return [true, ['file' => ['new' => $new, 'old' => $old]]];
     }
 
@@ -196,6 +206,16 @@ class PurchaseOrderService extends Service
 
         (new OperationLogService())->setOperationList($data,$user);
 
+        if(! empty($data['check'])) {
+            list($status,$msg) = (new CheckService())->checkAll([
+                "id" => $material_model->id,
+                "order_number" => $data['order_number'],
+                "opt_case" => CheckService::seven,
+                "menu_id" => $data['menu_id']
+            ],$user);
+//            if(! $status) return [true, '保存成功，采购单确认失败，异常信息：' . $msg];
+        }
+
         return [true, ['file' => ['new' => $new]]];
     }
 

app/Service/ReturnExchangeOrderService.php

@@ -91,6 +91,16 @@ class ReturnExchangeOrderService extends Service
             return [false,$e->getMessage()];
         }
 
+        if(! empty($data['check'])) {
+            list($status,$msg) = (new CheckService())->checkAll([
+                "id" => $material_model->id,
+                "order_number" => $data['order_number'],
+                "opt_case" => CheckService::six,
+                "menu_id" => $data['menu_id']
+            ],$user);
+            if(! $status) return [true, '保存成功，退换货单提交失败，异常信息：' . $msg];
+        }
+
         return [true,''];
     }
 
@@ -174,6 +184,16 @@ class ReturnExchangeOrderService extends Service
 
         (new OperationLogService())->setOperationList($data,$user);
 
+        if(! empty($data['check'])) {
+            list($status,$msg) = (new CheckService())->checkAll([
+                "id" => $material_model->id,
+                "order_number" => $data['order_number'],
+                "opt_case" => CheckService::six,
+                "menu_id" => $data['menu_id']
+            ],$user);
+            if(! $status) return [true, '保存成功，退换货单提交失败，异常信息：' . $msg];
+        }
+
         return [true,''];
     }
 

app/Service/SalesOrderService.php

@@ -782,12 +782,14 @@ class SalesOrderService extends Service
         }
         if(isset($data['state'])) {
             if($data['state'] == SalesOrder::special_status){
-                $model->whereRaw(SalesOrder::search);
+                $model->whereRaw(SalesOrder::search1);
             }else{
+                if($data['state'] == SalesOrder::State_three) $model->where('dispatch_time_first','>',0);
                 $model->where('state', $data['state']);
             }
         }
         if(isset($data['invoice_state'])) $model->where('invoice_state',$data['invoice_state']);
+        if(isset($data['is_confirm'])) $model->where('is_confirm',$data['is_confirm']);
         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'])) {
@@ -1091,9 +1093,16 @@ class SalesOrderService extends Service
             $data['data'][$key]['is_confirm_title'] = $value['is_confirm'] ? "已接收" : "未接收" ;
             $tmp = $invoiceData[$value['id']] ?? [];
             $data['data'][$key]['invoice_arr'] = implode(',', $tmp);
-            $data['data'][$key]['dispatch_company'] = $dispatch[$value['id']] ?? '';
+            $dispatch_company = $dispatch[$value['id']] ?? '';
+            $data['data'][$key]['dispatch_company'] = $dispatch_company;
             $data['data'][$key]['u8_message'] = $u8[$value['id']] ?? '';
             $data['data'][$key]['construction_no'] = $construction_array[$value['id']] ?? '';
+            if($value['is_confirm']){
+                $show = $dispatch_company . '已接收';
+            }else{
+                $show = '待' . $dispatch_company . '接收';
+            }
+            $data['data'][$key]['wx_show'] = $show;
 
             //用于计算--------
             //已收（审核后）

config/header/43.php

@@ -94,6 +94,10 @@ return [
         'key' => 'state_title',
         'value' => '订单状态',
     ],
+    [
+        'key' => 'is_confirm_title',
+        'value' => '是否被指派门店接收',
+    ],
     [
         'key' => 'invoice_state_name',
         'value' => '发货状态',