From ed81fc8d860adb66676d4990e4ce0ff56cff79a6 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 22 十一月 2023 19:48:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 router/router.go |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/router/router.go b/router/router.go
index 27e49d9..a75aba3 100644
--- a/router/router.go
+++ b/router/router.go
@@ -86,6 +86,9 @@
 		operationAPI.DELETE("operation/:id", operationController.Delete)
 		operationAPI.PUT("finish/:id", operationController.Finish)
 		operationAPI.POST("listTransfer", operationController.ListTransfer)
+		operationAPI.GET("getLogisticCompanyList", operationController.GetLogisticCompanyList)
+		operationAPI.PUT("cancel/:id", operationController.Cancel)
+		operationAPI.PUT("outputOperation/:id", operationController.OutputOperation)
 
 	}
 
@@ -111,6 +114,7 @@
 		productAPI.PUT("finishDisuse/:id", productController.FinishDisuse) //鎶ュ簾楠岃瘉
 		productAPI.POST("updateDisuse", productController.UpdateDisuse)    //淇敼鎶ュ簾淇℃伅
 		productAPI.POST("listHistory", productController.ListHistory)      //浜у搧浣嶇疆鍘嗗彶璁板綍
+		productAPI.PUT("cancelDisuse/:id", productController.CancelDisuse) //鍙栨秷鎶ュ簾
 
 	}
 
@@ -161,5 +165,12 @@
 		attachmentAPI.POST("uploadFiles", attachmentController.UploadFiles) //涓婁紶鏂囦欢
 	}
 
+	codeApiController := new(controllers.CodeApi)
+	codeApi := r.Group(urlPrefix + "/code")
+	{
+		codeApi.GET("getCodeList", codeApiController.GetCodeList)  //鑾峰彇缂栫爜鍒楄〃
+		codeApi.POST("getAutoCode", codeApiController.GetAutoCode) //鑾峰彇鑷姩缂栫爜
+	}
+
 	return r
 }

--
Gitblit v1.8.0