增加退货系统导出字段，退货系统退回单号实现多单号查找

app/Exports/RejectedExport.php

@@ -65,7 +65,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
         $collection->prepend(['日期','审核号','客户名称','订单号','姓名',
             '手机','原单单号','退回单号','退回公司','到付费用',
             '是否入库','商品条码','商品名称','数量','是否正品',
-            '批次号','生产日期','效期','备注','录入人']);
+            '批次号','生产日期','效期','备注','退单备注','录入人']);
         return $collection;
     }
     private function injectRecord($collection,$bill,$item){
@@ -77,7 +77,7 @@ class RejectedExport extends \PhpOffice\PhpSpreadsheet\Cell\StringValueBinder im
             $bill['logistic_number_return'],$bill['logistic_name'],
             $bill['fee_collected'],$bill['is_loaded_str'],
             $item['barcode_goods'],$item['name_goods'],$item['amount'],$item['quality_label'],
-            $item['batch_number'],$item['made_at'],$item['validity_at'],$item['remark'],$bill['operator_name']]);
+            $item['batch_number'],$item['made_at'],$item['validity_at'],$item['remark'],$bill['remark'],$bill['operator_name']]);
         return $collection;
     }
 

app/Http/Controllers/RejectedController.php

@@ -23,6 +23,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\View\View;
 use Maatwebsite\Excel\Facades\Excel;
+use phpDocumentor\Reflection\Types\Array_;
 use function foo\func;
 
 class RejectedController extends Controller
@@ -184,15 +185,20 @@ class RejectedController extends Controller
             }
         }
         if($logistic_number_return){
-            $startDay = Carbon::now()->subDays(15);
-            $rejectedBillsQueryTem=clone $rejectedBillsQuery;
-            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
-            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number_return','like','%'.$logistic_number_return.'%');
-            if($rejectedBillsQueryTem->count()==0
-                ||$rejectedBillsQueryTem->first()['logistic_number_return']==$logistic_number_return){
-                $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number_return',$logistic_number_return);
+            if(strpos($logistic_number_return,',')||strpos($logistic_number_return,'，')||strpos($logistic_number_return,' ')){
+                $arr=array_filter(preg_split('/[,， ]+/is', $logistic_number_return));
+                $rejectedBillsQuery=$rejectedBillsQuery->whereIn('logistic_number_return',$arr);
             }else{
-                $rejectedBillsQuery=$rejectedBillsQueryTem;
+                $startDay = Carbon::now()->subDays(15);
+                $rejectedBillsQueryTem=clone $rejectedBillsQuery;
+                $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
+                $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number_return','like','%'.$logistic_number_return.'%');
+                if($rejectedBillsQueryTem->count()==0
+                    ||$rejectedBillsQueryTem->first()['logistic_number_return']==$logistic_number_return){
+                    $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number_return',$logistic_number_return);
+                }else{
+                    $rejectedBillsQuery=$rejectedBillsQueryTem;
+                }
             }
         }
         if($logistic_number){

app/Http/Controllers/WaybillsController.php

@@ -599,6 +599,8 @@ class WaybillsController extends Controller
         $row=[[
             'type'=>'运单类型',
             'owner'=>'货主',
+            'source_bill'=>'上游单号',
+            'wms_bill_number'=>'wms订单号',
             'waybill_number'=>'运单号',
             'origination'=>'始发地',
             'destination'=>'目的地',
@@ -641,6 +643,7 @@ class WaybillsController extends Controller
                 'type'=>isset($waybill->type)?$waybill->type:'',
                 'waybill_number'=>isset($waybill->waybill_number)?$waybill->waybill_number:'',
                 'owner'=>isset($waybill->owner->name)?$waybill->owner->name:'',
+                'source_bill'=>isset($waybill->source_bill)?$waybill->source_bill:'',
                 'wms_bill_number'=>isset($waybill->wms_bill_number)?$waybill->wms_bill_number:'',
                 'origination'=>isset($waybill->origination)?$waybill->origination:'',
                 'destination'=>isset($waybill->destination)?$waybill->destination:'',

public/js/app.js

@@ -2259,7 +2259,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -61401,4 +61401,4 @@ module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.
 
 /***/ })
 
-/******/ });
+/******/ });

resources/views/rejected/index.blade.php

@@ -58,7 +58,7 @@
                                 <td>
                                     <input type="text" class="form-control-sm tooltipTarget" placeholder="退回单号" name="logistic_number_return"
                                            :class="filterParams.logistic_number_return?'bg-warning':''"
-                                           @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="退回单号：15天以内的支持模糊搜索，回车提交">
+                                           @input="logistic_number_returnEntering" @keypress="submitFilterOnEnter" title="退回单号：支持查找多个以逗号或空格分隔的单号，15天以内的支持模糊搜索，回车提交">
                                 </td>
                                 <td>
                                     <input type="text" class="form-control-sm tooltipTarget" placeholder="原单单号" name="logistic_number"

resources/views/waybill/index.blade.php

@@ -139,6 +139,7 @@
                     <th>创建时间</th>
                     <th>运单类型</th>
                     <th>货主</th>
+                    <th>上游单号</th>
                     <th>WMS订单号</th>
                     <th>运单号</th>
                     <th>收件人</th>