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 | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/request/product_request.go b/request/product_request.go
index 2101529..b484263 100644
--- a/request/product_request.go
+++ b/request/product_request.go
@@ -7,7 +7,8 @@
type GetProductList struct {
PageInfo
- KeyWord string `json:"keyWord"`
+ KeyWord string `json:"keyWord"`
+ CategoryId int `json:"categoryId"`
}
type QueryOperationList struct {
@@ -27,20 +28,34 @@
type QueryDisuseList struct {
PageInfo
- Number string `json:"number"`
- SourceNumber string `json:"sourceNumber"`
+ Number string `json:"number"`
}
type UpdateDisuse struct {
- Id int `json:"id"`
- ProductId string `json:"productId"`
- //ProductName string `json:"productName"`
- Amount decimal.Decimal `json:"amount"`
- FromLocationId int `json:"fromLocationId"`
- ToLocationId int `json:"toLocationId"`
- SourceNumber string `json:"sourceNumber"`
- //Unit string `json:"unit"`
- Number string `json:"number"`
- Status constvar.OperationStatus `json:"status"`
- OperationDate string `json:"operationDate"`
+ Id int `json:"id"`
+ ProductId string `json:"productId"`
+ Amount decimal.Decimal `json:"amount"`
+ FromLocationId int `json:"fromLocationId"`
+ ToLocationId int `json:"toLocationId"`
+ SourceNumber string `json:"sourceNumber"`
+ Number string `json:"number"`
+ Status constvar.OperationStatus `json:"status"`
+ 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