|
|
@@ -85,16 +85,24 @@ class StoreService
|
|
|
/** @var OracleDocAsnHerderService $oracleDocAsnHerderService */
|
|
|
$oracleDocAsnHerderService = app(OracleDocAsnHerderService::class);
|
|
|
$last_time = $this->getAsnLastSyncAt($updated_at, 'update');
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '获取上次更新时间:' . $last_time );
|
|
|
$asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateEdit($last_time);
|
|
|
if (count($asnHerders)<1) return;
|
|
|
$last_time = $asnHerders->first()['edittime'];
|
|
|
$last_records = $asnHerders->where('edittime', $last_time);
|
|
|
$this->createStore($asnHerders,"update");
|
|
|
+
|
|
|
$this->updateStore($asnHerders);
|
|
|
+
|
|
|
$this->createStoreRejected($asnHerders);
|
|
|
+
|
|
|
$this->deleteCacheKey($update_set, $update_keys);
|
|
|
+
|
|
|
$this->setLastRecordsByRedis($update_key, $update_set, $update_keys, $last_records);
|
|
|
+
|
|
|
$this->setAsnLastSyncAt($updated_at, $last_time);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public function createStore($asnHerders,$isUpdate=null)
|
|
|
@@ -129,6 +137,8 @@ class StoreService
|
|
|
$rejectedBillService = app(RejectedBillService::class);
|
|
|
$rejectedBillService->syncLoadedStatusByAsnHerder($asnHerders);
|
|
|
if (!$isUpdate)$this->pushJob($asnHerders);
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 更新中创建createStore:' . $asnHerders );
|
|
|
unset($asnHerders, $owners_code_map, $warehouses_code_map);
|
|
|
}
|
|
|
|
|
|
@@ -223,7 +233,11 @@ class StoreService
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
- if (count($updateParams) > 1) $this->batchUpdate($updateParams);
|
|
|
+ if (count($updateParams) > 1) {
|
|
|
+ $res=$this->batchUpdate($updateParams);
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 批量更新:' . $res . ' | '.json_encode($updateParams));
|
|
|
+ }
|
|
|
/** @var StoreItemService $storeItemService */
|
|
|
$storeItemService = app(StoreItemService::class);
|
|
|
$storeItemService->storeItemUpdateByWms($asnHerders);
|
|
|
@@ -231,6 +245,8 @@ class StoreService
|
|
|
$rejectedBillService = app(RejectedBillService::class);
|
|
|
$rejectedBillService->syncLoadedStatusByAsnHerder($asnHerders);
|
|
|
$this->pushJob($asnHerders);
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 updateStore:'.$updateParams);
|
|
|
unset($updateParams, $asnHerders);
|
|
|
}
|
|
|
|
|
|
@@ -279,7 +295,7 @@ class StoreService
|
|
|
'name' => $key,
|
|
|
'value' => $last_time,
|
|
|
]);
|
|
|
- LogService::log(__METHOD__, __FUNCTION__, '修改或更新' . $key . json_encode($asnLastSyncAt));
|
|
|
+ LogService::log(__METHOD__, __FUNCTION__, '11 setAsnLastSyncAt' . $key . json_encode($asnLastSyncAt));
|
|
|
return $asnLastSyncAt;
|
|
|
}
|
|
|
|
|
|
@@ -293,6 +309,8 @@ class StoreService
|
|
|
}
|
|
|
Cache::forget($keys);
|
|
|
}
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 deleteCacheKey:' );
|
|
|
}
|
|
|
|
|
|
public function setLastRecordsByRedis($prefixKey, $set, $keys, $last_records)
|
|
|
@@ -304,6 +322,8 @@ class StoreService
|
|
|
}
|
|
|
Cache::put($keys, $cacheKeys);
|
|
|
Cache::put($set, true);
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 setLastRecordsByRedis:'. $prefixKey.'||'. $set.'||'. $keys.'||'. $last_records);
|
|
|
}
|
|
|
|
|
|
public function createInstantBill(Store $store): bool
|
|
|
@@ -410,6 +430,8 @@ class StoreService
|
|
|
];
|
|
|
}
|
|
|
if (count($insert_param)>0) StoreRejected::query()->insert($insert_param);
|
|
|
+ app('LogService')
|
|
|
+ ->log(__METHOD__, __FUNCTION__, '11 createStoreRejected:'.$insert_param );
|
|
|
}
|
|
|
|
|
|
/**
|