This commit is contained in:
jh_peng 2024-11-11 18:16:06 +08:00
parent e798008109
commit 23471ccda0

View File

@ -205,9 +205,10 @@ func OrderNumberHistogram(r *request.PackagePassProbabilityLine) []*model.Histog
} }
} }
for _, factory := range factories { for _, factory := range factories {
var pmc *model.PmcFile
global.Oracle.Where("pmc01 = ?", factory).Find(&pmc)
var tcSfcFile []*model.TcSfcFile var tcSfcFile []*model.TcSfcFile
global.Oracle.Where("tc_sfc08 LIKE ? AND tc_sfc04 = ?", "%AB%", factory).Where(sql). global.Oracle.Where("tc_sfc08 LIKE ? AND tc_sfc04 = ?", "%AB%", factory).Where(sql).
Preload("PmcFile").
Preload("TcSfdFile", func(db *gorm.DB) *gorm.DB { Preload("TcSfdFile", func(db *gorm.DB) *gorm.DB {
return db.Preload("ImaFile").Preload("RvaFile", func(db *gorm.DB) *gorm.DB { return db.Preload("ImaFile").Preload("RvaFile", func(db *gorm.DB) *gorm.DB {
return db.Preload("IddFile") return db.Preload("IddFile")
@ -264,7 +265,8 @@ func OrderNumberHistogram(r *request.PackagePassProbabilityLine) []*model.Histog
} }
} }
fTHistogram = append(fTHistogram, &model.Histogram{ fTHistogram = append(fTHistogram, &model.Histogram{
Field: factory, Field: pmc.Pmc03,
//Field: factory,
X: x, X: x,
Y: y, Y: y,
}) })