From 54344888c2aa6877a3a3f0de669b2b2197288d95 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 21 九月 2023 15:27:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation_details.go | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/models/operation_details.go b/models/operation_details.go
index 270e34d..e79cbf8 100644
--- a/models/operation_details.go
+++ b/models/operation_details.go
@@ -11,12 +11,11 @@
// OperationDetails 鎿嶄綔鏄庣粏琛�
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
+ 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
ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
- Quantity decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);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:鍗曚綅"`
}
@@ -54,8 +53,8 @@
return slf
}
-func (slf *OperationDetailsSearch) SetID(id uint) *OperationDetailsSearch {
- slf.ID = id
+func (slf *OperationDetailsSearch) SetID(ID int) *OperationDetailsSearch {
+ slf.Id = ID
return slf
}
@@ -70,7 +69,7 @@
}
func (slf *OperationDetailsSearch) SetOperationId(operationId int) *OperationDetailsSearch {
- slf.OperationId = operationId
+ slf.OperationID = operationId
return slf
}
@@ -89,8 +88,8 @@
db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
}
- if slf.OperationId != 0 {
- db = db.Where("operation_id = ?", slf.OperationId)
+ if slf.OperationID != 0 {
+ db = db.Where("operation_id = ?", slf.OperationID)
}
return db
--
Gitblit v1.8.0