修改方法，去除庄口获取庄口列表方法；添加产品来源字典类型；添加字典模糊搜索

yinbentan

2024-07-17 e598e4d2718c41352eafae19284ffe358b8c8181

修改方法，去除庄口获取庄口列表方法；添加产品来源字典类型；添加字典模糊搜索

 constvar/const.go

@@ -333,6 +333,7 @@
    TransferType                          // 调拨类型
    TakeStockType                         // 盘点类型
    DisuseType                            // 报废类型
    ProductSource                         // 产品来源
)

const (

 controllers/dict_controller.go

@@ -3,9 +3,11 @@
import (
    "context"
    "errors"
    "fmt"
    "github.com/gin-gonic/gin"
    "gorm.io/gorm"
    "strconv"
    "wms/constvar"
    "wms/extend/code"
    "wms/extend/util"
    "wms/models"
@@ -48,8 +50,10 @@
        return
    }

    autoCode, _ := getAutoCode(params.Type)
    record := models.MiniDict{
        Type:      params.Type,
        Code:      autoCode,
        Name:      params.Name,
        Value:     params.Value,
        IsDefault: params.IsDefault,
@@ -95,6 +99,7 @@

    record := models.MiniDict{
        Type:      params.Type,
        Code:      params.Code,
        Name:      params.Name,
        Value:     params.Value,
        IsDefault: params.IsDefault,
@@ -201,47 +206,13 @@
        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 := dictSearch.Find()
    list, total, err := models.NewMiniDictSearch().SetKeyword(params.Keyword).SetType(params.Type).Find()
    if err != nil {
        util.ResponseFormat(c, code.RequestParamError, "查找失败")
        return
    }

    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
@@ -281,3 +252,37 @@
    }
    util.ResponseFormat(c, code.Success, list.List)
}

// GetAutoCode 获取字典自动编码
func getAutoCode(dictType constvar.MiniDictType) (string, error) {

    var prefix string
    switch constvar.MiniDictType(dictType) {
    case constvar.StorageType:
        prefix = "IN0"
    case constvar.StockoutType:
        prefix = "OUT"
    case constvar.TransferType:
        prefix = "TF0"
    case constvar.TakeStockType:
        prefix = "TS0"
    case constvar.DisuseType:
        prefix = "DIS"
    case constvar.ProductSource:
        prefix = "PS0"
    default:
        return "", errors.New("编码规则不存在")
    }
    id, err := models.NewMiniDictSearch().SetType(constvar.MiniDictType(dictType)).MaxAutoIncr()
    if err != nil {
        return "", errors.New("获取最大值失败")
    }

    strMaxAutoIncr := strconv.Itoa(id + 1)
    count := 5 - len(strMaxAutoIncr)
    for i := 0; i < count; i++ {
        strMaxAutoIncr = "0" + strMaxAutoIncr
    }

    return fmt.Sprintf("%v%v", prefix, strMaxAutoIncr), nil
}

 docs/docs.go

@@ -691,6 +691,72 @@
                }
            }
        },
        "/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 +1747,13 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1710,6 +1783,13 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -1895,6 +1975,13 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1952,6 +2039,13 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2119,6 +2213,13 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2224,6 +2325,13 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2253,6 +2361,13 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -4245,10 +4360,12 @@
                2,
                3,
                4,
                5
                5,
                6
            ],
            "x-enum-comments": {
                "DisuseType": "报废类型",
                "ProductSource": "产品来源",
                "StockoutType": "出库类型",
                "StorageType": "入库类型",
                "TakeStockType": "盘点类型",
@@ -4259,7 +4376,8 @@
                "StockoutType",
                "TransferType",
                "TakeStockType",
                "DisuseType"
                "DisuseType",
                "ProductSource"
            ]
        },
        "constvar.OperationSource": {
@@ -4716,6 +4834,7 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5244,12 +5363,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5261,39 +5383,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"
@@ -5319,9 +5452,15 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "$ref": "#/definitions/models.LogisticCompany"
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5329,9 +5468,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5339,6 +5480,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5358,21 +5500,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": {
@@ -5403,9 +5555,15 @@
                    "type": "string"
                },
                "warehouse": {
                    "$ref": "#/definitions/models.Warehouse"
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5426,9 +5584,11 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5470,7 +5630,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作id",
                    "description": "操作记录id",
                    "type": "integer"
                },
                "product": {
@@ -5486,11 +5646,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "嘉联仓储添加 SilkMarket、SilkMarketClose",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -5509,9 +5678,11 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5995,6 +6166,10 @@
        "request.AddMiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "isDefault": {
                    "description": "是否默认",
                    "type": "boolean"
@@ -6021,13 +6196,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"
@@ -6055,15 +6232,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"
@@ -6077,6 +6258,7 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6084,9 +6266,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6094,7 +6278,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": {
@@ -6106,12 +6290,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6315,6 +6506,10 @@
        "request.EditMiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "id": {
                    "description": "字典类型",
                    "type": "integer"
@@ -6434,6 +6629,10 @@
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
        },
@@ -6540,6 +6739,10 @@
        "request.GetMiniDictList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "description": "关键字查询",
                    "type": "string"
                },
                "type": {
                    "description": "字典类型",
                    "allOf": [
@@ -6636,6 +6839,10 @@
        "request.MiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "isDefault": {
                    "description": "是否默认",
                    "type": "boolean"
@@ -6654,6 +6861,7 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6665,6 +6873,7 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6673,6 +6882,7 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6705,7 +6915,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "description": "ProductName string          ` + "`" + `json:\"productName\" ` + "`" + ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6721,7 +6931,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": {
@@ -6729,11 +6939,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -6757,7 +6976,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6765,9 +6984,11 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -6779,7 +7000,12 @@
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                }
            }
        },
@@ -7095,9 +7321,11 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7129,12 +7357,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7144,6 +7375,7 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7158,9 +7390,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7168,7 +7402,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": {
@@ -7180,12 +7414,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7349,8 +7590,16 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7430,6 +7679,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,72 @@
                }
            }
        },
        "/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 +1736,13 @@
                "summary": "添加库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1699,6 +1772,13 @@
                ],
                "summary": "应用、验证",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入参",
                        "name": "object",
@@ -1884,6 +1964,13 @@
                "summary": "修改库存盘点信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -1941,6 +2028,13 @@
                ],
                "summary": "更改记录状态",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -2108,6 +2202,13 @@
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
@@ -2213,6 +2314,13 @@
                "summary": "添加入库/出库",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "description": "入库/出库信息",
                        "name": "object",
                        "in": "body",
@@ -2242,6 +2350,13 @@
                ],
                "summary": "删除入库/出库信息",
                "parameters": [
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "id",
@@ -4234,10 +4349,12 @@
                2,
                3,
                4,
                5
                5,
                6
            ],
            "x-enum-comments": {
                "DisuseType": "报废类型",
                "ProductSource": "产品来源",
                "StockoutType": "出库类型",
                "StorageType": "入库类型",
                "TakeStockType": "盘点类型",
@@ -4248,7 +4365,8 @@
                "StockoutType",
                "TransferType",
                "TakeStockType",
                "DisuseType"
                "DisuseType",
                "ProductSource"
            ]
        },
        "constvar.OperationSource": {
@@ -4705,6 +4823,7 @@
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                }
            }
@@ -5233,12 +5352,15 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "auditDate": {
                    "description": "审批时间",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5250,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"
@@ -5308,9 +5441,15 @@
                    "type": "integer"
                },
                "logisticCompany": {
                    "$ref": "#/definitions/models.LogisticCompany"
                    "description": "物流公司信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.LogisticCompany"
                        }
                    ]
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -5318,9 +5457,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -5328,6 +5469,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "type": "string"
                },
                "operationSource": {
@@ -5347,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": {
@@ -5392,9 +5544,15 @@
                    "type": "string"
                },
                "warehouse": {
                    "$ref": "#/definitions/models.Warehouse"
                    "description": "仓库信息",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Warehouse"
                        }
                    ]
                },
                "warehouseId": {
                    "description": "仓库id",
                    "type": "integer"
                },
                "waybillNumber": {
@@ -5415,9 +5573,11 @@
                    "type": "number"
                },
                "auxiliaryAmount": {
                    "description": "辅助数量",
                    "type": "number"
                },
                "auxiliaryUnit": {
                    "description": "辅助单位",
                    "type": "string"
                },
                "baseOperationType": {
@@ -5459,7 +5619,7 @@
                    "type": "boolean"
                },
                "operationId": {
                    "description": "操作id",
                    "description": "操作记录id",
                    "type": "integer"
                },
                "product": {
@@ -5475,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": "库存数量，盘点时用",
@@ -5498,9 +5667,11 @@
                    "type": "integer"
                },
                "totalGrossWeight": {
                    "description": "总毛重",
                    "type": "number"
                },
                "totalNetWeight": {
                    "description": "总净重",
                    "type": "number"
                },
                "updateTime": {
@@ -5984,6 +6155,10 @@
        "request.AddMiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "isDefault": {
                    "description": "是否默认",
                    "type": "boolean"
@@ -6010,13 +6185,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"
@@ -6044,15 +6221,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"
@@ -6066,6 +6247,7 @@
                    "type": "integer"
                },
                "logisticCompanyId": {
                    "description": "物流公司id",
                    "type": "string"
                },
                "logisticWeight": {
@@ -6073,9 +6255,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -6083,7 +6267,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": {
@@ -6095,12 +6279,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "sourceNumber": {
@@ -6304,6 +6495,10 @@
        "request.EditMiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "id": {
                    "description": "字典类型",
                    "type": "integer"
@@ -6423,6 +6618,10 @@
                },
                "warehouseCode": {
                    "type": "string"
                },
                "warehouseId": {
                    "description": "仓库ID",
                    "type": "string"
                }
            }
        },
@@ -6529,6 +6728,10 @@
        "request.GetMiniDictList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "description": "关键字查询",
                    "type": "string"
                },
                "type": {
                    "description": "字典类型",
                    "allOf": [
@@ -6625,6 +6828,10 @@
        "request.MiniDict": {
            "type": "object",
            "properties": {
                "code": {
                    "description": "编码",
                    "type": "string"
                },
                "isDefault": {
                    "description": "是否默认",
                    "type": "boolean"
@@ -6643,6 +6850,7 @@
            "type": "object",
            "properties": {
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "page": {
@@ -6654,6 +6862,7 @@
                    "type": "integer"
                },
                "sourceNumber": {
                    "description": "源单号",
                    "type": "string"
                }
            }
@@ -6662,6 +6871,7 @@
            "type": "object",
            "properties": {
                "condition": {
                    "description": "模糊查询条件",
                    "type": "string"
                },
                "keyword": {
@@ -6694,7 +6904,7 @@
                    "type": "integer"
                },
                "amount": {
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "description": "ProductName string          `json:\"productName\" ` //产品名称",
                    "type": "number"
                },
                "auxiliaryAmount": {
@@ -6710,7 +6920,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": {
@@ -6718,11 +6928,20 @@
                    "type": "string"
                },
                "remark": {
                    "description": "备注",
                    "type": "string"
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "silkMarketClose": {
                    "description": "庄口关闭",
                    "type": "string"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
@@ -6746,7 +6965,7 @@
            "type": "object",
            "properties": {
                "baseOperationType": {
                    "description": "1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "description": "基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.BaseOperationType"
@@ -6754,9 +6973,11 @@
                    ]
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "operationTypeId": {
                    "description": "作业类型id",
                    "type": "integer"
                },
                "page": {
@@ -6768,7 +6989,12 @@
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/constvar.OperationStatus"
                    "description": "状态",
                    "allOf": [
                        {
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                }
            }
        },
@@ -7084,9 +7310,11 @@
            "type": "object",
            "properties": {
                "accountant": {
                    "description": "会计名称",
                    "type": "string"
                },
                "accountantId": {
                    "description": "会计id",
                    "type": "string"
                },
                "baseOperationType": {
@@ -7118,12 +7346,15 @@
                    "type": "string"
                },
                "custodian": {
                    "description": "保管员名称",
                    "type": "string"
                },
                "custodianId": {
                    "description": "保管员id",
                    "type": "string"
                },
                "details": {
                    "description": "详情",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/request.OperationDetails"
@@ -7133,6 +7364,7 @@
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "description": "调拨出入库分类(对应dict字典表的ID)",
                    "type": "integer"
                },
                "locationId": {
@@ -7147,9 +7379,11 @@
                    "type": "number"
                },
                "manager": {
                    "description": "主管名称",
                    "type": "string"
                },
                "managerId": {
                    "description": "主管id",
                    "type": "string"
                },
                "number": {
@@ -7157,7 +7391,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": {
@@ -7169,12 +7403,19 @@
                    "type": "string"
                },
                "receiverAddr": {
                    "description": "收货地址",
                    "type": "string"
                },
                "receiverName": {
                    "description": "收货人姓名",
                    "type": "string"
                },
                "receiverPhone": {
                    "description": "联系电话",
                    "type": "string"
                },
                "silkMarket": {
                    "description": "庄口编码",
                    "type": "string"
                },
                "sourceNumber": {
@@ -7338,8 +7579,16 @@
                    "description": "产品id",
                    "type": "string"
                },
                "productCategory": {
                    "description": "产品类别",
                    "type": "string"
                },
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productSpecs": {
                    "description": "产品规格",
                    "type": "string"
                },
                "productType": {
@@ -7419,6 +7668,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

@@ -213,9 +213,11 @@
    - 3
    - 4
    - 5
    - 6
    type: integer
    x-enum-comments:
      DisuseType: 报废类型
      ProductSource: 产品来源
      StockoutType: 出库类型
      StorageType: 入库类型
      TakeStockType: 盘点类型
@@ -226,6 +228,7 @@
    - TransferType
    - TakeStockType
    - DisuseType
    - ProductSource
  constvar.OperationSource:
    enum:
    - 1
@@ -556,6 +559,7 @@
      updateTime:
        type: string
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  models.LogisticCompany:
@@ -934,38 +938,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
@@ -982,20 +1000,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:
@@ -1008,16 +1032,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: 源单号
@@ -1036,8 +1069,11 @@
      updateTime:
        type: string
      warehouse:
        $ref: '#/definitions/models.Warehouse'
        allOf:
        - $ref: '#/definitions/models.Warehouse'
        description: 仓库信息
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1053,8 +1089,10 @@
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      baseOperationType:
        allOf:
@@ -1081,7 +1119,7 @@
        description: 是否调拨产生的出库
        type: boolean
      operationId:
        description: 操作id
        description: 操作记录id
        type: integer
      product:
        allOf:
@@ -1091,10 +1129,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
@@ -1106,8 +1151,10 @@
        description: 目标位置id
        type: integer
      totalGrossWeight:
        description: 总毛重
        type: number
      totalNetWeight:
        description: 总净重
        type: number
      updateTime:
        type: string
@@ -1436,6 +1483,9 @@
    type: object
  request.AddMiniDict:
    properties:
      code:
        description: 编码
        type: string
      isDefault:
        description: 是否默认
        type: boolean
@@ -1453,13 +1503,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
@@ -1476,12 +1528,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
@@ -1491,21 +1547,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
@@ -1514,10 +1573,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口编码
        type: string
      sourceNumber:
        description: 源单号
@@ -1656,6 +1721,9 @@
    type: object
  request.EditMiniDict:
    properties:
      code:
        description: 编码
        type: string
      id:
        description: 字典类型
        type: integer
@@ -1738,6 +1806,9 @@
        type: string
      warehouseCode:
        type: string
      warehouseId:
        description: 仓库ID
        type: string
    type: object
  request.GetList:
    properties:
@@ -1810,6 +1881,9 @@
    type: object
  request.GetMiniDictList:
    properties:
      keyword:
        description: 关键字查询
        type: string
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
@@ -1874,6 +1948,9 @@
    type: object
  request.MiniDict:
    properties:
      code:
        description: 编码
        type: string
      isDefault:
        description: 是否默认
        type: boolean
@@ -1887,6 +1964,7 @@
  request.OperationAllList:
    properties:
      number:
        description: 单号
        type: string
      page:
        description: 页码
@@ -1895,11 +1973,13 @@
        description: 每页大小
        type: integer
      sourceNumber:
        description: 源单号
        type: string
    type: object
  request.OperationCondition:
    properties:
      condition:
        description: 模糊查询条件
        type: string
      keyword:
        description: 关键字搜索
@@ -1923,8 +2003,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: 辅助数量
@@ -1937,17 +2016,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
@@ -1966,10 +2052,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: 页码
@@ -1978,7 +2066,9 @@
        description: 每页大小
        type: integer
      status:
        $ref: '#/definitions/constvar.OperationStatus'
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
    type: object
  request.PageInfo:
    properties:
@@ -2190,8 +2280,10 @@
  request.UpdateOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
@@ -2213,16 +2305,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
@@ -2233,16 +2329,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
@@ -2251,10 +2349,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口编码
        type: string
      sourceNumber:
        description: 源单号
@@ -2366,8 +2470,14 @@
      produceId:
        description: 产品id
        type: string
      productCategory:
        description: 产品类别
        type: string
      productName:
        description: 产品名称
        type: string
      productSpecs:
        description: 产品规格
        type: string
      productType:
        description: 产品类型
@@ -2423,6 +2533,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:
@@ -2869,6 +2994,44 @@
                  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:
@@ -3464,6 +3627,11 @@
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3483,6 +3651,11 @@
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入参
        in: body
        name: object
@@ -3595,6 +3768,11 @@
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3632,6 +3810,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
@@ -3733,6 +3916,11 @@
  /api-wms/v1/operation/list:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 查询参数
        in: body
        name: object
@@ -3797,6 +3985,11 @@
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3816,6 +4009,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/mini_dict.go

@@ -20,6 +20,7 @@

    MiniDictSearch struct {
        MiniDict
        Keyword  string
        Order    string
        PageNum  int
        PageSize int
@@ -70,6 +71,11 @@
    return slf
}

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

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

@@ -87,6 +93,10 @@

    if slf.Value != "" {
        db = db.Where("value = ?", slf.Value)
    }

    if slf.Keyword != "" {
        db = db.Where("name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    }

    db.Where("1 = 1")
@@ -250,6 +260,23 @@
    return records, nil
}

func (slf *MiniDictSearch) MaxAutoIncr() (int, error) {
    type Result struct {
        Max int
    }

    var (
        result Result
        db     = slf.build()
    )

    err := db.Select("COUNT(id) as max").Scan(&result).Error
    if err != nil {
        return result.Max, fmt.Errorf("max err: %v", err)
    }
    return result.Max, nil
}

// InitDefaultData 初始化数据
func (slf *MiniDictSearch) InitDefaultData() error {
    var (
@@ -263,14 +290,16 @@
        return nil
    }
    dict := make([]*MiniDict, 0)
    dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "内部调拨", Value: "1"})
    dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "外部调拨", Value: "2"})
    dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "采购", Value: "1"})
    dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "采购", Value: "1", IsDefault: true})
    dict = append(dict, &MiniDict{Type: constvar.StorageType, Name: "其他", Value: "99"})
    dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "展厅", Value: "1"})
    dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "经销商", Value: "2"})
    dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "退库", Value: "9"})
    dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "退库", Value: "9", IsDefault: true})
    dict = append(dict, &MiniDict{Type: constvar.StockoutType, Name: "其他", Value: "99"})
    dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "内部调拨", Value: "1", IsDefault: true})
    dict = append(dict, &MiniDict{Type: constvar.TransferType, Name: "外部调拨", Value: "2"})
    dict = append(dict, &MiniDict{Type: constvar.TakeStockType, Name: "其他", Value: "99"})
    dict = append(dict, &MiniDict{Type: constvar.DisuseType, Name: "其他", Value: "99"})
    err := slf.CreateBatch(dict)
    return err
}

 request/dict.go

@@ -4,6 +4,7 @@

type MiniDict struct {
    Name      string `json:"name"`      // 名称
    Code      string `json:"code"`      // 编码
    Value     string `json:"value"`     // 值
    IsDefault bool   `json:"isDefault"` // 是否默认
}
@@ -25,10 +26,12 @@
}

type GetMiniDict struct {
    Type constvar.MiniDictType `json:"type"` // 字典类型
    Name string                `json:"name"` // 字典名称
    Type    constvar.MiniDictType `json:"type"`    // 字典类型
    Name    string                `json:"name"`    // 字典名称
    Keyword string                `json:"keyword"` // 关键字查询
}

type GetMiniDictList struct {
    Type constvar.MiniDictType `json:"type"` // 字典类型
    Type    constvar.MiniDictType `json:"type"`    // 字典类型
    Keyword string                `json:"keyword"` // 关键字查询
}

 router/router.go

@@ -224,13 +224,12 @@
    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.GET("getSilkDictList/:type", dictController.GetSilkDictList) // 获取庄口列表
        dictApi.GET("getUserList", dictController.GetUserList)               // 获取用户列表
        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("getUserList", dictController.GetUserList)      // 获取用户列表
    }

    //系统配置