|
|
@@ -169,8 +169,10 @@ class StoreService
|
|
|
$owner = $owners_code_map[$asnHerder->customerid] ?? null;
|
|
|
$warehouse = $warehouses_code_map[$asnHerder->warehouseid] ?? null;
|
|
|
$status = null;
|
|
|
+ $fast = null;
|
|
|
if ($asnHerder->asnStatus && $asnHerder->asnStatus->codename_c == '完全收货') $status = '已入库';
|
|
|
if ($asnHerder->asnStatus && $asnHerder->asnStatus->codename_c == '订单创建') $status = '未入库';
|
|
|
+ if ($asnHerder->asnType && $asnHerder->asnType->codename_c == '调拨入库') $fast = '快速入库';
|
|
|
$params[] = [
|
|
|
'asn_code' => $asnHerder->asnno,
|
|
|
'warehouse_id' => $warehouse->id ?? null,
|
|
|
@@ -180,6 +182,7 @@ class StoreService
|
|
|
'remark' => $asnHerder->notes ?? null,
|
|
|
'created_at' => $asnHerder->addtime ?? null,
|
|
|
'updated_at' => $asnHerder->edittime ?? null,
|
|
|
+ 'is_fast_stored' => $fast,
|
|
|
];
|
|
|
}
|
|
|
return $params;
|
|
|
@@ -226,8 +229,10 @@ class StoreService
|
|
|
$owner_id = $owner->id ?? null;
|
|
|
$warehouse_id = $warehouse->id ?? null;
|
|
|
$status = null;
|
|
|
+ $fast = null;
|
|
|
if ($asnHerder->asnStatus && $asnHerder->asnStatus->codename_c == '完全收货') $status = '已入库';
|
|
|
if ($asnHerder->asnStatus && $asnHerder->asnStatus->codename_c == '订单创建') $status = '未入库';
|
|
|
+ if ($asnHerder->asnType && $asnHerder->asnType->codename_c == '调拨入库') $fast = '快速入库';
|
|
|
if ($store->asn_code != $asnHerder->asnno ||
|
|
|
$store->warehouse_id != $warehouse_id ||
|
|
|
$store->owner_id != $owner_id ||
|
|
|
@@ -244,6 +249,7 @@ class StoreService
|
|
|
'status' => $status ? $status : $asnHerder->asnStatus->codename_c,
|
|
|
'remark' => $asnHerder->notes,
|
|
|
'updated_at' => $asnHerder->edittime,
|
|
|
+ 'is_fast_stored' => $fast,
|
|
|
];
|
|
|
}
|
|
|
}
|