添加方法，获取庄口列表

yinbentan

2024-07-16 93c71a94d77ffe1f36654decc0bada0a2ac27c88

添加方法，获取庄口列表

 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"
)

@@ -35,6 +39,12 @@

    if len(params.Name) == 0 {
        util.ResponseFormat(c, code.RequestParamError, "名称为空")
        return
    }

    _, err := models.NewMiniDictSearch().SetType(params.Type).SetName(params.Name).First()
    if !errors.Is(err, gorm.ErrRecordNotFound) {
        util.ResponseFormat(c, code.NameExistedError, "名称已存在")
        return
    }

@@ -181,7 +191,7 @@
//    @Tags        数据字典
//    @Summary    获取字典信息列表
//    @Produce    application/json
//     @Param        object    body        request.GetMiniDictList    true    "参数"
//    @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) {
@@ -208,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的grpc服务信息")
    }
    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)
}

 docs/docs.go

@@ -691,6 +691,122 @@
                }
            }
        },
        "/api-wms/v1/dict/getSilkDictList/{type}": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取庄口列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "字典类型",
                        "name": "type",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.SilkDict"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/getUserList": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取用户列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "nickName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "parentId",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "pos",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "userName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "userType",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/user.GetUserRequest"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/save": {
            "post": {
                "produces": [
@@ -1681,6 +1797,13 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1710,6 +1833,13 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -1895,6 +2025,13 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1952,6 +2089,13 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2119,6 +2263,13 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2224,6 +2375,13 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2253,6 +2411,13 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -4658,6 +4823,7 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5186,12 +5352,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5203,39 +5372,50 @@
                    ]
                },
                "checkedBy": {
                    "description": "验证者UserId",
                    "type": "string"
                },
                "comment": {
                    "description": "备注",
                    "type": "string"
                },
                "companyID": {
                    "description": "公司ID-客户",
                    "type": "string"
                },
                "companyName": {
                    "description": "公司名称-客户",
                    "type": "string"
                },
                "contacterID": {
                    "description": "联系人ID",
                    "type": "integer"
                },
                "contacterName": {
                    "description": "联系人姓名",
                    "type": "string"
                },
                "createBy": {
                    "description": "创建者UserId",
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "操作明细",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.OperationDetails"
@@ -5261,9 +5441,15 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "$ref": "#/definitions/models.LogisticCompany"
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5271,9 +5457,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5281,6 +5469,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5300,21 +5489,31 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salesDetailsNumber": {
                    "description": "销售明细编码",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket",
                    "type": "string"
                },
                "source": {
                    "description": "来源系统",
                    "type": "string"
                },
                "sourceNumber": {
@@ -5345,9 +5544,15 @@
                    "type": "string"
                },
                "warehouse": {
                    "$ref": "#/definitions/models.Warehouse"
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5368,9 +5573,11 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5412,7 +5619,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作id",
                    "description": "操作记录id",
                    "type": "integer"
                },
                "product": {
@@ -5428,11 +5635,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -5451,9 +5667,11 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5574,6 +5792,64 @@
                    "type": "string"
                }
            }
        },
        "models.SilkDict": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "dictType": {
                    "description": "字典类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.SilkDictType"
                        }
                    ]
                },
                "id": {
                    "type": "integer"
                },
                "name": {
                    "description": "名称",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.SilkDictType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "DictTypeColor": "颜色",
                "DictTypeMarket": "庄口",
                "DictTypeSpec": "规格",
                "DictTypeWorkshop": "车间"
            },
            "x-enum-varnames": [
                "DictTypeMarket",
                "DictTypeWorkshop",
                "DictTypeColor",
                "DictTypeSpec"
            ]
        },
        "models.SystemConfig": {
            "type": "object",
@@ -5963,13 +6239,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
                    "description": "基础作业类型 5库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -5997,15 +6275,19 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -6019,6 +6301,7 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6026,9 +6309,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6036,7 +6321,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `   //源位置id\nToLocationId      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `   //目标位置id",
                    "description": "FromLocationId    int                      ` + "`" + `json:\"fromLocationId\" ` + "`" + `   //源位置id\nToLocationId      int                      ` + "`" + `json:\"toLocationId\" ` + "`" + `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -6048,12 +6333,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6333,9 +6625,9 @@
                    "description": "每页大小",
                    "type": "integer"
                },
                "warehouseCode": {
                    "description": "仓库缩写",
                    "type": "string"
                "warehouseId": {
                    "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //仓库缩写",
                    "type": "integer"
                }
            }
        },
@@ -6372,6 +6664,13 @@
                },
                "unit": {
                    "description": "单位",
                    "type": "string"
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
@@ -6593,6 +6892,7 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6604,6 +6904,7 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6612,6 +6913,7 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6644,7 +6946,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "description": "ProductName string          ` + "`" + `json:\"productName\" ` + "`" + ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6660,7 +6962,7 @@
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
                    "description": "Unit        string          ` + "`" + `json:\"unit\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 产品",
                    "type": "integer"
                },
                "productId": {
@@ -6668,11 +6970,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -6696,7 +7007,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6704,9 +7015,11 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -6718,7 +7031,12 @@
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                }
            }
        },
@@ -7034,9 +7352,11 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7068,12 +7388,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7083,6 +7406,7 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7097,9 +7421,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7107,7 +7433,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                        ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `   //源位置id\nToLocationId      int                        ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `   //目标位置id",
                    "description": "FromLocationId    int                        ` + "`" + `json:\"fromLocationId\"  ` + "`" + `   //源位置id\nToLocationId      int                        ` + "`" + `json:\"toLocationId\" ` + "`" + `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -7119,12 +7445,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7288,8 +7621,16 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7369,6 +7710,29 @@
                }
            }
        },
        "user.GetUserRequest": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "string"
                },
                "nickName": {
                    "type": "string"
                },
                "parentId": {
                    "type": "string"
                },
                "pos": {
                    "type": "string"
                },
                "userName": {
                    "type": "string"
                },
                "userType": {
                    "type": "integer"
                }
            }
        },
        "util.Response": {
            "type": "object",
            "properties": {

 docs/swagger.json

@@ -680,6 +680,122 @@
                }
            }
        },
        "/api-wms/v1/dict/getSilkDictList/{type}": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取庄口列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "字典类型",
                        "name": "type",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/models.SilkDict"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/getUserList": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "数据字典"
                ],
                "summary": "获取用户列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "nickName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "parentId",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "pos",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "userName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "userType",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/user.GetUserRequest"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/dict/save": {
            "post": {
                "produces": [
@@ -1670,6 +1786,13 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1699,6 +1822,13 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -1884,6 +2014,13 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1941,6 +2078,13 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2108,6 +2252,13 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2213,6 +2364,13 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2242,6 +2400,13 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -4647,6 +4812,7 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5175,12 +5341,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5192,39 +5361,50 @@
                    ]
                },
                "checkedBy": {
                    "description": "验证者UserId",
                    "type": "string"
                },
                "comment": {
                    "description": "备注",
                    "type": "string"
                },
                "companyID": {
                    "description": "公司ID-客户",
                    "type": "string"
                },
                "companyName": {
                    "description": "公司名称-客户",
                    "type": "string"
                },
                "contacterID": {
                    "description": "联系人ID",
                    "type": "integer"
                },
                "contacterName": {
                    "description": "联系人姓名",
                    "type": "string"
                },
                "createBy": {
                    "description": "创建者UserId",
                    "type": "string"
                },
                "createTime": {
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "操作明细",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/models.OperationDetails"
@@ -5250,9 +5430,15 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "$ref": "#/definitions/models.LogisticCompany"
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5260,9 +5446,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5270,6 +5458,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5289,21 +5478,31 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salesDetailsNumber": {
                    "description": "销售明细编码",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket",
                    "type": "string"
                },
                "source": {
                    "description": "来源系统",
                    "type": "string"
                },
                "sourceNumber": {
@@ -5334,9 +5533,15 @@
                    "type": "string"
                },
                "warehouse": {
                    "$ref": "#/definitions/models.Warehouse"
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5357,9 +5562,11 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5401,7 +5608,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作id",
                    "description": "操作记录id",
                    "type": "integer"
                },
                "product": {
@@ -5417,11 +5624,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -5440,9 +5656,11 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5563,6 +5781,64 @@
                    "type": "string"
                }
            }
        },
        "models.SilkDict": {
            "type": "object",
            "properties": {
                "createdAt": {
                    "type": "string"
                },
                "deletedAt": {
                    "$ref": "#/definitions/gorm.DeletedAt"
                },
                "dictType": {
                    "description": "字典类型",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.SilkDictType"
                        }
                    ]
                },
                "id": {
                    "type": "integer"
                },
                "name": {
                    "description": "名称",
                    "type": "string"
                },
                "number": {
                    "description": "编号",
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "updatedAt": {
                    "type": "string"
                }
            }
        },
        "models.SilkDictType": {
            "type": "integer",
            "enum": [
                1,
                2,
                3,
                4
            ],
            "x-enum-comments": {
                "DictTypeColor": "颜色",
                "DictTypeMarket": "庄口",
                "DictTypeSpec": "规格",
                "DictTypeWorkshop": "车间"
            },
            "x-enum-varnames": [
                "DictTypeMarket",
                "DictTypeWorkshop",
                "DictTypeColor",
                "DictTypeSpec"
            ]
        },
        "models.SystemConfig": {
            "type": "object",
@@ -5952,13 +6228,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
                    "description": "基础作业类型 5库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -5986,15 +6264,19 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "dealerType": {
                    "description": "调拨出入库类型",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -6008,6 +6290,7 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6015,9 +6298,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6025,7 +6310,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "description": "FromLocationId    int                      `json:\"fromLocationId\" `   //源位置id\nToLocationId      int                      `json:\"toLocationId\" `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -6037,12 +6322,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6322,9 +6614,9 @@
                    "description": "每页大小",
                    "type": "integer"
                },
                "warehouseCode": {
                    "description": "仓库缩写",
                    "type": "string"
                "warehouseId": {
                    "description": "WarehouseCode string `json:\"warehouseCode\"` //仓库缩写",
                    "type": "integer"
                }
            }
        },
@@ -6361,6 +6653,13 @@
                },
                "unit": {
                    "description": "单位",
                    "type": "string"
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
@@ -6582,6 +6881,7 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6593,6 +6893,7 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6601,6 +6902,7 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6633,7 +6935,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "description": "ProductName string          `json:\"productName\" ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6649,7 +6951,7 @@
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"`                    //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
                    "description": "Unit        string          `json:\"unit\"`                    //单位\nProduct models.Material `json:\"product\" ` // 产品",
                    "type": "integer"
                },
                "productId": {
@@ -6657,11 +6959,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -6685,7 +6996,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6693,9 +7004,11 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -6707,7 +7020,12 @@
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                }
            }
        },
@@ -7023,9 +7341,11 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7057,12 +7377,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7072,6 +7395,7 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7086,9 +7410,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7096,7 +7422,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationId    int                        `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                        `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "description": "FromLocationId    int                        `json:\"fromLocationId\"  `   //源位置id\nToLocationId      int                        `json:\"toLocationId\" `   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -7108,12 +7434,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7277,8 +7610,16 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7358,6 +7699,29 @@
                }
            }
        },
        "user.GetUserRequest": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "string"
                },
                "nickName": {
                    "type": "string"
                },
                "parentId": {
                    "type": "string"
                },
                "pos": {
                    "type": "string"
                },
                "userName": {
                    "type": "string"
                },
                "userType": {
                    "type": "integer"
                }
            }
        },
        "util.Response": {
            "type": "object",
            "properties": {

 docs/swagger.yaml

@@ -541,6 +541,7 @@
      updateTime:
        type: string
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  models.LogisticCompany:
@@ -919,38 +920,52 @@
  models.Operation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      auditDate:
        description: 审批时间
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      checkedBy:
        description: 验证者UserId
        type: string
      comment:
        description: 备注
        type: string
      companyID:
        description: 公司ID-客户
        type: string
      companyName:
        description: 公司名称-客户
        type: string
      contacterID:
        description: 联系人ID
        type: integer
      contacterName:
        description: 联系人姓名
        type: string
      createBy:
        description: 创建者UserId
        type: string
      createTime:
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 操作明细
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
@@ -967,20 +982,26 @@
        description: 源位置id
        type: integer
      logisticCompany:
        $ref: '#/definitions/models.LogisticCompany'
        allOf:
        - $ref: '#/definitions/models.LogisticCompany'
        description: 物流公司信息
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: 安排日期
        type: string
      operationSource:
        allOf:
@@ -993,16 +1014,25 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      remark:
        description: 备注
        type: string
      salesDetailsNumber:
        description: 销售明细编码
        type: string
      silkMarket:
        description: 嘉联仓储添加 SilkMarket
        type: string
      source:
        description: 来源系统
        type: string
      sourceNumber:
        description: 源单号
@@ -1021,8 +1051,11 @@
      updateTime:
        type: string
      warehouse:
        $ref: '#/definitions/models.Warehouse'
        allOf:
        - $ref: '#/definitions/models.Warehouse'
        description: 仓库信息
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1038,8 +1071,10 @@
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      baseOperationType:
        allOf:
@@ -1066,7 +1101,7 @@
        description: 是否调拨产生的出库
        type: boolean
      operationId:
        description: 操作id
        description: 操作记录id
        type: integer
      product:
        allOf:
@@ -1076,10 +1111,17 @@
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 嘉联仓储添加 SilkMarket、SilkMarketClose
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
@@ -1091,8 +1133,10 @@
        description: 目标位置id
        type: integer
      totalGrossWeight:
        description: 总毛重
        type: number
      totalNetWeight:
        description: 总净重
        type: number
      updateTime:
        type: string
@@ -1173,6 +1217,47 @@
      updateTime:
        type: string
    type: object
  models.SilkDict:
    properties:
      createdAt:
        type: string
      deletedAt:
        $ref: '#/definitions/gorm.DeletedAt'
      dictType:
        allOf:
        - $ref: '#/definitions/models.SilkDictType'
        description: 字典类型
      id:
        type: integer
      name:
        description: 名称
        type: string
      number:
        description: 编号
        type: string
      remark:
        description: 备注
        type: string
      updatedAt:
        type: string
    type: object
  models.SilkDictType:
    enum:
    - 1
    - 2
    - 3
    - 4
    type: integer
    x-enum-comments:
      DictTypeColor: 颜色
      DictTypeMarket: 庄口
      DictTypeSpec: 规格
      DictTypeWorkshop: 车间
    x-enum-varnames:
    - DictTypeMarket
    - DictTypeWorkshop
    - DictTypeColor
    - DictTypeSpec
  models.SystemConfig:
    properties:
      configType:
@@ -1438,13 +1523,15 @@
  request.AddOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 5库存盘点
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      comment:
        description: 备注
        type: string
@@ -1461,12 +1548,16 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
@@ -1476,21 +1567,24 @@
        description: 源位置id
        type: integer
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
          FromLocationId    int                      `json:"fromLocationId" `   //源位置id
          ToLocationId      int                      `json:"toLocationId" `   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -1499,10 +1593,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -1693,9 +1793,9 @@
      pageSize:
        description: 每页大小
        type: integer
      warehouseCode:
        description: 仓库缩写
        type: string
      warehouseId:
        description: WarehouseCode string `json:"warehouseCode"` //仓库缩写
        type: integer
    type: object
  request.GetInventoryHistory:
    properties:
@@ -1720,6 +1820,11 @@
        type: string
      unit:
        description: 单位
        type: string
      warehouseCode:
        type: string
      warehouseId:
        description: 仓库ID
        type: string
    type: object
  request.GetList:
@@ -1870,6 +1975,7 @@
  request.OperationAllList:
    properties:
      number:
        description: 单号
        type: string
      page:
        description: 页码
@@ -1878,11 +1984,13 @@
        description: 每页大小
        type: integer
      sourceNumber:
        description: 源单号
        type: string
    type: object
  request.OperationCondition:
    properties:
      condition:
        description: 模糊查询条件
        type: string
      keyword:
        description: 关键字搜索
@@ -1906,8 +2014,7 @@
        description: 操作id
        type: integer
      amount:
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        description: ProductName string          `json:"productName" ` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
@@ -1920,17 +2027,24 @@
        type: number
      fromLocationId:
        description: |-
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
          Unit        string          `json:"unit"`                    //单位
          Product models.Material `json:"product" ` // 产品
        type: integer
      productId:
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 庄口
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
@@ -1949,10 +2063,12 @@
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      number:
        description: 单号
        type: string
      operationTypeId:
        description: 作业类型id
        type: integer
      page:
        description: 页码
@@ -1961,7 +2077,9 @@
        description: 每页大小
        type: integer
      status:
        $ref: '#/definitions/constvar.OperationStatus'
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
    type: object
  request.PageInfo:
    properties:
@@ -2173,8 +2291,10 @@
  request.UpdateOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
@@ -2196,16 +2316,20 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealerType:
        description: 调拨出入库分类(对应dict字典表的ID)
        type: integer
      locationId:
        description: 源位置id
@@ -2216,16 +2340,18 @@
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
          FromLocationId    int                        `json:"fromLocationId"  `   //源位置id
          ToLocationId      int                        `json:"toLocationId" `   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -2234,10 +2360,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -2349,8 +2481,14 @@
      produceId:
        description: 产品id
        type: string
      productCategory:
        description: 产品类别
        type: string
      productName:
        description: 产品名称
        type: string
      productSpecs:
        description: 产品规格
        type: string
      productType:
        description: 产品类型
@@ -2406,6 +2544,21 @@
        items:
          $ref: '#/definitions/models.Material'
        type: array
    type: object
  user.GetUserRequest:
    properties:
      id:
        type: string
      nickName:
        type: string
      parentId:
        type: string
      pos:
        type: string
      userName:
        type: string
      userType:
        type: integer
    type: object
  util.Response:
    properties:
@@ -2852,6 +3005,74 @@
                  type: array
              type: object
      summary: 获取字典信息列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getSilkDictList/{type}:
    get:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 字典类型
        in: path
        name: type
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.SilkDict'
                  type: array
              type: object
      summary: 获取庄口列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getUserList:
    get:
      parameters:
      - in: query
        name: id
        type: string
      - in: query
        name: nickName
        type: string
      - in: query
        name: parentId
        type: string
      - in: query
        name: pos
        type: string
      - in: query
        name: userName
        type: string
      - in: query
        name: userType
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/user.GetUserRequest'
                  type: array
              type: object
      summary: 获取用户列表
      tags:
      - 数据字典
  /api-wms/v1/dict/save:
@@ -3447,6 +3668,11 @@
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3466,6 +3692,11 @@
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入参
        in: body
        name: object
@@ -3578,6 +3809,11 @@
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3615,6 +3851,11 @@
  /api-wms/v1/operation/finish/{id}:
    put:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -3716,6 +3957,11 @@
  /api-wms/v1/operation/list:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 查询参数
        in: body
        name: object
@@ -3780,6 +4026,11 @@
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3799,6 +4050,11 @@
  /api-wms/v1/operation/operation/{id}:
    delete:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id

 models/silk_dict.go

New file
@@ -0,0 +1,289 @@
package models

import (
    "fmt"
    "gorm.io/gorm"
    "wms/pkg/mysqlx"
)

type SilkDictType int

const (
    DictTypeMarket   SilkDictType = iota + 1 //庄口
    DictTypeWorkshop                         //车间
    DictTypeColor                            //颜色
    DictTypeSpec                             //规格
)

type (
    // SilkDict 缫丝词典
    SilkDict struct {
        gorm.Model
        DictType SilkDictType `gorm:"index;type:tinyint(3);not null;comment:字典类型"`         //字典类型
        Number   string       `gorm:"type:varchar(255);not null;comment:编号" json:"number"` //编号
        Name     string       `gorm:"type:varchar(255);not null;comment:名称" json:"name"`   //名称
        Remark   string       `gorm:"type:varchar(255);not null;comment:备注" json:"remark"` //备注
    }

    SilkDictSearch struct {
        SilkDict
        Order     string
        PageNum   int
        PageSize  int
        Orm       *gorm.DB
        Keyword   string
        DictTypes []SilkDictType
    }
)

func (slf *SilkDict) TableName() string {
    return "silk_dict"
}

func NewSilkDictSearch() *SilkDictSearch {
    return &SilkDictSearch{Orm: mysqlx.GetDB()}
}

func (slf *SilkDictSearch) SetOrm(tx *gorm.DB) *SilkDictSearch {
    slf.Orm = tx
    return slf
}

func (slf *SilkDictSearch) SetPage(page, size int) *SilkDictSearch {
    slf.PageNum, slf.PageSize = page, size
    return slf
}

func (slf *SilkDictSearch) SetOrder(order string) *SilkDictSearch {
    slf.Order = order
    return slf
}

func (slf *SilkDictSearch) SetID(id uint) *SilkDictSearch {
    slf.ID = id
    return slf
}

func (slf *SilkDictSearch) SetNumber(number string) *SilkDictSearch {
    slf.Number = number
    return slf
}

func (slf *SilkDictSearch) SetName(name string) *SilkDictSearch {
    slf.Name = name
    return slf
}

func (slf *SilkDictSearch) SetKeyword(keyword string) *SilkDictSearch {
    slf.Keyword = keyword
    return slf
}

func (slf *SilkDictSearch) SetDictType(dt SilkDictType) *SilkDictSearch {
    slf.DictType = dt
    return slf
}

func (slf *SilkDictSearch) SetDictTypes(dts []SilkDictType) *SilkDictSearch {
    slf.DictTypes = dts
    return slf
}

func (slf *SilkDictSearch) build() *gorm.DB {
    var db = slf.Orm.Table(slf.TableName())

    if slf.ID != 0 {
        db = db.Where("id = ?", slf.ID)
    }

    if slf.Order != "" {
        db = db.Order(slf.Order)
    }

    if slf.Number != "" {
        db = db.Where("number = ?", slf.Number)
    }

    if slf.DictType > 0 {
        db = db.Where("dict_type = ?", slf.DictType)
    }

    if slf.Name != "" {
        db = db.Where("name = ?", slf.Name)
    }

    if slf.Keyword != "" {
        kw := "%" + slf.Keyword + "%"
        db = db.Where("name like ? or number like ?", kw, kw)
    }

    if len(slf.DictTypes) > 0 {
        db = db.Where("dict_type in (?)", slf.DictTypes)
    }

    return db
}

// Create 单条插入
func (slf *SilkDictSearch) Create(record *SilkDict) error {
    var db = slf.build()

    if err := db.Create(record).Error; err != nil {
        return fmt.Errorf("create err: %v, record: %+v", err, record)
    }

    return nil
}

// CreateBatch 批量插入
func (slf *SilkDictSearch) CreateBatch(records []*SilkDict) error {
    var db = slf.build()

    if err := db.Create(&records).Error; err != nil {
        return fmt.Errorf("create batch err: %v, records: %+v", err, records)
    }

    return nil
}

func (slf *SilkDictSearch) Save(record *SilkDict) error {
    var db = slf.build()

    if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
        return fmt.Errorf("save err: %v, record: %+v", err, record)
    }

    return nil
}

func (slf *SilkDictSearch) Update(record *SilkDict) error {
    var db = slf.build()

    if err := db.Updates(record).Error; err != nil {
        return fmt.Errorf("save err: %v, record: %+v", err, record)
    }

    return nil
}

func (slf *SilkDictSearch) UpdateByMap(upMap map[string]interface{}) error {
    var (
        db = slf.build()
    )

    if err := db.Updates(upMap).Error; err != nil {
        return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
    }

    return nil
}

func (slf *SilkDictSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
    var (
        db = slf.Orm.Table(slf.TableName()).Where(query, args...)
    )

    if err := db.Updates(upMap).Error; err != nil {
        return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
    }

    return nil
}

func (slf *SilkDictSearch) Delete() error {
    var db = slf.build()

    if err := db.Unscoped().Delete(&SilkDict{}).Error; err != nil {
        return err
    }

    return nil
}

func (slf *SilkDictSearch) First() (*SilkDict, error) {
    var (
        record = new(SilkDict)
        db     = slf.build()
    )

    if err := db.First(record).Error; err != nil {
        return record, err
    }

    return record, nil
}

func (slf *SilkDictSearch) Find() ([]*SilkDict, int64, error) {
    var (
        records = make([]*SilkDict, 0)
        total   int64
        db      = slf.build()
    )

    if err := db.Count(&total).Error; err != nil {
        return records, total, fmt.Errorf("find count err: %v", err)
    }
    if slf.PageNum*slf.PageSize > 0 {
        db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
    }
    if err := db.Find(&records).Error; err != nil {
        return records, total, fmt.Errorf("find records err: %v", err)
    }

    return records, total, nil
}

func (slf *SilkDictSearch) FindAll() ([]*SilkDict, error) {
    var (
        records = make([]*SilkDict, 0)
        db      = slf.build()
    )
    if err := db.Find(&records).Error; err != nil {
        return records, fmt.Errorf("find records err: %v", err)
    }

    return records, nil
}

// FindByQuery 指定条件查询.
func (slf *SilkDictSearch) FindByQuery(query string, args []interface{}) ([]*SilkDict, int64, error) {
    var (
        records = make([]*SilkDict, 0)
        total   int64
        db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
    )

    if err := db.Count(&total).Error; err != nil {
        return records, total, fmt.Errorf("find by query count err: %v", err)
    }
    if slf.PageNum*slf.PageSize > 0 {
        db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
    }
    if err := db.Find(&records).Error; err != nil {
        return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
    }

    return records, total, nil
}

// FindByQueryNotTotal 指定条件查询&不查询总条数.
func (slf *SilkDictSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*SilkDict, error) {
    var (
        records = make([]*SilkDict, 0)
        db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
    )

    if slf.PageNum*slf.PageSize > 0 {
        db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
    }
    if err := db.Find(&records).Error; err != nil {
        return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
    }

    return records, nil
}

// InitDefaultData 初始化数据
func (slf *SilkDictSearch) InitDefaultData() error {
    return nil
}

 router/router.go

@@ -224,11 +224,13 @@
    dictController := new(controllers.DictController)
    dictApi := r.Group(urlPrefix + "/dict")
    {
        dictApi.POST("add", dictController.AddMiniDict)             //添加字典信息
        dictApi.POST("edit", dictController.EditMiniDict)           //修改字典信息
        dictApi.DELETE("delete/:id", dictController.DeleteMiniDict) //删除字典信息
        dictApi.POST("save", dictController.SaveMiniDict)           //批量保存系统设置
        dictApi.POST("getDictList", dictController.GetMiniDictList) //获取字典信息列表
        dictApi.POST("add", dictController.AddMiniDict)                      //添加字典信息
        dictApi.POST("edit", dictController.EditMiniDict)                    //修改字典信息
        dictApi.DELETE("delete/:id", dictController.DeleteMiniDict)          //删除字典信息
        dictApi.POST("save", dictController.SaveMiniDict)                    //批量保存系统设置
        dictApi.POST("getDictList", dictController.GetMiniDictList)          //获取字典信息列表
        dictApi.GET("getSilkDictList/:type", dictController.GetSilkDictList) // 获取庄口列表
        dictApi.GET("getUserList", dictController.GetUserList)               // 获取用户列表
    }

    //系统配置