|
|
@@ -41,7 +41,7 @@ class StoreItemService
|
|
|
$res= OracleDOCASNDetail::query()
|
|
|
->with(['lineStatus', 'qualityStatus'])
|
|
|
->whereIn('asnno',$item)
|
|
|
- ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','receivedqty','expectedqty','addtime','edittime')
|
|
|
+ ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','receivedqty','expectedqty_each','addtime','edittime')
|
|
|
->get();
|
|
|
if ($res->isEmpty())continue;
|
|
|
array_push($result,...$res);
|
|
|
@@ -114,7 +114,7 @@ class StoreItemService
|
|
|
'name' => $asnDetail->skudescrc,
|
|
|
'sku' => $asnDetail->sku,
|
|
|
'amount' => $asnDetail->receivedqty ?? 0,
|
|
|
- 'expected_amount' => $asnDetail->expectedqty ?? 0,
|
|
|
+ 'expected_amount' => $asnDetail->expectedqty_each ?? 0,
|
|
|
'quality' => $asnDetail->qualityStatus ? $asnDetail->qualityStatus->codename_c :'',
|
|
|
'status' => $status ? $status : $asnDetail->lineStatus->codename_c,
|
|
|
'created_at' => $asnDetail->addtime ?? null,
|
|
|
@@ -193,7 +193,7 @@ class StoreItemService
|
|
|
'sku' => $asnDetail['sku'],
|
|
|
'barcode' => $asnDetail['basSku'] ? $asnDetail['basSku']['alternate_sku1'] : '',
|
|
|
'amount' => $asnDetail['receivedqty'] ?? 0,
|
|
|
- 'expected_amount' => $asnDetail['expectedqty'] ?? 0,
|
|
|
+ 'expected_amount' => $asnDetail['expectedqty_each'] ?? 0,
|
|
|
'quality' => $asnDetail['qualityStatus'] ? $asnDetail['qualityStatus']['codename_c'] : '',
|
|
|
'status' => $status ? $status : $asnDetail['lineStatus']['codename_c'],
|
|
|
'created_at' => $asnDetail['addtime'] ?? null,
|
eric2h