From fc3313955a083c9480e4ea74398f72f9ba6addcd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 01 八月 2024 20:29:51 +0800
Subject: [PATCH] 月度统计查询多单位数据计算改查询。
---
models/location_product_amount.go | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 14 deletions(-)
diff --git a/models/location_product_amount.go b/models/location_product_amount.go
index 6b82f7c..279ab69 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -1,6 +1,7 @@
package models
import (
+ "encoding/json"
"fmt"
"github.com/shopspring/decimal"
"gorm.io/gorm"
@@ -9,18 +10,21 @@
)
type (
+ // LocationProductAmount 搴撳瓨浜у搧鏁伴噺
LocationProductAmount struct {
WmsModel
Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
- LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"`
+ LocationId int `json:"locationId" gorm:"type:int;not null;comment:浣嶇疆id"` //浣嶇疆id
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱id"` // 浠撳簱id
Location Location `json:"location" gorm:"foreignKey:LocationId;references:id"`
ProductCategoryID int `json:"productCategoryId" gorm:"type:int;not null;comment:浜у搧绉嶇被id"` //浜у搧绉嶇被id
ProductCategory ProductCategory `json:"productCategory" gorm:"foreignKey:ProductCategoryID;references:Id"`
ProductId string `json:"productId" gorm:"type:varchar(191);not null;comment:浜у搧id"` //浜у搧id
Product Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
Amount decimal.Decimal `json:"amount" gorm:"type:decimal(20,2);not null;comment:搴撳瓨鏁伴噺"` //搴撳瓨鏁伴噺
- CreateDate string `json:"createDate" gorm:"type:varchar(63);comment:鏃ユ湡"` //鏃ユ湡
+ MoreUnitList []UnitItems `json:"amountMoreUnits" gorm:"-"` //鍦ㄥ簱鏁伴噺澶氬崟浣�
+ MoreUnitValue string `json:"-" gorm:"type:varchar(255);comment:澶氬崟浣嶅��"`
+ CreateDate string `json:"createDate" gorm:"type:varchar(63);comment:鏃ユ湡"` //鏃ユ湡
}
LocationProductAmountSearch struct {
@@ -32,11 +36,13 @@
Orm *gorm.DB
Preload bool
//LocationProductIds []int
- LocationIds []int
- ProductIds []string
- Ids []int
- Query string
- Fields string
+ LocationIds []int
+ ProductIds []string
+ Ids []int
+ Query string
+ Fields string
+ CategoryIds []int
+ JoinedMaterials bool
}
LocationProductAmountWithOperation struct {
@@ -48,19 +54,50 @@
ProductName string `json:"productName" gorm:"column:product_name"`
Amount decimal.Decimal `json:"amount" gorm:"column:amount"`
AmountMoreUnits []UnitItems `json:"amountMoreUnits" gorm:"-"` //鍦ㄥ簱鏁伴噺澶氬崟浣�
- Unit string `json:"unit" gorm:"column:unit"`
- CreateDate string `json:"createDate" gorm:"column:create_date"`
+ Unit string `json:"unit" gorm:"column:unit;size:50;comment:鐗╁搧鍗曚綅"`
+ CreateDate string `json:"createDate" gorm:"column:create_date;size:50;comment:鍒涘缓鏃堕棿"`
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"`
- Weight decimal.Decimal `gorm:"type:decimal(20,3);comment:閲嶉噺" json:"weight"` //閲嶉噺
+ OperationId int `json:"operationId" gorm:"column:operation_id;comment:搴撳瓨鎿嶄綔璁板綍"`
+ Status constvar.OperationStatus `json:"status" gorm:";comment:鎿嶄綔鐘舵��(3灏辩华銆�4瀹屾垚銆�5鍙栨秷)"` // 鎿嶄綔鐘舵��
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type;comment:鍩虹浣滀笟绫诲瀷"` // 鍩虹浣滀笟绫诲瀷
+ Weight decimal.Decimal `gorm:"type:decimal(20,3);comment:閲嶉噺" json:"weight"` //閲嶉噺
}
)
func (slf *LocationProductAmount) TableName() string {
return "wms_location_product_amount"
+}
+
+func (slf *LocationProductAmount) AfterFind(tx *gorm.DB) (err error) {
+ if slf.MoreUnitValue != "" {
+ var arr []UnitItems
+ err := json.Unmarshal([]byte(slf.MoreUnitValue), &arr)
+ if err != nil {
+ return err
+ }
+ slf.MoreUnitList = arr
+ }
+
+ return
+}
+
+func (slf *LocationProductAmount) BeforeCreate(tx *gorm.DB) (err error) {
+ if len(slf.MoreUnitList) != 0 {
+ items := make([]UnitItems, 0)
+ for k, item := range slf.MoreUnitList {
+ if item.Unit != "" && !item.Amount.IsZero() {
+ items = append(items, slf.MoreUnitList[k])
+ }
+ }
+
+ str, err := json.Marshal(items)
+ if err != nil {
+ return err
+ }
+ slf.MoreUnitValue = string(str)
+ }
+ return
}
func NewLocationProductAmountSearch() *LocationProductAmountSearch {
@@ -137,6 +174,11 @@
return slf
}
+func (slf *LocationProductAmountSearch) SetCategoryIds(ids []int) *LocationProductAmountSearch {
+ slf.CategoryIds = ids
+ return slf
+}
+
func (slf *LocationProductAmountSearch) build() *gorm.DB {
var db = slf.Orm.Model(&LocationProductAmount{})
@@ -148,6 +190,10 @@
}
if slf.Keyword != "" {
+ if !slf.JoinedMaterials {
+ db = db.Joins("left join material on wms_location_product_amount.product_id = material.id")
+ slf.JoinedMaterials = true
+ }
db = db.Joins("left join wms_location on wms_location_product_amount.location_id = wms_location.id").
Joins("left join material on wms_location_product_amount.product_id = material.id").
Joins("left join wms_product_category on wms_location_product_amount.product_category_id = wms_product_category.id").
@@ -189,6 +235,14 @@
if slf.Fields != "" {
db = db.Select(slf.Fields)
+ }
+
+ if len(slf.CategoryIds) > 0 {
+ if !slf.JoinedMaterials {
+ db = db.Joins("left join material on wms_location_product_amount.product_id = material.id")
+ slf.JoinedMaterials = true
+ }
+ db = db.Where("material.category_id in ?", slf.CategoryIds)
}
return db
@@ -280,6 +334,19 @@
return records, nil
}
+func (slf *LocationProductAmountSearch) FindAll() ([]*LocationProductAmount, error) {
+ var (
+ records = make([]*LocationProductAmount, 0)
+ db = slf.build()
+ )
+
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
func (slf *LocationProductAmountSearch) FirstRes() (*LocationProductAmount, *gorm.DB) {
var (
record = new(LocationProductAmount)
--
Gitblit v1.8.0