From ccf9ccce0fefbee8428c98a008c26d8ea26b2af1 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期四, 18 七月 2024 10:26:38 +0800
Subject: [PATCH] 修改方法，修复BUG
---
models/operation.go | 150 ++++++++++++++++++++++++++++++-------------------
1 files changed, 91 insertions(+), 59 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 9caeb40..66a33be 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -10,78 +10,78 @@
)
type (
- // Operation 鎿嶄綔琛�
+ // Operation 搴撳瓨鎿嶄綔琛�
Operation struct {
WmsModel
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- Number string `json:"number" gorm:"type:varchar(255)"` //鍗曞彿
- SourceNumber string `json:"sourceNumber" gorm:"index;type:varchar(255)"` //婧愬崟鍙�
- OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"` //浣滀笟绫诲瀷id
- OperationTypeName string `json:"operationTypeName" gorm:"type:varchar(127);comment:浣滀笟绫诲瀷鍚嶇О"` //浣滀笟绫诲瀷鍚嶇О
- 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;references:Id"` //婧愪綅缃�
- //ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id
- //ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
- 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 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"`
- LogisticCompany LogisticCompany `json:"logisticCompany" gorm:"foreignKey:LogisticCompanyId"`
- WaybillNumber string `json:"waybillNumber" gorm:"type:varchar(255);comment:杩愬崟鍙�"` //杩愬崟鍙�
- Weight decimal.Decimal `gorm:"type:decimal(20,2);comment:閲嶉噺" json:"weight"` //閲嶉噺
- LogisticWeight decimal.Decimal `gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺" json:"logisticWeight"` //鐗╂祦閲嶉噺
- Source string `json:"source" gorm:"type:varchar(255);comment:鏉ユ簮绯荤粺,鐢ㄤ簬杩斿洖淇敼鐘舵��"`
+ Number string `json:"number" gorm:"type:varchar(255);comment:鍗曞彿"` //鍗曞彿
+ SourceNumber string `json:"sourceNumber" gorm:"index;type:varchar(255);comment:婧愬崟鍙�"` //婧愬崟鍙�
+ OperationTypeId int `json:"operationTypeId" gorm:"type:int;not null;comment:浣滀笟绫诲瀷id"` //浣滀笟绫诲瀷id
+ OperationTypeName string `json:"operationTypeName" gorm:"type:varchar(127);comment:浣滀笟绫诲瀷鍚嶇О"` //浣滀笟绫诲瀷鍚嶇О
+ Status constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:鐘舵��"` //鐘舵��
+ OperationDate string `json:"operationDate" gorm:"type:varchar(31);comment:瀹夋帓鏃ユ湡"` // 瀹夋帓鏃ユ湡
+ ContacterID int `json:"contacterID" gorm:"type:int;comment:鑱旂郴浜篒D"` // 鑱旂郴浜篒D
+ ContacterName string `json:"contacterName" gorm:"type:varchar(63);comment:鑱旂郴浜哄鍚�"` // 鑱旂郴浜哄鍚�
+ CompanyID string `json:"companyID" gorm:"type:varchar(255);comment:鍏徃ID-瀹㈡埛"` // 鍏徃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"` // 鐗╂祦鍏徃id
+ LogisticCompany LogisticCompany `json:"logisticCompany" gorm:"foreignKey:LogisticCompanyId"` // 鐗╂祦鍏徃淇℃伅
+ WaybillNumber string `json:"waybillNumber" gorm:"type:varchar(255);comment:杩愬崟鍙�"` //杩愬崟鍙�
+ Weight decimal.Decimal `json:"weight" gorm:"type:decimal(20,2);comment:閲嶉噺" ` //閲嶉噺
+ LogisticWeight decimal.Decimal `json:"logisticWeight" gorm:"type:decimal(20,2);comment:鐗╂祦閲嶉噺" ` //鐗╂祦閲嶉噺
+ Source string `json:"source" gorm:"type:varchar(255);comment:鏉ユ簮绯荤粺,鐢ㄤ簬杩斿洖淇敼鐘舵��"` // 鏉ユ簮绯荤粺
OperationSource constvar.OperationSource `json:"operationSource" gorm:"type:tinyint(3);not null;default:0;comment:鎿嶄綔鏉ユ簮"` //鎿嶄綔鏉ユ簮
- Details []*OperationDetails `json:"details" gorm:"foreignKey:OperationID;references:Id"`
+ Details []*OperationDetails `json:"details" gorm:"foreignKey:OperationID;references:Id"` // 鎿嶄綔鏄庣粏
BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:鍩虹浣滀笟绫诲瀷"` //鍩虹浣滀笟绫诲瀷
- AuditDate string `json:"auditDate" gorm:"type:varchar(31);comment:瀹℃壒鏃堕棿"`
- ReceiverName string `json:"receiverName" gorm:"type:varchar(31);comment:鏀惰揣浜哄鍚�"`
- ReceiverPhone string `json:"receiverPhone" gorm:"type:varchar(31);comment:鑱旂郴鐢佃瘽"`
- ReceiverAddr string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"`
+ AuditDate string `json:"auditDate" gorm:"type:varchar(31);comment:瀹℃壒鏃堕棿"` // 瀹℃壒鏃堕棿
+ ReceiverName string `json:"receiverName" gorm:"type:varchar(31);comment:鏀惰揣浜哄鍚�"` // 鏀惰揣浜哄鍚�
+ ReceiverPhone string `json:"receiverPhone" gorm:"type:varchar(31);comment:鑱旂郴鐢佃瘽"` // 鑱旂郴鐢佃瘽
+ ReceiverAddr string `json:"receiverAddr" gorm:"type:varchar(255);comment:鏀惰揣鍦板潃"` // 鏀惰揣鍦板潃
- LocationID int `json:"locationID" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
- Location Location `json:"location" gorm:"foreignkey:LocationID;references:Id"` //婧愪綅缃�
- 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"`
+ LocationID int `json:"locationID" gorm:"type:int;not null;comment:婧愪綅缃甶d"` //婧愪綅缃甶d
+ Location Location `json:"location" gorm:"foreignkey:LocationID;references:Id"` //婧愪綅缃�
+ ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:浠撳簱浣嶇疆id"` //鐩爣浣嶇疆id
+ ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆
+ SalesDetailsNumber string `json:"salesDetailsNumber" gorm:"type:varchar(191);comment:閿�鍞槑缁嗙紪鐮�"` // 閿�鍞槑缁嗙紪鐮�
- 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:淇濈鍛樺悕绉�"`
- CreatedBy string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"`
- CheckedBy string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
- Remark string `json:"remark"`
+ ManagerId string `json:"managerId" gorm:"type:varchar(255);comment:涓荤id"` // 涓荤id
+ Manager string `json:"manager" gorm:"type:varchar(255);comment:涓荤鍚嶇О"` // 涓荤鍚嶇О
+ AccountantId string `json:"accountantId" gorm:"type:varchar(255);comment:浼氳id"` // 浼氳id
+ Accountant string `json:"accountant" gorm:"type:varchar(255);comment:浼氳鍚嶇О"` // 浼氳鍚嶇О
+ CustodianId string `json:"custodianId" gorm:"type:varchar(255);comment:淇濈鍛榠d"` // 淇濈鍛榠d
+ Custodian string `json:"custodian" gorm:"type:varchar(255);comment:淇濈鍛樺悕绉�"` // 淇濈鍛樺悕绉�
+ CreatedBy string `json:"createBy" gorm:"type:varchar(255);comment:鍒涘缓鑰匲serId"` // 鍒涘缓鑰匲serId
+ CheckedBy string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"` // 楠岃瘉鑰匲serId
+ Remark string `json:"remark"` // 澶囨敞
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
- IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
- InventoryDealerType int `json:"inventoryDealerType" gorm:"type:varchar(255);comment:浼氳鍚嶇О"`
- InventoryDealer MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"` // 浠撳簱id
+ Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"` // 浠撳簱淇℃伅
+ IsInternalOutput bool `json:"isInternalOutput" gorm:"type:tinyint(1);comment:鏄惁璋冩嫧浜х敓鐨勫嚭搴�"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+ DealerType string `json:"dealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撶被鍨�"` // 璋冩嫧鍑哄叆搴撶被鍨�
+
+ // 鍢夎仈浠撳偍娣诲姞 SilkMarket
+ SilkMarket string `json:"silkMarket" 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
- SourceNumbers []string
- SalesDetailsNumbers []string
- Fields string
- BeginTime time.Time
- EndTime time.Time
+ 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
+ InventoryDealerTypeIds []int //
}
)
@@ -91,6 +91,13 @@
func NewOperationSearch() *OperationSearch {
return &OperationSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *OperationSearch) BeforeCreate(tx *gorm.DB) {
+ for k := range slf.Details {
+ slf.Details[k].BaseOperationType = slf.BaseOperationType
+ slf.Details[k].DealerType = slf.DealerType
+ }
}
func (slf *OperationSearch) SetOrm(tx *gorm.DB) *OperationSearch {
@@ -189,6 +196,16 @@
return slf
}
+func (slf *OperationSearch) SetInventoryDealerTypeIds(inventoryDealerTypeArr []int) *OperationSearch {
+ slf.InventoryDealerTypeIds = inventoryDealerTypeArr
+ return slf
+}
+
+func (slf *OperationSearch) SetWarehouseId(warehouseId int) *OperationSearch {
+ slf.WarehouseId = warehouseId
+ return slf
+}
+
func (slf *OperationSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Operation{})
@@ -220,7 +237,13 @@
}
if slf.Preload {
- db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation").Preload("InventoryDealer")
+ db = db.Model(&Operation{}).Preload("Details").
+ Preload("Details.Product").
+ Preload("LogisticCompany").
+ Preload("Location").
+ Preload("ToLocation").
+ Preload("Details.FromLocation").
+ Preload("Details.ToLocation").Preload("Warehouse")
}
if slf.Disuse {
@@ -258,6 +281,15 @@
if !slf.BeginTime.IsZero() && !slf.EndTime.IsZero() {
db = db.Where("created_at between ? and ?", slf.BeginTime, slf.EndTime)
}
+
+ if len(slf.InventoryDealerTypeIds) > 0 {
+ db = db.Where("inventory_dealer_type in (?)", slf.InventoryDealerTypeIds)
+ }
+
+ if slf.WarehouseId != 0 {
+ db = db.Where("warehouse_id = ?", slf.WarehouseId)
+ }
+
return db
}
--
Gitblit v1.8.0