From 440392a932fb2dc8118caf1f4996e7d8b72574a1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 29 四月 2024 19:18:21 +0800
Subject: [PATCH] 编辑纤度检验支持编辑明细并重新生成个人生丝等级
---
models/yield_register.go | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/models/yield_register.go b/models/yield_register.go
index 8111b1e..b22e269 100644
--- a/models/yield_register.go
+++ b/models/yield_register.go
@@ -14,7 +14,7 @@
Number string `json:"number" gorm:"type:varchar(255);not null;comment:缂栧彿"`
CreateTime string `json:"createTime" gorm:"type:varchar(255);comment:鍒涘缓鏃堕棿"`
MarketId uint `json:"marketId" gorm:"type:int(11);comment:搴勫彛id"`
- WorkshopId uint `json:"workshopId" gorm:"type:int(11);comment:杞﹂棿id"`
+ WorkshopNumber string `json:"workshopNumber" gorm:"type:varchar(255);comment:杞﹂棿缂栫爜"`
GroupNumber int `json:"groupNumber" gorm:"type:int(11);comment:缁勫埆"`
Spec string `json:"spec" gorm:"type:varchar(255);comment:瑙勬牸"`
JieZhuang string `json:"jieZhuang" gorm:"type:varchar(255);comment:鏄惁缁撳簞"`
@@ -30,6 +30,9 @@
FallingSilkBucketOne decimal.Decimal `json:"fallingSilkBucketOne" gorm:"type:decimal(12,2);comment:钀戒笣妗舵暟1"`
FallingSilkBucketTwo decimal.Decimal `json:"fallingSilkBucketTwo" gorm:"type:decimal(12,2);comment:钀戒笣妗舵暟2"`
FallingSilkBucketThree decimal.Decimal `json:"fallingSilkBucketThree" gorm:"type:decimal(12,2);comment:钀戒笣妗舵暟3"`
+ SelectOne bool `json:"selectOne" gorm:"type:int(1);comment:钀戒笣妗舵暟1閫変腑"`
+ SelectTwo bool `json:"selectTwo" gorm:"type:int(1);comment:钀戒笣妗舵暟2閫変腑"`
+ SelectThree bool `json:"selectThree" gorm:"type:int(1);comment:钀戒笣妗舵暟3閫変腑"`
TheorySilkAmount decimal.Decimal `json:"theorySilkAmount" gorm:"type:decimal(12,2);comment:鐞嗚涓濋噺"`
HourYield decimal.Decimal `json:"hourYield" gorm:"type:decimal(12,2);comment:鍙版椂浜ч噺"`
OneBack string `json:"oneBack" gorm:"type:varchar(255);comment:绗竴鍥�"`
@@ -53,7 +56,7 @@
)
func (slf YieldRegister) TableName() string {
- return "yield_register"
+ return "silk_yield_register"
}
func NewYieldRegisterSearch() *YieldRegisterSearch {
@@ -90,8 +93,8 @@
return slf
}
-func (slf *YieldRegisterSearch) SetWorkshopId(workshopId uint) *YieldRegisterSearch {
- slf.WorkshopId = workshopId
+func (slf *YieldRegisterSearch) SetWorkshopNumber(workshopNumber string) *YieldRegisterSearch {
+ slf.WorkshopNumber = workshopNumber
return slf
}
@@ -120,8 +123,8 @@
db = db.Where("create_time = ?", slf.CreateTime)
}
- if slf.WorkshopId > 0 {
- db = db.Where("workshop_id = ?", slf.WorkshopId)
+ if slf.WorkshopNumber != "" {
+ db = db.Where("workshop_number = ?", slf.WorkshopNumber)
}
if slf.MarketId > 0 {
@@ -213,3 +216,15 @@
return nil
}
+
+func (slf *YieldRegisterSearch) Count() (int64, error) {
+ var (
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return total, fmt.Errorf("find count err: %v", err)
+ }
+ return total, nil
+}
--
Gitblit v1.8.0