From 5adf6ad89a4df69aa169beab89ca5afc738adfa4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 20 九月 2023 19:36:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/operation_details.go | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/models/operation_details.go b/models/operation_details.go
index 8595052..73d359e 100644
--- a/models/operation_details.go
+++ b/models/operation_details.go
@@ -12,13 +12,12 @@
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 int `json:"productId" gorm:"type:int;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:鏁伴噺"` //鏁伴噺
- FinishQuantity decimal.Decimal `json:"finishQuantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"` //瀹屾垚鏁伴噺
+ 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
+ ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О
+ Quantity decimal.Decimal `json:"quantity" gorm:"type:decimal(20,2);not null;comment:鏁伴噺"` //鏁伴噺
+ Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"`
}
OperationDetailsSearch struct {
@@ -33,7 +32,7 @@
)
func (slf *OperationDetails) TableName() string {
- return "operation_details"
+ return "wms_operation_details"
}
func NewOperationDetailsSearch() *OperationDetailsSearch {
@@ -70,6 +69,11 @@
return slf
}
+func (slf *OperationDetailsSearch) SetOperationId(operationId int) *OperationDetailsSearch {
+ slf.OperationId = operationId
+ return slf
+}
+
func (slf *OperationDetailsSearch) build() *gorm.DB {
var db = slf.Orm.Model(&OperationDetails{})
@@ -83,6 +87,10 @@
if slf.Keyword != "" {
db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ }
+
+ if slf.OperationId != 0 {
+ db = db.Where("operation_id = ?", slf.OperationId)
}
return db
@@ -235,3 +243,16 @@
return records, nil
}
+
+func (slf *OperationDetailsSearch) FindAll() ([]*OperationDetails, error) {
+ var (
+ records = make([]*OperationDetails, 0)
+ db = slf.build()
+ )
+
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
--
Gitblit v1.8.0