退货批量导入

app/Http/Controllers/RejectedBillItemController.php

@@ -363,6 +363,7 @@ class RejectedBillItemController extends Controller
             return ['success'=>'false','failure_info'=>'传入id不能为空'];
         }
         $rejectedBillItem = RejectedBillItem::find($request->input('id'));
+        if(!$rejectedBillItem)return ['success'=>'false','id'=>$request->input('id')];
         $rejectedBillItem->forceDelete();
         /** @var RejectedBill $rejectedBill */
         $rejectedBill = RejectedBill::query()->where('id',$rejectedBillItem->id_rejected_bill)->first();

app/Imports/RejectedImport.php

@@ -30,13 +30,13 @@ class RejectedImport implements ToCollection, WithHeadingRow
     {
         foreach ($collections as $row)
         {
-            $logistic_number_return = trim($row['logistic_number_return']);
-            $mobile_sender = trim($row['mobile_sender']);
-            $logistic_name = trim($row['logistic_name']);
-            $barcode = trim($row['barcode']);
-            $amount = trim($row['amount']);
-            $quality_label_name = trim($row['quality_label_name']);
-            $remark = trim($row['remark']);
+            $logistic_number_return = trim($row['退回单号']??$row['快递单号']??$row['logistic_number_return']??'');
+            $mobile_sender = trim($row['手机号']??$row['mobile_sender']??'');
+            $logistic_name = trim($row['快递公司']??$row['logistic_name']??'');
+            $barcode = trim($row['条码']??$row['barcode']??'');
+            $amount = trim($row['数量']??$row['amount']??'');
+            $quality_label_name = trim($row['品质']??$row['quality_label_name']??'');
+            $remark = trim($row['备注']??$row['remark']??'');
             $id_owner=Session::get('jianshangIdOwner');
 
 
@@ -56,8 +56,11 @@ class RejectedImport implements ToCollection, WithHeadingRow
             if(!$id_logistic_return){
                 $id_logistic_return=Logistic::where('name','like',"%其它%")->first()['id'];
             }
-            $id_quality_label=1;
-            if(trim($quality_label_name)!='良品'){
+
+            $id_quality_label=3;
+            if(trim($quality_label_name)=='正品'){
+                $id_quality_label=1;
+            }elseif(trim($quality_label_name)=='残次'){
                 $id_quality_label=2;
             }
             if(!$amount)$amount=1;

resources/views/rejected/import.blade.php

@@ -3,8 +3,8 @@
 
 @section('content')
     <div id="nav2">
-        @component('maintenance.menu')@endcomponent
-        @component('maintenance.commodity.menu')@endcomponent
+        @component('rejected.menu')@endcomponent
+        @component('rejected.search.menu')@endcomponent
     </div>
     <div class="container-fluid">
         <div class="card col-md-8 offset-md-2">
@@ -16,6 +16,14 @@
                     @csrf
                     <div class="form-group row text-center">
                         <div class="col-12 text-danger">
+                            导入表格需要包含以下字段：
+                            退回单号，
+                            手机号，
+                            快递公司，
+                            条码，
+                            数量，
+                            品质(正品/ 残次/ 未知)，
+                            <br>可选字段：备注
                         </div>
                         <div class="col-12 text-info ">
                             导入时间随文件大小可能达数十分钟以上，请耐心等候

resources/views/rejected/search/menu.blade.php

@@ -7,10 +7,14 @@
                 </li> @endcan
             @can('退货管理-查询')
                 @cannot('退货管理-客户不可见')
-                <li class="nav-item">
-                    <a target="rejected/index/analyze" class="nav-link" href="{{url('rejected/index/analyze')}}" :class="{active:isActive('analyze',3)}">统计</a>
-                </li>@endcannot
+                    <li class="nav-item">
+                        <a target="rejected/index/analyze" class="nav-link" href="{{url('rejected/index/analyze')}}" :class="{active:isActive('analyze',3)}">统计</a>
+                    </li>@endcannot
             @endcan
+            @can('退货管理-录入')
+                <li class="nav-item">
+                    <a target="rejected/import" class="nav-link" href="{{url('rejected/index/import')}}" :class="{active:isActive('import',3)}">导入</a>
+                </li> @endcan
         </ul>
     </div>
 </div>

routes/web.php

@@ -328,6 +328,7 @@ Route::group(['prefix'=>'rejected'],function(){
     Route::group(['prefix'=>'index'],function(){
         Route::any('general','RejectedController@index');
         Route::any('analyze','RejectedController@indexAnalyze');
+        Route::get('import', 'RejectedController@import');
     });
     /** 分析 */
     Route::group(['prefix'=>'analyze'],function(){
@@ -340,7 +341,6 @@ Route::group(['prefix'=>'rejected'],function(){
     Route::post('ajaxCheck', 'RejectedController@ajaxCheck');
     Route::post('ajaxCheckAll', 'RejectedController@ajaxCheckAll');
     Route::post('ajaxFinishAll', 'RejectedController@ajaxFinishAll');
-    Route::get('import', 'RejectedController@import');
     Route::any('export', 'RejectedController@export');
     Route::any('exportAnalyze', 'RejectedController@exportAnalyze');
     Route::post('ajaxGetRejected', 'RejectedController@ajaxGetRejected');

runServes.sh

@@ -1,23 +1,27 @@
 
-ps -aux|grep laravel-echo-server |grep -v grep|awk '{print $2}'|xargs kill
-ps -aux|grep artisan |grep -v grep|awk '{print $2}'|xargs kill
+sudo ps -aux|grep laravel-echo-server |grep -v grep|awk '{print $2}'|sudo xargs kill
+sudo ps -aux|grep artisan |grep -v grep|awk '{print $2}'|sudo xargs kill
+sudo ps -aux|grep goExport |grep -v grep|awk '{print $2}'|sudo xargs kill
 
-nohup laravel-echo-server start >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
-nohup php artisan queue:work --tries=2 --delay=2 >/dev/null 2>&1 &
+cd /var/www/was
+nohup sudo su root -c "laravel-echo-server start" >/dev/null 2>&1 &
+cd /var/www/was
+nohup sudo su baoshi -c "php artisan queue:listen --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:listen --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo su baoshi -c "php artisan queue:work --tries=2 --delay=2" >/dev/null 2>&1 &
+nohup sudo ./serves/goExports >/dev/null 2>&1 &
 
 
-
-isExistStr=$(cat /etc/crontab|grep '* * * * * root cd /var/www_test/was && php artisan schedule:run >> /dev/null 2>&1')
+isExistStr=$(cat /etc/crontab|grep '* * * * * root cd /var/www/was && php artisan schedule:run >> /dev/null 2>&1')
 if [ ! -n "$isExistStr" ]; then
-echo -e '\n* * * * * root cd /var/www_test/was && php artisan schedule:run >> /dev/null 2>&1' >> /etc/crontab
+sudo echo -e '\n* * * * * root cd /var/www/was && php artisan schedule:run >> /dev/null 2>&1' >> /etc/crontab
 fi
-systemctl restart crond
+sudo systemctl restart crond