diff --git a/go.mod b/go.mod index a9a0755..059f234 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.22.5 require ( gitee.com/golang-module/carbon/v2 v2.3.11 + gitee.com/simmons0530/pengUtils v0.0.3 github.com/casbin/casbin/v2 v2.100.0 github.com/casbin/gorm-adapter/v3 v3.21.0 github.com/dzwvip/oracle v1.3.0 diff --git a/go.sum b/go.sum index 617670a..c7fa9fb 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ gitee.com/golang-module/carbon/v2 v2.3.11 h1:lnHx65PlT/U0htW4c2fegVbDW3t5JuFT0ySQl1686EY= gitee.com/golang-module/carbon/v2 v2.3.11/go.mod h1:10QdzWG6q/NUePI6ag183B0313WrwdtM0zMCWPdTLD8= +gitee.com/simmons0530/pengUtils v0.0.3 h1:+FFoDHdsF+lz+d9j0NiYqbuyBvXZ+CTvtQ/UdSyROkk= +gitee.com/simmons0530/pengUtils v0.0.3/go.mod h1:xgWu9W5SxawYI9jOYHkLz5IOHAGc6+gbaFTxDRPtOcA= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0/go.mod h1:ON4tFdPTwRcgWEaVDrN3584Ef+b7GgSJaXxe5fW9t4M= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= diff --git a/repository/report_reader/ft_reader.go b/repository/report_reader/ft_reader.go index 61bef3c..0200bbe 100644 --- a/repository/report_reader/ft_reader.go +++ b/repository/report_reader/ft_reader.go @@ -39,17 +39,17 @@ func FTSMCReportReader(filePath string) { if errors.Is(global.PostGreSQL.Where("step = ? AND product = ? AND lot = ? AND sub_batch = ?", "FT", row[titleMap[finalReportExcel.Product]], row[titleMap[finalReportExcel.Lot]], row[titleMap[finalReportExcel.SubBatch]]).First(&report).Error, gorm.ErrRecordNotFound) { + orderDataArray := strings.Split(info["order_date"], " ") global.PostGreSQL.Create(&model.FinalReport{ - Step: "FT", - Product: info["product"], - Lot: info["lot"], - Factory: pmc.Pmc03, - TestProgram: info["test_program"], - PBI: info["pbi"], - SubBatch: info["sub_batch"], - ReportTestQuantity: info["report_test_quantity"], - OrderDate: carbon.Parse(strings.ReplaceAll(strings.ReplaceAll(info["order_date"][:10], - " ", ""), "/", "-")).Format("Y-m-d"), + Step: "FT", + Product: info["product"], + Lot: info["lot"], + Factory: pmc.Pmc03, + TestProgram: info["test_program"], + PBI: info["pbi"], + SubBatch: info["sub_batch"], + ReportTestQuantity: info["report_test_quantity"], + OrderDate: carbon.ParseByFormat(strings.ReplaceAll(orderDataArray[0], " ", ""), "Y/n/j").Format("Y-m-d"), ReportPassQuantity: info["report_pass_quantity"], ReportPassProbability: info["report_pass_probability"], Bin1: info["bin1"],