与富勒接口的修复，

两处BUG修复

app/Http/Controllers/StoreController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Depository;
+use App\Http\Controllers\Api\thirdPart\flux\StoreController as FStoreController;
 use App\Owner;
 use App\Store;
 use App\StoreItems;
@@ -72,7 +73,7 @@ class StoreController extends Controller
         $store->save();
         if ($WMSReflectReceive->skus){
             foreach ($WMSReflectReceive->skus as $sku){
-                $depository=Depository::where('code',$WMSReflectReceive->LOTATT05)->first();
+                $depository=Depository::where('code',$sku->LOTATT05)->first();
                 if (!$depository){
                     $depository=new Depository([
                         'name'=>$sku->LOTATT05,
@@ -94,7 +95,7 @@ class StoreController extends Controller
             }
         }
         $store=Store::with('storeItems')->where('asn_code',$request->input('asn_code'))->first();
-        $storeApi=new \App\Http\Controllers\Api\thirdPart\flux\StoreController();
+        $storeApi=new FStoreController();
         $result=$storeApi->accomplishToWMS($store);
         if ($result){
             $store->status='已入库';

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

@@ -13,7 +13,6 @@ use App\SkuNew;
 use App\Store;
 use App\WMSReflectReceive;
 use App\WMSReflectReceiveSku;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
@@ -27,26 +26,29 @@ class ReceiveController extends Controller
      */
     public function new_(Request $request)
     {
-        $now=Carbon::now();
-        (new Controller())->log(__METHOD__,'time1_'.__FUNCTION__,$now->toDateTimeString());
+
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
-        $errors=$this->validatorForNew($request->all())->errors();
-        (new Controller())->log(__METHOD__,'time_validated_'.__FUNCTION__,Carbon::now()->diffInMicroseconds($now));
-        if(count($errors)>0){
-            $this->log(__METHOD__, 'error_body' . __FUNCTION__, json_encode($request->getContent()));
-            (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'fields wrong, see Errors report please.'.'|'.json_encode($request).'|'.json_encode($errors));
-            return response()->json(['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
-                'errors'=>$errors]])
-                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        $isNotAHugeList=(function()use(&$request){
+            $requestArr=$request->input('request');
+            return $requestArr&&isset($requestArr[0])&&isset($requestArr[0]['SKU_LIST'])
+                &&count($request->input('request')[0]['SKU_LIST'])<=100;
+        })();
+        if($isNotAHugeList){
+            $errors=$this->validatorForNew($request->all())->errors();
+            if(count($errors)>0){
+                $this->log(__METHOD__, 'error_body' . __FUNCTION__, json_encode($request->getContent()));
+                (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'fields wrong, see Errors report please.'.'|'.json_encode($request).'|'.json_encode($errors));
+                return response()->json(['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
+                    'errors'=>$errors]])
+                    ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+            }
         }
-        (new Controller())->log(__METHOD__,'time_3_'.__FUNCTION__,Carbon::now()->toDateTimeString());
         $receiveInputs=$request->input('request');
-        (new Controller())->log(__METHOD__,'time_3_'.__FUNCTION__,Carbon::now()->toDateTimeString());
         foreach ($receiveInputs as $receiveInput){
             $isRepeated=WMSReflectReceive::where('ASNNO',$receiveInput['ASNNO'])->first();
             if($isRepeated){
-                (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'ASNNO重复'.'|'.json_encode($request).'|'.json_encode($errors));
+                (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'ASNNO重复'.'|'.json_encode($request));
                 return response()->json(['response'=>['flag'=>'N','code'=>'6666','message'=>'ASNNO重复']])
                     ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
             }
@@ -61,7 +63,6 @@ class ReceiveController extends Controller
             if(isset($receive['ASNREFERENCE3']))
                 event(new WmsReceiveNewEvent($receive['ASNREFERENCE3'],$receive));
         }
-        (new Controller())->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->getContent()));
         return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])
             ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
     }
@@ -208,7 +209,7 @@ class ReceiveController extends Controller
 //                                    \"LOTATT05\": \"{$sku['LOTATT05']}\",
 //                                    \"UNIQUE_CODE\": \"\"
 //                                }
-                            "]
+                        "]
                         }
                     ";
                     $skuStrList[]=$skuStr;

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

@@ -7,8 +7,6 @@ use App\RejectedBillItem;
 use App\Store;
 use App\WMSReflectReceive;
 use App\WMSReflectReceiveSku;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
 use Zttp\Zttp;
 
 class StoreController extends Controller
@@ -21,23 +19,13 @@ class StoreController extends Controller
      */
     public function accomplishToWMS(Store $store)
     {
-        $wmsReceiveds=WMSReflectReceive::where('ASNREFERENCE3',$store['asn_code'])
-            ->where('is_uploaded',0)->get();
+        $wmsReceiveds=WMSReflectReceive::where('ASNNO',$store['asn_code'])->get();
         if($wmsReceiveds->isEmpty()){
-            (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'没有WMS入库单');
+            (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'没有本地WMS入库单');
             return false;
         }
-        $items=$store->items()->get();
-        $amountsItem=(function()use($items){
-            $result=[];
-            $items->each(function($item)use(&$result){
-                $result[$item['id']]= $item['amount'];
-            });
-            return $result;
-        })();
         $success=true;
-        $wmsReceiveds->each(function ($wmsReceived)use(&$store,&$amountsItem,$items,&$success){
-            if(!$store && $store['is_loaded']!=0)return;
+        $wmsReceiveds->each(function ($wmsReceived)use(&$store,&$amountsItem,&$success){
 
             $wmsSkus=$wmsReceived->skus()->get();
             $orderNumberCode=$wmsReceived['ASNREFERENCE1']??$store['order_number'];
@@ -50,46 +38,24 @@ class StoreController extends Controller
             })();
             $skuStrList=[];
             $customerCode=$store->owner()->first()['code'];
-            $wmsSkus->each(function(WMSReflectReceiveSku $sku)use(&$items,&$skuList,&$amountsItem,&$amountsSku,&$skuStrList,$wmsReceived,$customerCode){
-                $items->each(function(RejectedBillItem $item)use(&$sku,&$amountsItem,&$amountsSku,&$skuStrList,$wmsReceived,$customerCode){
-                    if($item['barcode_goods']!=$sku['ALTERNATE_SKU1'])return;
-                    if($amountsItem[$item['id']]==0||$amountsSku[$sku['id']]==0)return;
-                    $uploadingAmount=(function()use(&$item,&$sku,&$amountsItem,&$amountsSku){
-                        if($amountsItem[$item['id']]>$amountsSku[$sku['id']]){
-                            $amountsItem[$item['id']]-=$amountsSku[$sku['id']];
-                            $amount= $amountsSku[$sku['id']];
-                            $amountsSku[$sku['id']]=0;
-                            return $amount;
-                        }
-                        if($amountsItem[$item['id']]<$amountsSku[$sku['id']]){
-                            $amount=$amountsItem[$item['id']];
-                            $amountsSku[$sku['id']]-=$amount;
-                            $amountsItem[$item['id']]=0;
-                            return $amount;
-                        }
-                        $amount=$amountsItem[$item['id']];
-                        $amountsItem[$item['id']]=0;
-                        $amountsSku[$sku['id']]=0;
-                        return $amount;
-                    })();
-                    if($item['is_loaded']=='已入库'){return;}
-                    $STATUS=$item['id_quality_label']==1?'ZP':'CC';
-                    $STATUS_code=$item['id_quality_label']==1?'01':'02';
-                    $skuStr="
+            $wmsSkus->each(function(WMSReflectReceiveSku $sku)use(&$skuList,&$amountsItem,&$amountsSku,&$skuStrList,$wmsReceived,$customerCode) {
+//                    $STATUS=$item['id_quality_label']==1?'ZP':'CC';
+                $STATUS = 'ZP';
+//                    $STATUS_code=$item['id_quality_label']==1?'01':'02';
+                $STATUS_code = '01';
+                $skuStr = "
                         {
                             \"ORDERNUMBERCODE\": \"{$wmsReceived['ASNNO']}\",
                             \"ASNLINENO\": \"{$sku['ASNLINENO']}\",
                             \"SKUCODE\": \"{$sku['SKU']}\",
-                            \"QUANTITY\": \"{$uploadingAmount}\",
+                            \"QUANTITY\": \"{$sku['EXPECTEDQTY_EACH']}\",
                             \"LOTATT04\": \"{$sku['LOTATT04']}\",
                             \"LOTATT05\": \"{$sku['LOTATT05']}\",
                             \"STATUS\": \"{$STATUS}\",
-                            \"PRODUCTION DATE\": \"{$item['made_at']}\",
-                            \"EXPIRATION DATE\": \"{$item['validity_at']}\",
                             \"USERDEFINE1\": \"{$customerCode}{$STATUS_code}\",
                             \"USERDEFINE2\": \"\",
                             \"USERDEFINE3\": \"\",
-                            \"UNIQUE_CODE_LIST\": [".
+                            \"UNIQUE_CODE_LIST\": [" .
 //                                {
 //                                    \"ORDERNUMBERCODE\": \"{$wmsReceived['ASNNO']}\",
 //                                    \"SKUCODE\": \"{$sku['SKU']}\",
@@ -99,22 +65,20 @@ class StoreController extends Controller
 //                                    \"LOTATT05\": \"{$sku['LOTATT05']}\",
 //                                    \"UNIQUE_CODE\": \"\"
 //                                }
-                            "]
+                    "]
                         }
                     ";
-                    $skuStrList[]=$skuStr;
-                });
+                $skuStrList[] = $skuStr;
             });
-            if(count($skuStrList)==0)return;
             $skuStrList = implode(',',$skuStrList);
             $json="
                 {
                     \"request\": [
                         {
                             \"ORDERNUMBERCODE\": \"{$wmsReceived['ASNNO']}\",
-                            \"CUSTOMERID\": \"{$customerCode}\",
+                            \"CUSTOMERID\": \"{$wmsReceived['CUSTOMERID']}\",
                             \"ASNTYPE\": \"{$wmsReceived['ASNTYPE']}\",
-                            \"ASNREFERENCE1\": \"{$orderNumberCode}\",
+                            \"ASNREFERENCE1\": \"{$wmsReceived['ASNREFERENCE1']}\",
                             \"ADDWHO\": \"WCS\",
                             \"USERDEFINE1\": \"\",
                             \"USERDEFINE2\": \"\",
@@ -130,30 +94,32 @@ class StoreController extends Controller
             $response = Zttp::post($url, $sendingJson);
             $noIssues=true;
             $json = $response->json();
-            (new Controller())->log(__METHOD__,__FUNCTION__,$response->body().'|'.json_encode($sendingJson));
+            (new Controller())->log(__METHOD__,__FUNCTION__,$response->body());
             if(!$json||!isset($json['Response'])||!$json['Response']['return']['returnFlag']=='1'){
                 $noIssues=false;
             }
             if($json&&isset($json['Response'])){
                 if($json['Response']['return']['returnFlag']=='2'){
+                    (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body());
                     return true;
                 }
                 if(isset($json['Response']['return']['returnDesc'])&&strpos($json['Response']['return']['returnDesc'],'唯一约束')!==false){
-                    (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body().'|'.json_encode($sendingJson));
+                    (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body());
                     return true;
                 }
                 if(isset($json['Response']['return']['errordescr'])&&strpos($json['Response']['return']['errordescr'],'已完成')!==false){
-                    (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body().'|'.json_encode($sendingJson));
+                    (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body());
                     return true;
                 }
             }
             if($noIssues&&$json['Response']['return']['returnFlag']=='1'){
                 $wmsReceived['is_uploaded']=1;
                 $wmsReceived->save();
+                (new Controller())->log(__METHOD__, 'success_' . __FUNCTION__, $response->body() );
                 return true;
-            }else{
-                $success=false;
-                (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,$response->body().'|'.json_encode($sendingJson));
+            }else {
+                $success = false;
+                (new Controller())->log(__METHOD__, 'error_' . __FUNCTION__, $response->body());
             }
         });
 

app/Warehouse.php

@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class Warehouse extends Model
 {
-    //
+    protected $fillable=['name','code'];
 }

routes/web.php

@@ -101,5 +101,5 @@ Route::resource('package','PackageController');
 
 Route::get('store','StoreController@index');
 Route::resource('store/fast','StoreController');
-Route::resource('store/storeItem','storeItemsController');
+Route::resource('store/storeItem','StoreItemsController');