1

app/Service/SalesOrderService.php

@@ -705,9 +705,9 @@ class SalesOrderService extends Service
             ->where('id',$data['id'])
             ->first();
         if(empty($sale)) return [false,'合同不存在或已被删除'];
-        if($sale['state'] > SalesOrder::State_one) return [false,'请确认合同状态，操作失败'];
         $sale = $sale->toArray();
-
+        if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false,'非安装件合同，操作失败'];
+        if($sale['state'] > SalesOrder::State_one) return [false,'请确认合同状态，操作失败'];
         if(empty($data['dispatch_depart_one']) && empty($data['dispatch_employee'])) return [false, '请指派部门或人员'];
 
         return [true, $sale];
@@ -776,8 +776,9 @@ class SalesOrderService extends Service
             ->where('id',$data['id'])
             ->first();
         if(empty($sale)) return [false,'合同不存在或已被删除'];
-        if($sale['state'] > SalesOrder::State_two) return [false,'请确认合同状态，操作失败'];
         $sale = $sale->toArray();
+        if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false,'非安装件合同，操作失败'];
+        if($sale['state'] > SalesOrder::State_two) return [false,'请确认合同状态，操作失败'];
 
         $bool = Construction::where('del_time',0)
             ->where('sales_order_id',$data['id'])