From 3d514e52551e6bd4a1f4c5006c44150bbe246acc Mon Sep 17 00:00:00 2001 From: jh_peng Date: Tue, 19 Nov 2024 10:24:19 +0800 Subject: [PATCH] V0 --- repository/test.data/report.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/repository/test.data/report.go b/repository/test.data/report.go index 908d149..2173b25 100644 --- a/repository/test.data/report.go +++ b/repository/test.data/report.go @@ -627,6 +627,8 @@ func SaveFT(report *model.Report) { //pbi, product, lot, subBatch string, datas := make([][]string, 0) fieldMap := make(map[string]int) sbinHbinMap := make(map[string]string) + binCounter := make(map[string]int) + siteCounters := make(map[string]map[string]int) for _, ftFile := range ftFiles { fileDatas := make([][]string, 0) if _, err := os.Stat(ftFile.Path); err != nil { @@ -655,22 +657,20 @@ func SaveFT(report *model.Report) { //pbi, product, lot, subBatch string, if len(datas) >= 1 { datas = append(datas, fileDatas[1:]...) } + + for _, data := range fileDatas { + binCounter[data[fieldMap["SOFT_BIN"]]]++ + if _, ok := siteCounters[data[fieldMap["SITE_NUM"]]]; !ok { + siteCounters[data[fieldMap["SITE_NUM"]]] = make(map[string]int) + } + siteCounters[data[fieldMap["SITE_NUM"]]][data[fieldMap["SOFT_BIN"]]]++ + } + ft.Close() //sbinHbinMap := make(map[string]map[string]string) sbinHbinByte := []byte(ftFile.SbinHbin) _ = json.Unmarshal(sbinHbinByte, &sbinHbinMap) } - - binCounter := make(map[string]int) - siteCounters := make(map[string]map[string]int) - for _, data := range datas { - binCounter[data[fieldMap["SOFT_BIN"]]]++ - if _, ok := siteCounters[data[fieldMap["SITE_NUM"]]]; !ok { - siteCounters[data[fieldMap["SITE_NUM"]]] = make(map[string]int) - } - siteCounters[data[fieldMap["SITE_NUM"]]][data[fieldMap["SOFT_BIN"]]]++ - } - var rtFiles []*model.FileHandled var passCounter int if !errors.Is(global.PostGreSQL.Where("pbi = ? AND product = ? AND lot = ? AND sub_batch = ? AND step = ?",