|
@@ -99,10 +99,10 @@ class AssetDeviceJob implements ShouldQueue
|
|
|
if(empty($value['singleCode'])) continue;
|
|
|
|
|
|
$insert[] = [
|
|
|
- "assetCode" => htmlspecialchars($value['assetCode']) ?? "",
|
|
|
+ "assetCode" => $value['assetCode'] ?? "",
|
|
|
"assetNo" => $value['assetNo'] ?? "",
|
|
|
"assetType" => $value['assetType'] ?? "",
|
|
|
- "brand" => htmlspecialchars($value['brand']) ?? "",
|
|
|
+ "brand" => $value['brand'] ?? "",
|
|
|
"expectedLife" => $value['expectedLife'] ?? "",
|
|
|
"gs1" => $value['gs1'] ?? "",
|
|
|
"isKey" => $value['isKey'] ?? "",
|
|
@@ -139,6 +139,7 @@ class AssetDeviceJob implements ShouldQueue
|
|
|
->chunk(500,function ($data){
|
|
|
$data_array = $data->toArray();
|
|
|
|
|
|
+ $time = time();
|
|
|
$update = $insert = [];
|
|
|
foreach ($data_array as $value){
|
|
|
$bool = Asset::where('singleCode',$value->singleCode)->exists();
|
|
@@ -188,7 +189,7 @@ class AssetDeviceJob implements ShouldQueue
|
|
|
"useDept" => $value->useDept ?? "",
|
|
|
"userName" => $value->userName ?? "",
|
|
|
"version" => $value->version ?? "",
|
|
|
- "del_time" => 0,
|
|
|
+ "crt_time" => $time,
|
|
|
];
|
|
|
}
|
|
|
}
|