From c278d736f5f9c0ab4a64540aa1a6b89984b0cd2c Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 19 十月 2023 15:52:37 +0800
Subject: [PATCH] 1.wms业务调整及bug修改
---
models/location.go | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/models/location.go b/models/location.go
index a11b1a9..64676df 100644
--- a/models/location.go
+++ b/models/location.go
@@ -11,27 +11,32 @@
// Location 浣嶇疆
Location struct {
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
- 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:浣嶇疆绫诲瀷"` //浣嶇疆绫诲瀷
- CountFrequency int `json:"countFrequency" gorm:"type:tinyint;comment:鐩樼偣棰戠巼锛堝ぉ锛�"` //鐩樼偣棰戠巼锛堝ぉ锛�
- IsScrapLocation bool `json:"isScrapLocation" gorm:"type:tinyint;comment:鏄惁鎶ュ簾浣嶇疆"` //鏄惁鎶ュ簾浣嶇疆
- IsReturnLocation bool `json:"isReturnLocation" gorm:"type:tinyint;comment:鏄惁閫�璐т綅缃�"` //鏄惁閫�璐т綅缃�
- ReplenishLocation bool `json:"replenishLocation" gorm:"type:tinyint;comment:鏄惁琛ュ厖浣嶇疆"` //鏄惁琛ュ厖浣嶇疆
+ Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О
+ 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:浣嶇疆绫诲瀷"` //浣嶇疆绫诲瀷
+ CountFrequency int `json:"countFrequency" gorm:"type:tinyint;comment:鐩樼偣棰戠巼锛堝ぉ锛�"` //鐩樼偣棰戠巼锛堝ぉ锛�
+ IsScrapLocation bool `json:"isScrapLocation" gorm:"type:tinyint;comment:鏄惁鎶ュ簾浣嶇疆"` //鏄惁鎶ュ簾浣嶇疆
+ 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:"type:varchar(255);comment:鎷兼帴鍚嶇О"` //鎷兼帴鍚嶇О
}
LocationSearch struct {
Location
- Order string
- PageNum int
- PageSize int
- Keyword string
- Orm *gorm.DB
- Preload bool
- Parents []string
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ JointNames []string
}
)
@@ -58,12 +63,18 @@
return slf
}
-func (slf *LocationSearch) SetID(id int) *LocationSearch {
- slf.Id = id
+func (slf *LocationSearch) SetID(ID int) *LocationSearch {
+ slf.Id = ID
return slf
}
-func (slf *LocationSearch) SetParents(ids []string) *LocationSearch {
- slf.Parents = ids
+
+func (slf *LocationSearch) SetJointName(code string) *LocationSearch {
+ slf.JointName = code
+ return slf
+}
+
+func (slf *LocationSearch) SetJointNames(codes []string) *LocationSearch {
+ slf.JointNames = codes
return slf
}
@@ -87,7 +98,7 @@
return slf
}
-func (slf *LocationSearch) SetParentId(parentId string) *LocationSearch {
+func (slf *LocationSearch) SetParentId(parentId int) *LocationSearch {
slf.ParentId = parentId
return slf
}
@@ -120,14 +131,17 @@
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 slf.JointName != "" {
+ db = db.Where("joint_name like ?", slf.JointName+"%")
+ }
+ if len(slf.JointNames) != 0 {
+ db = db.Where("joint_name in (?)", slf.JointNames)
}
return db
--
Gitblit v1.8.0