Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/RejectedController.php

@@ -422,7 +422,7 @@ class RejectedController extends Controller
             "logistic_number"=>"原单单号","logistic_number_return"=>"退回单号","logistic_name"=>"退回公司",
             "fee_collected"=>"到付费用","loaded"=>"是否入库",
             "item_barcode"=>"商品条码","item_name"=>"商品名称",
-            "item_amount"=>"商品数量","quality_label_name"=>"商品质量","operator_name"=>"录入人"
+            "item_amount"=>"商品数量","quality_label_name"=>"商品质量","operator_name"=>"录入人","remark"=>"退单备注"
         ])->direct();
     }
 

app/Http/Controllers/StorageController.php

@@ -125,7 +125,7 @@ class StorageController extends Controller
         ]);
 
         //重新调取料箱
-        app("ForeignHaiRoboticsService")->paddingCacheShelf($station->get());
+        app("ForeignHaiRoboticsService")->paddingCacheShelf(Station::query()->whereIn("code",$boxes)->get());
         $this->success(["data"=>$data,"boxes"=>$boxes]);
     }
 

app/RejectedBill.php

@@ -25,7 +25,7 @@ class RejectedBill extends Model
     protected $fillable=['id_owner','order_number','sender','mobile_sender',
         'logistic_number','logistic_number_return','id_logistic_return',
         'is_loaded','fee_collected','remark','id_operator','is_checked',
-        'is_finished','checked_numbers','remark','common_01','common_02'];
+        'is_finished','checked_numbers','common_01','common_02'];
 
     /*
      *  id_owner                    货主

app/Services/ForeignHaiRoboticsService.php

@@ -530,6 +530,7 @@ class ForeignHaiRoboticsService
             $stationCollection->add($station->code);
             $blacklist[] = $box->id;
         }
+        //TODO
         LogService::log("补充料箱","填充入口",json_encode($stationCollection->toArray(),JSON_UNESCAPED_UNICODE).' | '.json_encode($collection->toArray(),JSON_UNESCAPED_UNICODE));
         $this->fetchGroup_multiLocation($stationCollection,$collection,'','立架出至缓存架');
     }