From c6db2fc2c1822b97aa475db871ae460e0fb1b431 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 16 四月 2024 16:29:41 +0800
Subject: [PATCH] Merge branch '20240407'
---
router/router.go | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/router/router.go b/router/router.go
index 67aeb13..b759a4c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -21,6 +21,7 @@
urlPrefix := "/api-wms/v1"
r.Use(middleware.JWTAuth())
+ r.Use(middleware.VerifyResetPwd())
// 缁勭粐绠＄悊
departmentController := new(controllers.DepartmentController)
@@ -81,6 +82,7 @@
operationAPI := r.Group(urlPrefix + "/operation")
{
operationAPI.POST("list", operationController.List)
+ operationAPI.GET("getOperationInfo/:id", operationController.GetOperationInfo)
operationAPI.POST("operation", operationController.Add)
operationAPI.POST("update", operationController.Update)
operationAPI.DELETE("operation/:id", operationController.Delete)
@@ -88,6 +90,12 @@
operationAPI.POST("listTransfer", operationController.ListTransfer)
operationAPI.GET("getLogisticCompanyList", operationController.GetLogisticCompanyList)
operationAPI.PUT("cancel/:id", operationController.Cancel)
+ operationAPI.PUT("outputOperation/:id", operationController.OutputOperation)
+ operationAPI.GET("getSupplierList", operationController.GetSupplierList)
+ operationAPI.GET("getClientList", operationController.GetClientList)
+ operationAPI.POST("listByCondition", operationController.ListByCondition)
+ operationAPI.GET("getPersonnelList", operationController.GetPersonnelList)
+
}
//浜у搧
@@ -113,6 +121,9 @@
productAPI.POST("updateDisuse", productController.UpdateDisuse) //淇敼鎶ュ簾淇℃伅
productAPI.POST("listHistory", productController.ListHistory) //浜у搧浣嶇疆鍘嗗彶璁板綍
productAPI.PUT("cancelDisuse/:id", productController.CancelDisuse) //鍙栨秷鎶ュ簾
+ productAPI.GET("getUserInfo", productController.GetUserInfo) //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ productAPI.GET("getUnitInfo", productController.GetUnitInfo) //鑾峰彇鍗曚綅淇℃伅
+ productAPI.POST("saveUnitDict", productController.SaveUnitDict) //鏇存柊璁￠噺鍗曚綅瀛楀吀
}
@@ -130,11 +141,12 @@
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("getRuleList", locationProductAmountController.GetRuleList) //鑾峰彇涓婃灦瑙勫垯
+ 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) //鑾峰彇涓婃灦瑙勫垯
+ locationProductAmountAPI.POST("getLocationProductAmount", locationProductAmountController.GetLocationProductAmount) //鑾峰彇浣嶇疆浜у搧淇℃伅
}
//鎶ヨ〃
--
Gitblit v1.8.0