Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM

liujiandao

2023-11-16 d20acf38c36c11ee4428c3e74a17f5870dc61b51

 docs/docs.go

@@ -1257,6 +1257,11 @@
                "summary": "分页获取Product列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "categoryName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "deliveryTime",
                        "in": "query"
@@ -1292,11 +1297,6 @@
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "productType",
                        "in": "query"
                    },
                    {
@@ -1369,6 +1369,11 @@
                "summary": "分页获取Product列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "categoryName",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "deliveryTime",
                        "in": "query"
@@ -1404,11 +1409,6 @@
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "productType",
                        "in": "query"
                    },
                    {
@@ -1917,7 +1917,7 @@
                }
            }
        },
        "/purchase/submit/{id}": {
        "/purchase/submit": {
            "post": {
                "security": [
                    {
@@ -3306,33 +3306,23 @@
                    "type": "string"
                },
                "grpc-admin-url": {
                    "description": "grpc服务地址",
                    "description": "admin grpc服务地址",
                    "type": "string"
                },
                "grpc-port": {
                    "description": "对外提供服务grpc端口",
                    "type": "string"
                },
                "grpc-url": {
                    "description": "grpc服务地址",
                    "description": "aps grpc服务地址",
                    "type": "string"
                },
                "iplimit-count": {
                    "type": "integer"
                },
                "iplimit-time": {
                    "type": "integer"
                },
                "oss-type": {
                    "description": "Oss类型",
                "grpc-wms-url": {
                    "description": "wms grpc服务地址",
                    "type": "string"
                },
                "router-prefix": {
                    "type": "string"
                },
                "use-multipoint": {
                    "description": "多点登录拦截",
                    "type": "boolean"
                },
                "use-redis": {
                    "description": "使用redis",
                    "type": "boolean"
                }
            }
        },
@@ -3383,19 +3373,22 @@
                1,
                2,
                3,
                4
                4,
                5
            ],
            "x-enum-comments": {
                "OrderStatusCanceled": "已取消",
                "OrderStatusCompleted": "已完成",
                "OrderStatusConfirmed": "已下单",
                "OrderStatusReceived": "已到货",
                "OrderStatusConfirmed": "待确认",
                "OrderStatusReceived": "待入库",
                "OrderStatusStored": "已入库"
            },
            "x-enum-varnames": [
                "OrderStatusConfirmed",
                "OrderStatusReceived",
                "OrderStatusStored",
                "OrderStatusCompleted"
                "OrderStatusCompleted",
                "OrderStatusCanceled"
            ]
        },
        "purchase.PriceAdjustmentType": {
@@ -3807,6 +3800,9 @@
        "request.Product": {
            "type": "object",
            "properties": {
                "categoryName": {
                    "type": "string"
                },
                "deliveryTime": {
                    "type": "integer"
                },
@@ -3817,9 +3813,6 @@
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
                "productType": {
                    "type": "string"
                },
                "purchasePrice": {
@@ -4111,6 +4104,10 @@
        "test.SupplierMaterial": {
            "type": "object",
            "properties": {
                "categoryName": {
                    "description": "产品类别名称",
                    "type": "string"
                },
                "created_at": {
                    "type": "string"
                },