From 5adf6ad89a4df69aa169beab89ca5afc738adfa4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 20 九月 2023 19:36:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
models/location.go | 94 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/models/location.go b/models/location.go
index 0146ca0..4c0338c 100644
--- a/models/location.go
+++ b/models/location.go
@@ -11,16 +11,17 @@
// 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 int `json:"parentId" gorm:"type:int;not null"` //涓婄骇id
- CompanyId int `json:"companyId" gorm:"type:int;not null"` //鍏徃id
- Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃
- Type constvar.LocationType `json:"type" gorm:"type:tinyint;not null;comment:浣嶇疆绫诲瀷"` //浣嶇疆绫诲瀷
- CountFrequency int `json:"countFrequency" gorm:"type:tinyint;not null;comment:鐩樼偣棰戠巼锛堝ぉ锛�"` //鐩樼偣棰戠巼锛堝ぉ锛�
- IsScrapLocation bool `json:"isScrapLocation" gorm:"type:tinyint;not null;comment:鏄惁鎶ュ簾浣嶇疆"` //鏄惁鎶ュ簾浣嶇疆
- IsReturnLocation bool `json:"isReturnLocation" gorm:"type:tinyint;not null;comment:鏄惁閫�璐т綅缃�"` //鏄惁閫�璐т綅缃�
- ReplenishLocation bool `json:"replenishLocation" gorm:"type:tinyint;not null;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 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:鏄惁琛ュ厖浣嶇疆"` //鏄惁琛ュ厖浣嶇疆
+ ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:涓嬫灦绛栫暐"` //涓嬫灦绛栫暐
}
LocationSearch struct {
@@ -31,11 +32,12 @@
Keyword string
Orm *gorm.DB
Preload bool
+ Parents []string
}
)
func (slf *Location) TableName() string {
- return "location"
+ return "wms_location"
}
func NewLocationSearch() *LocationSearch {
@@ -57,8 +59,12 @@
return slf
}
-func (slf *LocationSearch) SetID(id uint) *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
return slf
}
@@ -77,11 +83,26 @@
return slf
}
-func (slf *LocationSearch) build() *gorm.DB {
- var db = slf.Orm.Model(&Location{})
+func (slf *LocationSearch) SetType(_type int) *LocationSearch {
+ slf.Type = constvar.LocationType(_type)
+ return slf
+}
- if slf.ID != 0 {
- db = db.Where("id = ?", slf.ID)
+func (slf *LocationSearch) SetParentId(parentId string) *LocationSearch {
+ slf.ParentId = parentId
+ return slf
+}
+
+func (slf *LocationSearch) SetCompanyId(companyId int) *LocationSearch {
+ slf.CompanyId = companyId
+ return slf
+}
+
+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.Order != "" {
@@ -96,6 +117,20 @@
db = db.Where("name = ?", slf.Name)
}
+ if slf.Type != 0 {
+ db = db.Where("type=?", slf.Type)
+ }
+
+ if slf.ParentId != "" {
+ 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)
+ }
+
return db
}
@@ -108,6 +143,16 @@
}
return nil
+}
+
+func (slf *LocationSearch) CreateReturnId(record *Location) (int, error) {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return 0, err
+ }
+
+ return record.Id, nil
}
// CreateBatch 鎵归噺鎻掑叆
@@ -157,7 +202,7 @@
func (slf *LocationSearch) Delete() error {
var db = slf.build()
- return db.Delete(&Location{}).Error
+ return db.Unscoped().Delete(&Location{}).Error
}
func (slf *LocationSearch) First() (*Location, error) {
@@ -246,3 +291,16 @@
return records, nil
}
+
+func (slf *LocationSearch) FindAll() ([]*Location, error) {
+ var (
+ records = make([]*Location, 0)
+ db = slf.build()
+ )
+ err := db.Find(&records)
+ if err != nil {
+ fmt.Println(err)
+ return records, fmt.Errorf("func FindAll err: %v", err)
+ }
+ return records, nil
+}
--
Gitblit v1.8.0