|
|
@@ -106,13 +106,14 @@ class InventoryService extends Service
|
|
|
$asset = Asset::whereIn('id',array_column($apply,'asset_id'))->get()->toArray();
|
|
|
$asset = array_column($asset,null,'id');
|
|
|
|
|
|
- $sub = [];$externalArray = [];
|
|
|
+ $sub = [];
|
|
|
foreach ($apply as $value){
|
|
|
$tmp = [];
|
|
|
$tmp = $asset[$value['asset_id']];
|
|
|
$tmp['t_id'] = $value['id'];
|
|
|
$tmp['t_state'] = $value['state'];
|
|
|
$tmp['t_remark'] = $value['remark'];
|
|
|
+ $tmp['t_state_name'] = InventoryOrderAsset::$name[$value['state']] ?? "";
|
|
|
if(! isset($sub[$value['located']])){
|
|
|
$sub[$value['located']] = [
|
|
|
'located' => $value['located'],
|
cqpCow