cqpCow пре 1 година
родитељ
комит
1af091efb5

+ 4 - 0
app/Service/PurchaseOrderService.php

@@ -8,6 +8,7 @@ use App\Model\Employee;
 use App\Model\PurchaseOrder;
 use App\Model\PurchaseOrderFile;
 use App\Model\PurchaseOrderInfo;
+use App\Model\ReturnExchangeOrder;
 use App\Model\SalesOrder;
 use App\Model\SeeRange;
 use App\Model\Storehouse;
@@ -227,6 +228,9 @@ class PurchaseOrderService extends Service
         $order['depart'] = $return[0] ?? [];
         $order['employee'] = $return[1] ?? [];
 
+        //退换货信息
+        $order['return_exchange'] = (new ReturnExchangeOrderService())->getDifferentAmount($order['id'],ReturnExchangeOrder::Order_type2);
+
         return [true, $order];
     }
 

+ 1 - 1
app/Service/RangeService.php

@@ -15,7 +15,7 @@ class RangeService extends Service
     //设置可见范围 除了合同
     public function seeRange($data,$user){
         if(empty($data['data_type'])) return [false, "可见范围数据类型不能为空"];
-        if(! isset(SeeRange::$type[$data['data_type']])) return [false, "可见范围数据类型错误"];
+        if(! in_array($data['data_type'], SeeRange::$type)) return [false, "可见范围数据类型错误"];
         if(empty($data['data_id'])) return [false,'可见范围数据ID不能为空'];
 
         $time = time();

+ 19 - 0
app/Service/ReturnExchangeOrderService.php

@@ -429,6 +429,7 @@ class ReturnExchangeOrderService extends Service
         return $product_save;
     }
 
+    //合同剩余能退
     public function getSaveReturnCompareMessage($id = 0, $sales_order_id = 0){
         $return = ReturnExchangeOrder::where('del_time',0)
             ->where('data_id',$sales_order_id)
@@ -466,6 +467,7 @@ class ReturnExchangeOrderService extends Service
         return $sales_order_product;
     }
 
+    //采购剩余能退
     public function getSaveReturnCompareMessage2($id = 0, $purchase_id = 0){
         $return = ReturnExchangeOrder::where('del_time',0)
             ->where('data_id',$purchase_id)
@@ -502,4 +504,21 @@ class ReturnExchangeOrderService extends Service
 
         return $sales_order_product;
     }
+
+    //获取差异金额
+    public function getDifferentAmount($id = 0, $type = 0){
+        if(empty($id)) return [];
+
+        $result = ReturnExchangeOrder::where('del_time',0)
+            ->where('data_id',$id)
+            ->where('type',$type)
+            ->select('id','model_type','order_number','difference_amount','state')
+            ->get()->toArray();
+        foreach ($result as $key => $value){
+            $result[$key]['model_type_title'] = ReturnExchangeOrder::$model_type[$value['model_type']] ?? "";
+            $result[$key]['state_title'] = ReturnExchangeOrder::$state[$value['state']] ?? "";
+        }
+
+        return $result;
+    }
 }

+ 3 - 0
app/Service/SalesOrderService.php

@@ -469,6 +469,9 @@ class SalesOrderService extends Service
         $sales['dispatch_employee'] = $return[1] ?? [];
         $sales['dispatch_depart_two'] = $return[2] ?? [];
 
+        //退换货信息
+        $sales['return_exchange'] = (new ReturnExchangeOrderService())->getDifferentAmount($data['id']);
+
         return [true, $sales];
     }
 

+ 2 - 2
app/Service/SupplierService.php

@@ -125,8 +125,8 @@ class SupplierService extends Service
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         //可见范围
         $return = (new RangeService())->RangeDetail($customer['id'],SeeRange::type_nine);
-        $order['depart'] = $return[0] ?? [];
-        $order['employee'] = $return[1] ?? [];
+        $customer['depart'] = $return[0] ?? [];
+        $customer['employee'] = $return[1] ?? [];
 
         return [true, $customer];
     }