罗恩工具类更新

server/app/Http/Controllers/V1/RhawnOrdersController.php

@@ -63,7 +63,6 @@ class RhawnOrdersController extends Controller
             'orderNo.required' => "订单号必填",
             'itemId.required' => "订单购买项必填",
             'pId.required' => "订单产品必选",
-            'refundNums.required' => "退货数量必填",
             'handleFee.required' => "手续费费用必填",
             'transferPre.required' => "是否转预存必选",
         ];

server/app/Repositories/Eloquent/RhawnSoitemsRepositoryEloquent.php

@@ -111,7 +111,7 @@ class RhawnSoitemsRepositoryEloquent extends BaseRepository implements RhawnSoit
             ->join('products','soitems.p_id','products.p_id')
             ->where('soitems.si_id',$id)
             ->where('si_if_cancel',0)
-            ->where('dpdetail.dpd_invoiced','=',0)
+            //->where('dpdetail.dpd_invoiced','=',0)
             ->get();
 
         return $soItemStock;

server/app/Services/RhawnOrdersService.php

@@ -87,13 +87,19 @@ class RhawnOrdersService
         $returnItemStock = [];
         if($result && !empty($result)){
             foreach($result as $res){
-               $temp = [];
-               $temp['dpd_num'] = $res['dpd_num'];
-               $temp['si_id'] = $res['si_id'];
-               $temp['pstk_id'] = $res['pstk_id'];
-               $temp['pstk_num'] = $res['pstk_num'];
-               $temp['pstk_no'] = $res['pstk_no'];
-               $returnItemStock[] = $temp;
+                $temp = [];
+                $temp['dpd_num'] = $res['dpd_num'];
+                $temp['si_id'] = $res['si_id'];
+                $temp['pstk_id'] = $res['pstk_id'];
+                $temp['pstk_num'] = $res['pstk_num'];
+                $temp['pstk_no'] = $res['pstk_no'];
+                $temp['selected'] = true;
+                $temp['dpd_invoiced_status'] = '未开票';
+                if($res['dpd_invoiced'] > 0){
+                    $temp['selected'] = false;
+                    $temp['dpd_invoiced_status'] = '已开票';
+                }
+                $returnItemStock[] = $temp;
             }
         }
 
@@ -280,6 +286,12 @@ class RhawnOrdersService
                 $temp['pstk_no'] = $res['pstk_no'];
                 $temp['p_cn_name'] = $res['p_cn_name'];
                 $temp['refund_nums'] = $pstkNums[$res['pstk_id']];
+                $temp['selected'] = true;
+                $temp['dpd_invoiced_status'] = '未开票';
+                if($res['dpd_invoiced'] > 0){
+                    $temp['selected'] = false;
+                    $temp['dpd_invoiced_status'] = '已开票';
+                }
                 $returnItemStock[] = $temp;
             }
         }