From f36fe3eca14e9a9543eb5dc8fa3bd9a7e3611b98 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期四, 21 九月 2023 19:30:21 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- models/location.go | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/models/location.go b/models/location.go index 19e592b..394e0bb 100644 --- a/models/location.go +++ b/models/location.go @@ -22,6 +22,10 @@ IsReturnLocation bool `json:"isReturnLocation" gorm:"type:tinyint;comment:鏄惁閫�璐т綅缃�"` //鏄惁閫�璐т綅缃� ReplenishLocation bool `json:"replenishLocation" gorm:"type:tinyint;comment:鏄惁琛ュ厖浣嶇疆"` //鏄惁琛ュ厖浣嶇疆 ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:涓嬫灦绛栫暐"` //涓嬫灦绛栫暐 + 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:"-"` //鎷兼帴鍚嶇О } LocationSearch struct { @@ -101,8 +105,8 @@ func (slf *LocationSearch) build() *gorm.DB { var db = slf.Orm.Table(slf.TableName()) - if slf.ID != 0 { - db = db.Where("id = ?", slf.ID) + if slf.Id != 0 { + db = db.Where("id = ?", slf.Id) } if slf.Order != "" { -- Gitblit v1.8.0