From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts
---
request/product_request.go | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/request/product_request.go b/request/product_request.go
index c0e7ea7..b484263 100644
--- a/request/product_request.go
+++ b/request/product_request.go
@@ -28,8 +28,7 @@
type QueryDisuseList struct {
PageInfo
- Number string `json:"number"`
- SourceNumber string `json:"sourceNumber"`
+ Number string `json:"number"`
}
type UpdateDisuse struct {
@@ -44,3 +43,19 @@
OperationDate string `json:"operationDate"`
BaseOperationType constvar.BaseOperationType `json:"baseOperationType"`
}
+
+type QueryOperationHistory struct {
+ PageInfo
+ ProductId string `json:"productId"`
+ LocationId int `json:"locationId"`
+}
+
+type ProductStatistics struct {
+ TotalAmount decimal.Decimal `gorm:"column:total_amount"`
+ BaseOperationType constvar.BaseOperationType `gorm:"column:base_operation_type"` //鍩虹浣滀笟绫诲瀷
+}
+
+type ProductStatisticsAmount struct {
+ ProductId string `gorm:"column:product_id"`
+ TotalAmount decimal.Decimal `gorm:"column:total_amount"`
+}
--
Gitblit v1.8.0