修改错误

app/Http/Model/Logic/PalletLogic.php

@@ -352,7 +352,7 @@ class PalletLogic
         }
         }
 
 
         foreach ($outStoreDetailData as $key=>$value){
         foreach ($outStoreDetailData as $key=>$value){
-            $value = array_merge($value,PickTaskDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray());
+            $value = array_merge(PickTaskDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray(),$value);
             $outStoreDetailData[$key] = CommonLogic::getHaveKeyCn($value);
             $outStoreDetailData[$key] = CommonLogic::getHaveKeyCn($value);
         }
         }
 
 

app/Http/Model/Logic/PickTaskLogic.php

@@ -174,7 +174,7 @@ class PickTaskLogic
         $returnData = $returnData->toArray();
         $returnData = $returnData->toArray();
 
 
         foreach ($returnData as $key=>$value){
         foreach ($returnData as $key=>$value){
-            $value = array_merge($value,OutStoreDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray());
+            $value = array_merge(OutStoreDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray(),$value);
             $returnData[$key] = CommonLogic::getHaveKeyCn($value);
             $returnData[$key] = CommonLogic::getHaveKeyCn($value);
             $returnData[$key]['piece_num'] = 1;
             $returnData[$key]['piece_num'] = 1;
         }
         }
@@ -507,7 +507,7 @@ class PickTaskLogic
         $returnData = $returnData->toArray();
         $returnData = $returnData->toArray();
 
 
         foreach ($returnData as $key=>$value){
         foreach ($returnData as $key=>$value){
-            $value = array_merge($value,PickTaskDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray());
+            $value = array_merge(PickTaskDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray(),$value);
             $returnData[$key] = CommonLogic::getHaveKeyCn($value);
             $returnData[$key] = CommonLogic::getHaveKeyCn($value);
         }
         }
         return $returnData;
         return $returnData;