Skip to content

CnChunfeng / scm_wms_outstore_service

Go to a project
Commit 4a94589e by Joneq
Options

修改错误

parent cf1a4c9a
Inline Side-by-side
Showing with 3 additions and 3 deletions
app/Http/Model/Logic/PalletLogic.php
......@@ -352,7 +352,7 @@ class PalletLogic
}
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);
}
......
app/Http/Model/Logic/PickTaskLogic.php
......@@ -174,7 +174,7 @@ class PickTaskLogic
$returnData = $returnData->toArray();
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]['piece_num'] = 1;
}
......@@ -507,7 +507,7 @@ class PickTaskLogic
$returnData = $returnData->toArray();
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);
}
return $returnData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment