|
|
@@ -807,7 +807,7 @@ class SalesOrderService extends Service
|
|
|
if(empty($sale)) return [false,'合同不存在或已被删除'];
|
|
|
$sale = $sale->toArray();
|
|
|
if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false,'非安装件合同，操作失败'];
|
|
|
- if($sale['state'] != SalesOrder::State_two) return [false,'合同未确认，操作失败'];
|
|
|
+ if($sale['state'] < SalesOrder::State_two) return [false,'合同还未确认，操作失败'];
|
|
|
if($sale['state'] > SalesOrder::State_three) return [false,'请确认合同状态，操作失败'];
|
|
|
$bool = SalesOrderProductInfo::where('del_time',0)
|
|
|
->where('sales_order_id',$data['id'])
|
|
|
@@ -886,6 +886,7 @@ class SalesOrderService extends Service
|
|
|
if(empty($sale)) return [false,'合同不存在或已被删除'];
|
|
|
$sale = $sale->toArray();
|
|
|
if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false,'非安装件合同，操作失败'];
|
|
|
+ if($sale['state'] != SalesOrder::State_three) return [false,'合同还未指派销售，操作失败'];
|
|
|
if($sale['state'] > SalesOrder::State_four) return [false,'请确认合同状态，操作失败'];
|
|
|
$product = SalesOrderProductInfo::where('del_time',0)
|
|
|
->where('sales_order_id',$data['id'])
|
cqpCow