From 1a2e7a46273fdb6eb53348f4e06100aa7854c3cf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 三月 2024 19:35:27 +0800
Subject: [PATCH] 新增或保存纤度登记表后进行纤度检查并保存结果到纤度检查表

---
 models/fineness_check_item.go |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/models/fineness_check_item.go b/models/fineness_check_item.go
index 0efd875..9a22f55 100644
--- a/models/fineness_check_item.go
+++ b/models/fineness_check_item.go
@@ -13,22 +13,20 @@
 		gorm.Model
 		FinenessRegisterID   uint `gorm:"not null;comment:绾ゅ害鐧昏琛↖D" json:"finenessRegisterID"` //绾ゅ害鐧昏琛↖D
 		FinenessCheckID      uint `gorm:"not null;comment:绾ゅ害妫�楠岃〃ID" json:"finenessCheckID"`    //绾ゅ害妫�楠岃〃ID
-		Position             int8 `json:"position"`                                           //杞﹀彿
-		FinenessRoundingItem FinenessRoundingItem
-		AverageFineness      decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:骞冲潎绾ゅ害" json:"averageFineness"` //骞冲潎绾ゅ害
-		MeasureFineness      decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鍏噺绾ゅ害" json:"measureFineness"` //鍏噺绾ゅ害
-		Deviation            decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鍋忓樊" json:"deviation"`         //鍋忓樊
-		TotalDeviation       decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鎬诲樊" json:"totalDeviation"`    //鎬诲樊
-		FinenessGrade        string          `gorm:"type:varchar(255);not null;comment:绾ゅ害绛夌骇" json:"finenessGrade"`    //绾ゅ害绛夌骇
-		Cleanliness          string          `gorm:"type:varchar(255);not null;comment:娓呮磥搴�" json:"cleanliness"`       //娓呮磥搴�
-		Purity               string          `gorm:"type:varchar(255);not null;comment:娲佸噣搴�" json:"purity"`            //娲佸噣搴�
-		TwiceChange          string          `gorm:"type:varchar(255);not null;comment:浜屽害鍙樺寲" json:"twiceChange"`      //浜屽害鍙樺寲
-		Remark               string          `gorm:"type:varchar(255);not null;comment:澶囨敞" json:"remark"`             //澶囨敞
+		Position             int  `json:"position"`                                           //杞﹀彿
+		FinenessRoundingItem []*FinenessRoundingItem
+		Deviation            decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鍋忓樊" json:"deviation"`      //鍋忓樊
+		TotalDeviation       decimal.Decimal `gorm:"type:decimal(12,2);not null;comment:鎬诲樊" json:"totalDeviation"` //鎬诲樊
+		FinenessGrade        string          `gorm:"type:varchar(255);not null;comment:绾ゅ害绛夌骇" json:"finenessGrade"` //绾ゅ害绛夌骇
+		Cleanliness          decimal.Decimal `gorm:"type:varchar(255);not null;comment:娓呮磥搴�" json:"cleanliness"`    //娓呮磥搴�
+		Purity               decimal.Decimal `gorm:"type:varchar(255);not null;comment:娲佸噣搴�" json:"purity"`         //娲佸噣搴�
+		TwiceChange          decimal.Decimal `gorm:"type:varchar(255);not null;comment:浜屽害鍙樺寲" json:"twiceChange"`   //浜屽害鍙樺寲
+		Remark               string          `gorm:"type:varchar(255);not null;comment:澶囨敞" json:"remark"`          //澶囨敞
 	}
 
 	FinenessRoundingItem struct {
 		Fineness decimal.Decimal `json:"fineness"` //绾ゅ害
-		Quantity decimal.Decimal `json:"quantity"` //鏁伴噺
+		Quantity int             `json:"quantity"` //鏁伴噺
 	}
 	FinenessCheckItemSearch struct {
 		FinenessCheckItem

--
Gitblit v1.8.0