From e5df488268e29b272932e6cc1d2b1e7034590ba0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 12 六月 2024 11:40:45 +0800
Subject: [PATCH] weedfs包放到项目里
---
models/operation.go | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 1296457..ff81c5b 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -4,6 +4,7 @@
"fmt"
"github.com/shopspring/decimal"
"gorm.io/gorm"
+ "time"
"wms/constvar"
"wms/pkg/mysqlx"
)
@@ -25,7 +26,7 @@
OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"`
ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"`
ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"`
- CompanyID int `json:"companyID" gorm:"type:int;comment:鍏徃ID-瀹㈡埛"`
+ CompanyID string `json:"companyID" gorm:"type:varchar(255);comment:鍏徃ID-瀹㈡埛"`
CompanyName string `json:"companyName" gorm:"type:varchar(127);comment:鍏徃鍚嶇О-瀹㈡埛"`
Comment string `json:"comment" gorm:"type:text;comment:澶囨敞"`
LogisticCompanyId string `json:"logisticCompanyId" gorm:"type:varchar(191);comment:鐗╂祦鍏徃id"`
@@ -49,19 +50,30 @@
ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id
ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
SalesDetailsNumber string `gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�" json:"salesDetailsNumber"`
+
+ ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"`
+ Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"`
+ AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"`
+ Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
+ CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"`
+ Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"`
}
OperationSearch struct {
Operation
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
- Disuse bool
- Ids []int
- Numbers []string
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ Disuse bool
+ Ids []int
+ SourceNumbers []string
+ SalesDetailsNumbers []string
+ Fields string
+ BeginTime time.Time
+ EndTime time.Time
}
)
@@ -98,6 +110,11 @@
return slf
}
+func (slf *OperationSearch) SetFields(fields string) *OperationSearch {
+ slf.Fields = fields
+ return slf
+}
+
func (slf *OperationSearch) SetOperationTypeId(operationTypeId int) *OperationSearch {
slf.OperationTypeId = operationTypeId
return slf
@@ -115,6 +132,11 @@
func (slf *OperationSearch) SetSourceNumber(sourceNumber string) *OperationSearch {
slf.SourceNumber = sourceNumber
+ return slf
+}
+
+func (slf *OperationSearch) SetSourceNumbers(numbers []string) *OperationSearch {
+ slf.SourceNumbers = numbers
return slf
}
@@ -143,8 +165,19 @@
return slf
}
+func (slf *OperationSearch) SetSalesDetailsNumbers(salesDetailsNumbers []string) *OperationSearch {
+ slf.SalesDetailsNumbers = salesDetailsNumbers
+ return slf
+}
+
func (slf *OperationSearch) SetOperationSource(operationSource constvar.OperationSource) *OperationSearch {
slf.OperationSource = operationSource
+ return slf
+}
+
+func (slf *OperationSearch) SetTimeBetween(beginTime, endTime time.Time) *OperationSearch {
+ slf.BeginTime = beginTime
+ slf.EndTime = endTime
return slf
}
@@ -164,6 +197,10 @@
if slf.SourceNumber != "" {
db = db.Where("source_number = ?", slf.SourceNumber)
+ }
+
+ if len(slf.SourceNumbers) > 0 {
+ db = db.Where("source_number in (?)", slf.SourceNumbers)
}
if slf.Number != "" {
@@ -198,10 +235,21 @@
db = db.Where("sales_details_number = ?", slf.SalesDetailsNumber)
}
+ if len(slf.SalesDetailsNumbers) > 0 {
+ db = db.Where("sales_details_number in (?)", slf.SalesDetailsNumbers)
+ }
+
if slf.OperationSource != 0 {
db = db.Where("operation_source = ?", slf.OperationSource)
}
+ if slf.Fields != "" {
+ db = db.Select(slf.Fields)
+ }
+
+ if !slf.BeginTime.IsZero() && !slf.EndTime.IsZero() {
+ db = db.Where("created_at between ? and ?", slf.BeginTime, slf.EndTime)
+ }
return db
}
@@ -325,6 +373,18 @@
return records, nil
}
+func (slf *OperationSearch) FindIds() ([]int, error) {
+ var (
+ records = make([]int, 0)
+ db = slf.build()
+ )
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
func (slf *OperationSearch) FindByQuery(query string, args []interface{}) ([]*Operation, int64, error) {
var (
--
Gitblit v1.8.0