yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 14:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-接口测试bug修复

Browse Source
This commit is contained in:
杨建炊 2024-08-14 17:40:14 +08:00
parent 9e50b007eb
commit 2a36638d75
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Imports/LossImport.php
View File

@ -65,14 +65,17 @@ class LossImport implements ToArray, SkipsEmptyRows
$lossRecords->buyer_name = $row[4] ?? ''; $lossRecords->buyer_name = $row[4] ?? '';
$lossRecords->phenomenon = $row[5] ?? ''; $lossRecords->phenomenon = $row[5] ?? '';
$lossRecords->reason = $row[6] ?? ''; $lossRecords->reason = $row[6] ?? '';
$lossRecords->date = DateTimeUtils::validateDate($row[7] ?? '') ? $row[7] : $today; $lossRecords->date = $today;
if(!empty($row[7])){
$lossRecords->date = DateTimeUtils::excelUploadDateToString($row[7],$today);
}
$lossRecords->save(); $lossRecords->save();
$updateIds = GoodSkuService::computeSkuStock($goodsSkuItem, ["num" => 0 - $row[2], 'cost' => $row[3]]); $updateIds += GoodSkuService::computeSkuStock($goodsSkuItem, ["num" => 0 - $row[2], 'cost' => $row[3]]);
} }
Log::info("报损导入内容:", $collection); Log::info("报损导入内容:", $collection);
// 批量更新 // 批量更新
event(new BatchStockUpdateEvent($updateIds)); event(new BatchStockUpdateEvent(collect($updateIds)->unique()->toArray()));
} }

9
app/Imports/PurchaseImport.php
View File

@ -68,7 +68,10 @@ class PurchaseImport implements ToArray, SkipsEmptyRows
$purchaseRecords->batch_number = $batch_number; $purchaseRecords->batch_number = $batch_number;
$purchaseRecords->num = $row[2]; $purchaseRecords->num = $row[2];
$purchaseRecords->cost = $row[3]; $purchaseRecords->cost = $row[3];
$purchaseRecords->date = DateTimeUtils::validateDate($row[6] ?? '') ? $row[6] : $today;; $purchaseRecords->date = $today;
if(!empty($row[6])){
$purchaseRecords->date = DateTimeUtils::excelUploadDateToString($row[6],$today);
}
$purchaseRecords->buyer_user_id = $buyerUserIdKeyByNameMap[$row[4]] ?? 0; $purchaseRecords->buyer_user_id = $buyerUserIdKeyByNameMap[$row[4]] ?? 0;
$purchaseRecords->buyer_name = $row[4] ?? ''; $purchaseRecords->buyer_name = $row[4] ?? '';
$purchaseRecords->supplier_name = $row[5] ?? ''; $purchaseRecords->supplier_name = $row[5] ?? '';
@ -76,11 +79,11 @@ class PurchaseImport implements ToArray, SkipsEmptyRows
$purchaseRecords->expire_time = Carbon::now()->addDays($expireDay)->toDateTimeString(); $purchaseRecords->expire_time = Carbon::now()->addDays($expireDay)->toDateTimeString();
$purchaseRecords->save(); $purchaseRecords->save();
$updateIds = GoodSkuService::computeSkuStock($goodsSkuItem, ["num" => $row[2], 'cost' => $row[3]]); $updateIds += GoodSkuService::computeSkuStock($goodsSkuItem, ["num" => $row[2], 'cost' => $row[3]]);
} }
Log::info("采购导入内容:", $collection); Log::info("采购导入内容:", $collection);
// 批量更新 // 批量更新
event(new BatchStockUpdateEvent($updateIds)); event(new BatchStockUpdateEvent(collect($updateIds)->unique()->toArray()));
} }
} }
} }

17
app/Utils/DateTimeUtils.php
View File

@ -2,6 +2,8 @@
namespace App\Utils; namespace App\Utils;
use Illuminate\Support\Facades\Log;
class DateTimeUtils class DateTimeUtils
{ {
/** /**
@ -44,8 +46,21 @@ class DateTimeUtils
} }
public static function validateDate($date, $format = 'Y-m-d') { public static function validateDate($date, $format = 'Y-m-d')
{
$d = \DateTime::createFromFormat($format, $date); $d = \DateTime::createFromFormat($format, $date);
return $d && $d->format($format) === $date; return $d && $d->format($format) === $date;
} }
public static function excelUploadDateToString($excelData, $defaultTime)
{
try {
return date("Y-m-d", ($excelData - 25569) * 24 * 3600);
} catch (\Exception $exception) {
Log::error("时间转化出错", $exception->getMessage());
}
return $defaultTime;
}
} }