cqpCow 1 rok pred
rodič
commit
75d3189eb3

+ 3 - 1
app/Service/ReturnExchangeOrderService.php

@@ -231,6 +231,7 @@ class ReturnExchangeOrderService extends Service
         $sales = SalesOrder::where('id',$order['sales_order_id'])->value('order_number');
         $order['sales_order_number'] = $sales;
         $order['model_type_title'] = ReturnExchangeOrder::$model_type_name[$order['model_type']] ?? "";
+        $order['state_title'] = ReturnExchangeOrder::$state[$order['state']] ?? '';
 
         $order['product_one'] = $order['product_two'] = $order['depart'] = $order['employee'] = [];
         $info = ReturnExchangeOrderProductInfo::where('del_time',0)
@@ -360,11 +361,12 @@ class ReturnExchangeOrderService extends Service
 
     public function orderRule(&$data, $user, $is_check = true){
         if($this->isEmpty($data,'model_type')) return [false,'单据类型不能为空!'];
-        if(! isset(ReturnExchangeOrder::$model_type[$data['model_type']])) return [false,'单据类型不存在'];
+        if(! in_array($data['model_type'], ReturnExchangeOrder::$model_type)) return [false,'单据类型不存在'];
         if($this->isEmpty($data,'sales_order_id')) return [false,'合同不能为空!'];
         if(empty($data['sales_order_id'])) return [false,'请选择合同'];
         $sale = SalesOrder::where('del_time',0)->where('id',$data['sales_order_id'])->first();
         if(empty($sale)) return [false,'合同不存在或已被删除'];
+        if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false, '非安装件合同'];
         if($sale['state'] < SalesOrder::State_two) return [false,'合同未施工,不能进行退换货操作'];
         //退货
         $return_submit_add = [];