From 482fe65f34d1acf2483814821570c80c92547c5e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 26 九月 2023 13:55:34 +0800
Subject: [PATCH] 位置字段修改
---
models/location.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/models/location.go b/models/location.go
index 394e0bb..db96855 100644
--- a/models/location.go
+++ b/models/location.go
@@ -13,7 +13,7 @@
WmsModel
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О
- ParentId string `json:"parentId" gorm:"type:varchar(255)"` //涓婄骇id
+ ParentId int `json:"parentId" gorm:"type:int;comment:涓婄骇id"` //涓婄骇id
CompanyId int `json:"companyId" gorm:"type:int"` //鍏徃id
//Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃
Type constvar.LocationType `json:"type" gorm:"type:int(11);comment:浣嶇疆绫诲瀷"` //浣嶇疆绫诲瀷
@@ -25,7 +25,7 @@
Notes string `json:"notes" gorm:"type:varchar(255);comment:澶栭儴澶囨敞"` //澶栭儴澶囨敞
RecentlyCount string `json:"recentlyCount" gorm:"type:varchar(255);comment:鏈�杩戠洏鐐�"` //鏈�杩戠洏鐐�
NextCount string `json:"nextCount" gorm:"type:varchar(255);comment:涓嬫鐩樼偣"` //涓嬫鐩樼偣
- JointName string `json:"jointName" gorm:"-"` //鎷兼帴鍚嶇О
+ JointName string `json:"jointName" gorm:"type:varchar(255);comment:鎷兼帴鍚嶇О"` //鎷兼帴鍚嶇О
}
LocationSearch struct {
@@ -36,7 +36,7 @@
Keyword string
Orm *gorm.DB
Preload bool
- Parents []string
+ Codes []string
}
)
@@ -67,8 +67,8 @@
slf.Id = ID
return slf
}
-func (slf *LocationSearch) SetParents(ids []string) *LocationSearch {
- slf.Parents = ids
+func (slf *LocationSearch) SetCodes(ids []string) *LocationSearch {
+ slf.Codes = ids
return slf
}
@@ -92,7 +92,7 @@
return slf
}
-func (slf *LocationSearch) SetParentId(parentId string) *LocationSearch {
+func (slf *LocationSearch) SetParentId(parentId int) *LocationSearch {
slf.ParentId = parentId
return slf
}
@@ -125,14 +125,14 @@
db = db.Where("type=?", slf.Type)
}
- if slf.ParentId != "" {
+ if slf.ParentId > 0 {
db = db.Where("parent_id=?", slf.ParentId)
}
if slf.CompanyId != 0 {
db = db.Where("company_id=?", slf.CompanyId)
}
- if len(slf.Parents) != 0 {
- db = db.Where("parent_id in (?)", slf.Parents)
+ if len(slf.Codes) != 0 {
+ db = db.Where("warehouse_code in (?)", slf.Codes)
}
return db
--
Gitblit v1.8.0