From 2d911d76bffda47005f8a30eb8f3719316bf43c9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 26 六月 2024 16:29:47 +0800
Subject: [PATCH] update doc
---
models/operation_details.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/models/operation_details.go b/models/operation_details.go
index 13b8463..16f65f4 100644
--- a/models/operation_details.go
+++ b/models/operation_details.go
@@ -12,8 +12,8 @@
OperationDetails struct {
WmsModel
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- OperationID int `json:"operationId" gorm:"type:int;not null;comment:鎿嶄綔璁板綍id"` //鎿嶄綔id
- ProductId string `json:"productId" gorm:"type:varchar(191);not null;comment:浜у搧id"` //浜у搧id
+ OperationID int `json:"operationId" gorm:"index;type:int;not null;comment:鎿嶄綔璁板綍id"` //鎿嶄綔id
+ ProductId string `json:"productId" gorm:"type:varchar(191);not null;comment:浜у搧id"` //浜у搧id
//ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
Amount decimal.Decimal `json:"amount" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"` //鏁伴噺
//Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"` //鍗曚綅
@@ -25,16 +25,25 @@
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
TotalGrossWeight decimal.Decimal `json:"totalGrossWeight" gorm:"type:decimal(20,3);comment:鎬绘瘺閲�"`
TotalNetWeight decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:鎬诲噣閲�"`
+ AuxiliaryAmount decimal.Decimal `json:"auxiliaryAmount" gorm:"type:decimal(20,3);comment:杈呭姪鏁伴噺"`
+ AuxiliaryUnit string `json:"auxiliaryUnit" gorm:"type:varchar(191);comment:杈呭姪鍗曚綅"`
+ Remark string `gorm:"type:varchar(1024);comment:澶囨敞" json:"remark"`
+ IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+
+ Cost decimal.Decimal `json:"cost" ` //鎴愭湰鍗曚环
+ SalePrice decimal.Decimal `json:"salePrice" ` //閿�鍞崟浠�
}
OperationDetailsSearch struct {
OperationDetails
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ OperationIDs []int
+ Fields string
}
)
@@ -81,6 +90,16 @@
return slf
}
+func (slf *OperationDetailsSearch) SetOperationIds(operationIds []int) *OperationDetailsSearch {
+ slf.OperationIDs = operationIds
+ return slf
+}
+
+func (slf *OperationDetailsSearch) SetFields(fields string) *OperationDetailsSearch {
+ slf.Fields = fields
+ return slf
+}
+
func (slf *OperationDetailsSearch) SetProductId(productId string) *OperationDetailsSearch {
slf.ProductId = productId
return slf
@@ -109,6 +128,14 @@
}
if slf.Preload {
db = db.Preload("Product")
+ }
+
+ if len(slf.OperationIDs) > 0 {
+ db = db.Where("operation_id in ?", slf.OperationIDs)
+ }
+
+ if slf.Fields != "" {
+ db = db.Select(slf.Fields)
}
return db
@@ -274,3 +301,14 @@
return records, nil
}
+
+func (slf *OperationDetailsSearch) GroupSum(groupField string, sumField string) ([]*GroupSum, error) {
+ var (
+ db = slf.build()
+ result = make([]*GroupSum, 0)
+ )
+ if err := db.Select("sum(" + sumField + ") as sum, " + groupField + " as class").Group(groupField).Scan(&result).Error; err != nil {
+ return nil, fmt.Errorf("select group err: %v", err)
+ }
+ return result, nil
+}
--
Gitblit v1.8.0