From cfb6fbce3687230ccb4704dbc0c87fd411b39af1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 17:37:22 +0800
Subject: [PATCH] 仓库字段添加与功能修改
---
models/operation.go | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index b1b3355..76b7797 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -2,6 +2,7 @@
import (
"fmt"
+ "github.com/shopspring/decimal"
"gorm.io/gorm"
"wms/constvar"
"wms/pkg/mysqlx"
@@ -11,19 +12,26 @@
// Operation 鎿嶄綔琛�
Operation struct {
WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Number string `json:"number" gorm:"column:number;type:varchar(255)"` //鍗曞彿
- SourceNumber string `json:"sourceNumber" gorm:"type:varchar(255)"` //婧愬崟鍙�
-
- BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
- OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"` //浣滀笟绫诲瀷id
- Status int `json:"status" gorm:"type:tinyint;not null;comment:鐘舵��"` //鐘舵��
-
- FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
- FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationId"` //婧愪綅缃�
- ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
- ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationId"` //鐩爣浣嶇疆
-
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Number string `json:"number" gorm:"type:varchar(255)"` //鍗曞彿
+ SourceNumber string `json:"sourceNumber" gorm:"type:varchar(255)"` //婧愬崟鍙�
+ OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"` //浣滀笟绫诲瀷id
+ Status constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"` //鐘舵��
+ FromLocationId int `json:"fromLocationId" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
+ FromLocation Location `json:"fromLocation" gorm:"foreignKey:FromLocationId"` //婧愪綅缃�
+ ToLocationId int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
+ ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationId"` //鐩爣浣嶇疆
+ OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
+ CarrierID int `json:"carrierID" gorm:"type:int;comment:鎵胯繍鍟咺D"`
+ CarrierName string `json:"carrierName" gorm:"type:varchar(63);comment:鎵胯繍鍟嗗悕绉�"`
+ Tracking string `json:"tracking" gorm:"type:varchar(127);comment:杩借釜鍙傝��"`
+ ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
+ ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
+ Weight decimal.Decimal `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺(kg)"`
+ TransferWeight decimal.Decimal `json:"transferWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺(kg)"`
+ CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID"`
+ CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О(kg)"`
+ Details []*OperationDetails `json:"details"`
}
OperationSearch struct {
@@ -38,7 +46,7 @@
)
func (slf *Operation) TableName() string {
- return "operation"
+ return "wms_operation"
}
func NewOperationSearch() *OperationSearch {
@@ -60,13 +68,18 @@
return slf
}
-func (slf *OperationSearch) SetID(id uint) *OperationSearch {
- slf.ID = id
+func (slf *OperationSearch) SetID(id int) *OperationSearch {
+ slf.Id = id
return slf
}
-func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
- slf.Keyword = keyword
+//func (slf *OperationSearch) SetKeyword(keyword string) *OperationSearch {
+// slf.Keyword = keyword
+// return slf
+//}
+
+func (slf *OperationSearch) SetOperationTypeId(operationTypeId int) *OperationSearch {
+ slf.OperationTypeId = operationTypeId
return slf
}
@@ -78,16 +91,23 @@
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
+ if slf.Id != 0 {
+ db = db.Where("id = ?", slf.Id)
}
-
if slf.Order != "" {
db = db.Order(slf.Order)
}
- if slf.Keyword != "" {
- db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ //if slf.Keyword != "" {
+ // db = db.Where("product_name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
+ //}
+
+ if slf.OperationTypeId != 0 {
+ db.Where("operation_type_id = ?", slf.OperationTypeId)
+ }
+
+ if slf.Preload {
+ db = db.Model(&Operation{}).Preload("Details")
}
return db
@@ -115,6 +135,16 @@
return nil
}
+func (slf *OperationSearch) Save(record *Operation) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
func (slf *OperationSearch) Update(record *Operation) error {
var db = slf.build()
--
Gitblit v1.8.0