From 96844c22ef3fba86a55e0af1b51bc1009d6fa950 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 20 十月 2023 11:57:48 +0800
Subject: [PATCH] 1.库存盘点bug修改
---
models/location.go | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/models/location.go b/models/location.go
index ff81758..15830ea 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,17 +25,18 @@
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
}
)
@@ -66,8 +67,14 @@
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
}
@@ -91,7 +98,7 @@
return slf
}
-func (slf *LocationSearch) SetParentId(parentId string) *LocationSearch {
+func (slf *LocationSearch) SetParentId(parentId int) *LocationSearch {
slf.ParentId = parentId
return slf
}
@@ -124,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
@@ -307,3 +317,27 @@
}
return records, nil
}
+
+// InitDefaultData 鍒濆鍖栨暟鎹�
+func (slf *LocationSearch) InitDefaultData() error {
+ var (
+ db = slf.Orm.Table(slf.TableName())
+ total int64 = 0
+ )
+ if err := db.Count(&total).Error; err != nil {
+ return err
+ }
+ if total != 0 {
+ return nil
+ }
+ locations := make([]*Location, 0)
+ locations = append(locations, &Location{Name: "渚涘簲鍟嗕綅缃�", Type: 1, JointName: "渚涘簲鍟嗕綅缃�"})
+ locations = append(locations, &Location{Name: "瑙嗗浘", Type: 2, JointName: "瑙嗗浘"})
+ locations = append(locations, &Location{Name: "瀹㈡埛浣嶇疆", Type: 4, JointName: "瀹㈡埛浣嶇疆"})
+ locations = append(locations, &Location{Name: "搴撳瓨鎹熷け", Type: 5, JointName: "搴撳瓨鎹熷け"})
+ locations = append(locations, &Location{Name: "鐢熶骇", Type: 6, JointName: "鐢熶骇"})
+ locations = append(locations, &Location{Name: "涓浆浣嶇疆", Type: 7, JointName: "涓浆浣嶇疆"})
+ locations = append(locations, &Location{Name: "鎶ュ簾浣嶇疆", Type: 8, JointName: "鎶ュ簾浣嶇疆"})
+ locations = append(locations, &Location{Name: "搴撳瓨鐩樼偣", Type: 9, JointName: "搴撳瓨鐩樼偣"})
+ return slf.CreateBatch(locations)
+}
--
Gitblit v1.8.0