与富勒接口的修复

app/Http/Controllers/StoreController.php

@@ -115,7 +115,11 @@ class StoreController extends Controller
         }
         $store=Store::with('storeItems')->where('asn_code',$request->input('asn_code'))->first();
         $storeApi=new FStoreController();
-        $result=$storeApi->accomplishToWMS($store,['quality'=>$request->input('quality'),'depository_code'=>$request->input('depository_code')]);
+        $result=$storeApi->accomplishToWMS($store,[
+            'quality'=>$request->input('quality'),
+            'depository_code'=>$request->input('depository_code'),
+            'follow_code'=>$store['id'],
+            ]);
         if ($result){
             $store->status='已入库';
             $store->save();

app/Http/Controllers/api/thirdPart/flux/StoreController.php

@@ -43,11 +43,9 @@ class StoreController extends Controller
             $customerCode=$store->owner()->first()['code'];
             $wmsSkus->each(function(WMSReflectReceiveSku $sku)use(&$skuList,&$amountsItem,&$amountsSku,&$skuStrList,$wmsReceived,$customerCode,&$inputs) {
                 $STATUS = 'ZP';
-                $STATUS_code = '01';
                 if(isset($inputs['quality'])&&$inputs['quality']
                     &&$inputs['quality']!='正品') {
                     $STATUS = 'CC';
-                    $STATUS_code = '02';
                 }
                 $repositoryCode=$sku['LOTATT05'];
                 if(isset($inputs['depository_code'])&&$inputs['depository_code']){
@@ -62,7 +60,7 @@ class StoreController extends Controller
                             \"LOTATT04\": \"{$sku['LOTATT04']}\",
                             \"LOTATT05\": \"{$repositoryCode}\",
                             \"STATUS\": \"{$STATUS}\",
-                            \"USERDEFINE1\": \"{$customerCode}{$STATUS_code}\",
+                            \"USERDEFINE1\": \"{$inputs['follow_code']}\",
                             \"USERDEFINE2\": \"\",
                             \"USERDEFINE3\": \"\",
                             \"UNIQUE_CODE_LIST\": [" .

app/Jobs/MarkPackageExcepted.php

@@ -38,7 +38,7 @@ class MarkPackageExcepted implements ShouldQueue
             $controller->log(__METHOD__,'error_'.__FUNCTION__,"队列传递的package为空",null);
             return;
         }
-        $pickedPackage=Package::where('id',$this->package->id)->select('id','delivery_number','status')->first();
+        $pickedPackage=Package::where('id',$this->package->id)->first();
         if(!$pickedPackage){
             $controller->log(__METHOD__,'error_'.__FUNCTION__,"队列查询的package为空",null);
             return;

app/Providers/AppServiceProvider.php

@@ -2,6 +2,9 @@
 
 namespace App\Providers;
 
+use App\Http\Controllers\Controller;
+use Illuminate\Queue\Events\JobFailed;
+use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 
@@ -26,5 +29,9 @@ class AppServiceProvider extends ServiceProvider
     {
         //
         Schema::defaultStringLength(191);
+        Queue::failing(function (JobFailed $event) {
+            (new Controller())->log(__METHOD__,'EventError_',"$event -> connectionName:{$event->connectionName},$event-> job:{$event->job},
+                $event-> exception:{$event->exception}");
+        });
     }
 }

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css",
-    "/js/singles/rejectedIndex200305.js": "/js/singles/rejectedIndex200305.js",
+    "/js/singles/rejectedIndex200310.js": "/js/singles/rejectedIndex200310.js",
     "/favicon.ico": "/favicon.ico"
 }