1

app/Model/SalesOrder.php

@@ -38,7 +38,8 @@ class SalesOrder extends UseScopeBaseModel
     const State_four = 4;//已派总设或分社
     const State_five = 5;//已下施工单
     const State_six = 6;//退换货
-    const State_seven = 7;//完结
+    const State_seven = 7;//完结 公司
+    const State_eight = 8;//完结 客户
     public static $state = [
         self::State_zero => '未确认',
         self::State_one => '待确认',
@@ -47,7 +48,8 @@ class SalesOrder extends UseScopeBaseModel
         self::State_four => '已派总设或分社',
         self::State_five => '已下施工单',
         self::State_six => '退换货',
-        self::State_seven => '完结',
+        self::State_seven => '公司完结',
+        self::State_eight => '客户完结',
     ];
 
     //快递件

app/Service/CheckService.php

@@ -31,11 +31,12 @@ class CheckService extends Service
     const one = 1; //收货
     const two = 2; //发货
     const three = 3; //采购单入库
-    const four = 4; //合同
+    const four = 4; //合同公司完结
     const five = 5; //施工单
     const six = 6; //退换货单
     const seven = 7; //采购单确认
     const eight = 8; //合同确认
+    const nine = 9; //合同客户完结
 
     //中文对照
     public $map = [
@@ -75,7 +76,8 @@ class CheckService extends Service
     ];
 
     public static $finished = [
-        self::four => 'confirmSalesOrder', // 合同 安装件 合同完结
+        self::four => 'confirmSalesOrder', // 合同 安装件 合同公司完结
+        self::nine => 'confirmSalesOrder2', // 合同 安装件 合同客户完结
     ];
 
     //单据操作
@@ -434,8 +436,8 @@ class CheckService extends Service
         ReturnExchangeOrder::where('del_time',0)->where('order_number',$data['order_number'])
             ->update(['state' => ReturnExchangeOrder::State_two]);
 
-        if($data['data_type'] == ReturnExchangeOrder::Order_type){
-            SalesOrder::where('id',$model->data_id)->update([
+        if($model->data_type == ReturnExchangeOrder::Order_type){
+            SalesOrder::where('id', $model->data_id)->update([
                 'state' => SalesOrder::State_six
             ]);
         }
@@ -507,7 +509,7 @@ class CheckService extends Service
             ->first();
         if(empty($model)) return [false, '合同不存在或已被删除'];
         //安装件
-        if($model->state == SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
+        if($model->state <= SalesOrder::State_four || $model->state >= SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
 
         SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])
             ->update(['state' => SalesOrder::State_seven]);
@@ -515,6 +517,20 @@ class CheckService extends Service
         return [true, $model->toArray()];
     }
 
+    public function confirmSalesOrder2($data){
+        $model = SalesOrder::where('order_number', $data['order_number'])
+            ->where('del_time',0)
+            ->first();
+        if(empty($model)) return [false, '合同不存在或已被删除'];
+        //安装件
+        if($model->state != SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
+
+        SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])
+            ->update(['state' => SalesOrder::State_eight]);
+
+        return [true, $model->toArray()];
+    }
+
     public function confirmSales($data){
         $model = SalesOrder::where('order_number', $data['order_number'])
             ->where('del_time',0)