From d5785f7ecec215960c4d100bf129e1abeca9d5cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 30 七月 2024 20:11:03 +0800
Subject: [PATCH] 位置报表多单位使用动态表头及相应数据调整(数据使用存储的多单位数据，并展示在对应单位下面)
---
models/location.go | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/models/location.go b/models/location.go
index 6bb50a0..dc62c21 100644
--- a/models/location.go
+++ b/models/location.go
@@ -122,6 +122,11 @@
return slf
}
+func (slf *LocationSearch) SetWarehouseId(warehouseId int) *LocationSearch {
+ slf.WarehouseId = warehouseId
+ return slf
+}
+
func (slf *LocationSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -156,7 +161,7 @@
db = db.Where("company_id=?", slf.CompanyId)
}
if slf.JointName != "" {
- slf.JointName += "/"
+ //slf.JointName += "/"
db = db.Where("joint_name like ?", slf.JointName+"%")
}
if len(slf.JointNames) != 0 {
@@ -171,6 +176,10 @@
db = db.Preload("Warehouse")
}
+ if slf.WarehouseId != 0 {
+ db = db.Where("warehouse_id = ?", slf.WarehouseId)
+ }
+
return db
}
--
Gitblit v1.8.0