From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口
---
models/location.go | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/models/location.go b/models/location.go
index 028e875..6bb50a0 100644
--- a/models/location.go
+++ b/models/location.go
@@ -27,6 +27,8 @@
NextCount string `json:"nextCount" gorm:"type:varchar(255);comment:涓嬫鐩樼偣"` //涓嬫鐩樼偣
JointName string `json:"jointName" gorm:"type:varchar(255);comment:鎷兼帴鍚嶇О"` //鎷兼帴鍚嶇О
Children []*Location `json:"children" gorm:"-"`
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱ID"` //浠撳簱ID
+ Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"` //浠撳簱
}
LocationSearch struct {
@@ -38,6 +40,7 @@
Orm *gorm.DB
Preload bool
JointNames []string
+ Ids []int
}
)
@@ -66,6 +69,11 @@
func (slf *LocationSearch) SetID(ID int) *LocationSearch {
slf.Id = ID
+ return slf
+}
+
+func (slf *LocationSearch) SetIds(ids []int) *LocationSearch {
+ slf.Ids = ids
return slf
}
@@ -109,11 +117,20 @@
return slf
}
+func (slf *LocationSearch) SetIsScrapLocation(isScrapLocation bool) *LocationSearch {
+ slf.IsScrapLocation = isScrapLocation
+ 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 len(slf.Ids) > 0 {
+ db = db.Where("id in (?)", slf.Ids)
}
if slf.Order != "" {
@@ -139,10 +156,19 @@
db = db.Where("company_id=?", slf.CompanyId)
}
if slf.JointName != "" {
+ slf.JointName += "/"
db = db.Where("joint_name like ?", slf.JointName+"%")
}
if len(slf.JointNames) != 0 {
db = db.Where("joint_name in (?)", slf.JointNames)
+ }
+
+ if slf.IsScrapLocation {
+ db = db.Where("is_scrap_location = ?", slf.IsScrapLocation)
+ }
+
+ if slf.Preload {
+ db = db.Preload("Warehouse")
}
return db
@@ -338,7 +364,7 @@
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: 8, JointName: "鎶ュ簾浣嶇疆", IsScrapLocation: true})
locations = append(locations, &Location{Name: "搴撳瓨鐩樼偣", Type: 9, JointName: "搴撳瓨鐩樼偣"})
return slf.CreateBatch(locations)
}
--
Gitblit v1.8.0