From 2f856eaa7e46c884f1cb7ad721919a086d7f34a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 13 六月 2024 15:57:45 +0800
Subject: [PATCH] 出入库明细列表和报表增加多单位
---
models/location_product_amount.go | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index c102c5b..efa1205 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -49,8 +49,8 @@
Amount decimal.Decimal `json:"amount" gorm:"column:amount"`
Unit string `json:"unit" gorm:"column:unit"`
CreateDate string `json:"createDate" gorm:"column:create_date"`
- AdjustAmount decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"`
- DifferenceAmount decimal.Decimal `json:"differenceAmount" gorm:"-"`
+ AdjustAmount decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"` //宸��
+ DifferenceAmount decimal.Decimal `json:"differenceAmount" gorm:"-"` //璁℃暟鏁伴噺
OperationId int `json:"operationId" gorm:"column:operation_id"`
Status constvar.OperationStatus `json:"status" gorm:"status"`
BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type"`
@@ -253,6 +253,9 @@
db = slf.build()
)
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
if err := db.Find(&records).Error; err != nil {
return records, fmt.Errorf("find records err: %v", err)
}
@@ -289,3 +292,25 @@
return nil
}
+
+func (slf *LocationProductAmountSearch) GroupCount(field string) ([]*GroupCount, error) {
+ var (
+ db = slf.build()
+ result = make([]*GroupCount, 0)
+ )
+ if err := db.Select("count(*) as total, " + field + " as class").Group(field).Scan(&result).Error; err != nil {
+ return nil, fmt.Errorf("select group err: %v", err)
+ }
+ return result, nil
+}
+
+func (slf *LocationProductAmountSearch) GroupSum(groupField string, sumField string) ([]*GroupSum, error) {
+ var (
+ db = slf.build()
+ result = make([]*GroupSum, 0)
+ )
+ if err := db.Select("sum(" + sumField + ") as sum, " + groupField + " as class").Group(groupField).Scan(&result).Error; err != nil {
+ return nil, fmt.Errorf("select group err: %v", err)
+ }
+ return result, nil
+}
--
Gitblit v1.8.0