From 1e1eff926a1a331f29b225a41343fd9ecb01fe66 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:19:50 +0800
Subject: [PATCH] 添加字段，嘉联仓储添加 SilkMarket（庄口）、SilkMarketClose（庄口是否关闭）字段
---
controllers/dict_controller.go | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/controllers/dict_controller.go b/controllers/dict_controller.go
index 8c8d8fb..a9c1a8e 100644
--- a/controllers/dict_controller.go
+++ b/controllers/dict_controller.go
@@ -1,6 +1,8 @@
package controllers
import (
+ "context"
+ "errors"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"strconv"
@@ -8,6 +10,8 @@
"wms/extend/util"
"wms/models"
"wms/pkg/logx"
+ "wms/proto/init_client"
+ "wms/proto/user"
"wms/request"
)
@@ -16,7 +20,7 @@
// AddMiniDict
//
// @Tags 鏁版嵁瀛楀吀
-// @Summary 娣诲姞杩蜂綘瀛楀吀
+// @Summary 娣诲姞瀛楀吀淇℃伅
// @Produce application/json
// @Param object body request.AddMiniDict true "鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
@@ -38,6 +42,12 @@
return
}
+ _, err := models.NewMiniDictSearch().SetType(params.Type).SetName(params.Name).First()
+ if !errors.Is(err, gorm.ErrRecordNotFound) {
+ util.ResponseFormat(c, code.NameExistedError, "鍚嶇О宸插瓨鍦�")
+ return
+ }
+
record := models.MiniDict{
Type: params.Type,
Name: params.Name,
@@ -56,7 +66,7 @@
// EditMiniDict
//
// @Tags 鏁版嵁瀛楀吀
-// @Summary 缂栬緫杩蜂綘瀛楀吀
+// @Summary 缂栬緫瀛楀吀淇℃伅
// @Produce application/json
// @Param object body request.EditMiniDict true "鍙傛暟"
// @Success 200 {object} util.Response "鎴愬姛"
@@ -84,6 +94,7 @@
}
record := models.MiniDict{
+ Type: params.Type,
Name: params.Name,
Value: params.Value,
IsDefault: params.IsDefault,
@@ -100,8 +111,8 @@
// DeleteMiniDict
//
-// @Tags 灞炴�у�煎拰瀵硅薄
-// @Summary 鍒犻櫎灞炴�у�煎拰瀵硅薄
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鍒犻櫎瀛楀吀淇℃伅
// @Param id path string true "id"
// @Success 200 {object} util.Response "鎴愬姛"
// @Router /api-wms/v1/dict/delete/{id} [delete]
@@ -177,12 +188,12 @@
// GetMiniDictList
//
-// @Tags 鏁版嵁瀛楀吀
-// @Summary 鑾峰彇杩蜂綘瀛楀吀鍒楄〃
-// @Produce application/json
-// @Param object query request.GetMiniDictList true "鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]models.MiniDict} "鎴愬姛"
-// @Router /api-wms/v1/dict/getDictList [get]
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鑾峰彇瀛楀吀淇℃伅鍒楄〃
+// @Produce application/json
+// @Param object body request.GetMiniDictList true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.MiniDict} "鎴愬姛"
+// @Router /api-wms/v1/dict/getDictList [post]
func (slf DictController) GetMiniDictList(c *gin.Context) {
var params request.GetMiniDictList
if err := c.BindJSON(¶ms); err != nil {
@@ -190,12 +201,16 @@
return
}
- if !params.Type.Valid() {
- util.ResponseFormat(c, code.RequestParamError, "瀛楀吀绫诲瀷閿欒")
- return
+ //if !params.Type.Valid() {
+ // util.ResponseFormat(c, code.RequestParamError, "瀛楀吀绫诲瀷閿欒")
+ // return
+ //}
+ dictSearch := models.NewMiniDictSearch()
+ if params.Type.Valid() {
+ dictSearch.SetType(params.Type)
}
- list, total, err := models.NewMiniDictSearch().SetType(params.Type).Find()
+ list, total, err := dictSearch.Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -203,3 +218,66 @@
util.ResponseFormatList(c, code.Success, list, int(total))
}
+
+// GetSilkDictList
+//
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鑾峰彇搴勫彛鍒楄〃
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param type path string true "瀛楀吀绫诲瀷"
+// @Success 200 {object} util.ResponseList{data=[]models.SilkDict} "鎴愬姛"
+// @Router /api-wms/v1/dict/getSilkDictList/{type} [get]
+func (slf DictController) GetSilkDictList(c *gin.Context) {
+
+ dictType, err := strconv.Atoi(c.Param("type"))
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "璇蜂紶鍏ユ纭殑瀛楀吀绫诲瀷")
+ return
+ }
+
+ list, err := models.NewSilkDictSearch().SetDictType(models.SilkDictType(dictType)).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
+ return
+ }
+ util.ResponseFormat(c, code.Success, list)
+}
+
+// GetUserList
+// @Tags 鏁版嵁瀛楀吀
+// @Summary 鑾峰彇鐢ㄦ埛鍒楄〃
+// @Produce application/json
+// @Param object query user.GetUserRequest true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]user.GetUserRequest} "鎴愬姛"
+// @Router /api-wms/v1/dict/getUserList [get]
+func (slf DictController) GetUserList(c *gin.Context) {
+ if init_client.AdminConn == nil {
+ util.ResponseFormat(c, code.InternalError, "璇峰厛閰嶇疆Admin鐨刧rpc鏈嶅姟淇℃伅")
+ }
+ query := new(user.GetUserRequest)
+ if c.Query("id") != "" {
+ query.Id = c.Query("id")
+ }
+ if c.Query("userName") != "" {
+ query.UserName = c.Query("userName")
+ }
+ if c.Query("nickName") != "" {
+ query.NickName = c.Query("nickName")
+ }
+ if c.Query("parentId") != "" {
+ query.ParentId = c.Query("parentId")
+ }
+ if userType, err := strconv.Atoi(c.Query("userType")); err == nil && userType > 0 {
+ query.UserType = int32(userType)
+ }
+
+ cli := user.NewUserServiceClient(init_client.AdminConn)
+ list, err := cli.GetUserList(context.Background(), query)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
+ logx.Error("grpc璋冪敤澶辫触, GetPersonnelList err : " + err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, list.List)
+}
--
Gitblit v1.8.0