From 6856a595e0523216c16c03c58110f4ce80fa88b5 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 九月 2023 10:33:04 +0800
Subject: [PATCH] 1.合并代码
---
request/location_product_amount.go | 15 ++++++++++++++-
router/router.go | 9 +++++----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/request/location_product_amount.go b/request/location_product_amount.go
index fac0745..be4ca87 100644
--- a/request/location_product_amount.go
+++ b/request/location_product_amount.go
@@ -1,6 +1,8 @@
package request
-import "github.com/shopspring/decimal"
+import (
+ "github.com/shopspring/decimal"
+)
type AddLocationProductAmount struct {
LocationId int `json:"locationId"`
@@ -18,3 +20,14 @@
Amount decimal.Decimal `json:"Amount"` //搴撳瓨鏁伴噺
ProductId string `json:"productId"` //浜у搧id
}
+
+type GetRuleList struct {
+ LocationId int `json:"locationId"` //浣嶇疆id
+ ProductId string `json:"productId"` //浜у搧id
+}
+
+type FinishLocationProductAmount struct {
+ OperationId int `json:"operationId"` //鍑哄叆搴搃d
+ ProductId string `json:"productId"` //浜у搧id
+ LocationProductAmountId int `json:"locationProductAmountId"` //搴撳瓨鐩樼偣id
+}
diff --git a/router/router.go b/router/router.go
index 271eb00..1ac4c3f 100644
--- a/router/router.go
+++ b/router/router.go
@@ -125,10 +125,11 @@
locationProductAmountController := new(controllers.LocationProductAmountController)
locationProductAmountAPI := r.Group(urlPrefix + "/locationProductAmount")
{
- locationProductAmountAPI.POST("add", locationProductAmountController.Add) //娣诲姞搴撳瓨鐩樼偣淇℃伅
- locationProductAmountAPI.POST("list", locationProductAmountController.List) //鏌ョ湅搴撳瓨鐩樼偣鍒楄〃
- locationProductAmountAPI.POST("update", locationProductAmountController.Update) //淇敼搴撳瓨鐩樼偣淇℃伅
- locationProductAmountAPI.POST("finish", locationProductAmountController.Finish) //搴旂敤銆侀獙璇佸簱瀛樼洏鐐逛俊鎭�
+ locationProductAmountAPI.POST("add", locationProductAmountController.Add) //娣诲姞搴撳瓨鐩樼偣淇℃伅
+ locationProductAmountAPI.POST("list", locationProductAmountController.List) //鏌ョ湅搴撳瓨鐩樼偣鍒楄〃
+ locationProductAmountAPI.POST("update", locationProductAmountController.Update) //淇敼搴撳瓨鐩樼偣淇℃伅
+ locationProductAmountAPI.POST("finish", locationProductAmountController.Finish) //搴旂敤銆侀獙璇佸簱瀛樼洏鐐逛俊鎭�
+ locationProductAmountAPI.POST("getRuleList", locationProductAmountController.GetRuleList) //鑾峰彇涓婃灦瑙勫垯
}
//鎶ヨ〃
--
Gitblit v1.8.0