From a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 12 一月 2024 10:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
request/product_request.go | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/request/product_request.go b/request/product_request.go
index c33ccea..8402959 100644
--- a/request/product_request.go
+++ b/request/product_request.go
@@ -17,31 +17,46 @@
}
type AddDisuse struct {
- ProductId string `json:"productId"`
- ProductName string `json:"productName"`
+ 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"`
+ //Unit string `json:"unit"`
+ Number string `json:"number"`
}
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