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

yinbentan

2024-07-17 e598e4d2718c41352eafae19284ffe358b8c8181

 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": {