|
|
@@ -999,8 +999,8 @@ class SalesOrderService extends Service
|
|
|
|
|
|
(new OrderOperationService())->add([
|
|
|
'order_number' => $msg['order_number'],
|
|
|
- 'msg' => OrderOperation::$type[OrderOperation::one],
|
|
|
- 'type' => OrderOperation::one
|
|
|
+ 'msg' => OrderOperation::$type[OrderOperation::two],
|
|
|
+ 'type' => OrderOperation::two
|
|
|
],$user);
|
|
|
|
|
|
DB::commit();
|
|
|
@@ -1025,7 +1025,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_three) return [false,'合同还未指派销售，操作失败'];
|
|
|
if($sale['state'] > SalesOrder::State_four) return [false,'请确认合同状态，操作失败'];
|
|
|
$product = SalesOrderProductInfo::where('del_time',0)
|
|
|
->where('sales_order_id',$data['id'])
|
cqpCow