为机器人波次处理商品时增加一次库位校长，编辑中

app/Services/OrderCommodityService.php

@@ -37,12 +37,13 @@ class OrderCommodityService
             ->where('orderno',data_get($orderCommodities,'*.order.code')??[])
             ->where('waveno',data_get($orderCommodities,'*.order.batch.code')??[])
             ->get(['orderno','location','waveno']);
-//        foreach($orderCommodities as $orderCommodity){
-//            $detail->where()
-//            foreach ($details as $detail){
-//                if($detail['orderno']==)
-//            }
-//        }
+        foreach($orderCommodities as $orderCommodity){
+            $a=$details
+                ->where('orderno',$orderCommodity['order']['code'])
+                ->where('waveno',$orderCommodity['order']['batch']['code'])
+                ->first();
+            dump($a);
+        }
 //        dd($details);
     }
     public function batchUpdate($updateParams){

app/Services/StationTaskMaterialBoxService.php

@@ -75,7 +75,7 @@ class StationTaskMaterialBoxService
         $stationMaterialBoxes_toCreate=new Collection();
         $order_ids=data_get($batch['orders'],'*.id');
         $orderCommodities=OrderCommodity::query()->with('orderBin')->whereIn('order_id',$order_ids)->get();
-//        $orderCommodities=$this->orderCommodityService->correctLocation_fromWMS($orderCommodities);
+        $orderCommodities=$this->orderCommodityService->correctLocation_fromWMS($orderCommodities);
         if($orderCommodities->isEmpty())return $stationMaterialBoxes_toCreate;
         $stationType=$this->stationTypeService->getForMaterialBox_onBatchProcess();
         $stationTaskBatch=$this->stationTaskBatchService->get(['batch_id'=>$batch['id']])->first();