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

yinbentan

2024-07-17 e598e4d2718c41352eafae19284ffe358b8c8181

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