From 726662cd89d0fe6b24461c850495db8c37a3e8f1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 14:16:04 +0800
Subject: [PATCH] 作业类型路径修改
---
models/warehouse.go | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/models/warehouse.go b/models/warehouse.go
index 42f6408..a8db21e 100644
--- a/models/warehouse.go
+++ b/models/warehouse.go
@@ -8,17 +8,23 @@
)
type (
- // Warehouse 閮ㄩ棬淇℃伅
+ // Warehouse 浠撳簱
Warehouse struct {
WmsModel
- Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
- Active bool `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"` //鏄惁鍚敤锛屼紶true灏辫
- Code string `json:"code" binding:"required,min=1,max=5" gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
- PartnerID int `json:"partnerId" gorm:"type:int;not null;comment:鍚堜綔浼欎即id"` //鍚堜綔浼欎即id
- BuyToResupply bool `json:"buyToResupply" gorm:"type:tinyint(1);not null;comment:鏄惁璐拱琛ョ粰"` //鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
- ResupplyWhIdsStr string `json:"-" gorm:"column:resupply_wh_ids;type:varchar(255);not null;comment:琛ョ粰鏉ユ簮浠撳簱ID"` //琛ョ粰鏉ユ簮浠撳簱ID
- ResupplyWhIds []string `json:"resupplyWhIds" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱ID
- ResupplyWh []*Warehouse `json:"resupplyWh" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"` //浠撳簱鍚嶇О
+ Active bool `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"` //鏄惁鍚敤锛屼紶true灏辫
+ Code string `json:"code" binding:"required,min=1,max=5" gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
+ PartnerID int `json:"partnerId" gorm:"type:int;not null;comment:鍚堜綔浼欎即id"` //鍚堜綔浼欎即id
+ BuyToResupply bool `json:"buyToResupply" gorm:"type:tinyint(1);not null;comment:鏄惁璐拱琛ョ粰"` //鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+ ResupplyWhIdsStr string `json:"-" gorm:"column:resupply_wh_ids;type:varchar(255);not null;comment:琛ョ粰鏉ユ簮浠撳簱ID"` //琛ョ粰鏉ユ簮浠撳簱ID
+ ResupplyWhIds []string `json:"resupplyWhIds" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱ID
+ ResupplyWh []*Warehouse `json:"resupplyWh" gorm:"-"` //琛ョ粰鏉ユ簮浠撳簱
+ CompanyId int `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"`
+ Company Company `json:"company" gorm:"foreignKey:CompanyId"`
+ Address string `json:"address" gorm:"type:varchar(512);comment:鍦板潃"` //鍦板潃
+ InboundTransportation int `json:"inboundTransportation" gorm:"type:int;comment:鍏ュ悜杩愯緭"` //鍏ュ悜杩愯緭
+ OutboundTransportation int `json:"outboundTransportation" gorm:"type:int;comment:鍑哄簱杩愯緭"` //鍑哄簱杩愯緭
}
WarehouseSearch struct {
@@ -28,11 +34,12 @@
PageSize int
Keyword string
Orm *gorm.DB
+ Preload bool
}
)
func (slf *Warehouse) TableName() string {
- return "warehouse"
+ return "wms_warehouse"
}
func (slf *Warehouse) BeforeCreate(tx *gorm.DB) (err error) {
@@ -79,8 +86,13 @@
return slf
}
+func (slf *WarehouseSearch) SetPreload(preload bool) *WarehouseSearch {
+ slf.Preload = preload
+ return slf
+}
+
func (slf *WarehouseSearch) build() *gorm.DB {
- var db = slf.Orm.Table(slf.TableName())
+ var db = slf.Orm.Model(&Warehouse{})
if slf.ID != 0 {
db = db.Where("id = ?", slf.ID)
@@ -93,10 +105,15 @@
if slf.Keyword != "" {
db = db.Where("name like ?", fmt.Sprintf("%%%v%%", slf.Keyword))
}
+
if slf.Name != "" {
db = db.Where("name = ?", slf.Name)
}
+ if slf.Preload {
+ db = db.Preload("Company")
+ }
+
return db
}
--
Gitblit v1.8.0