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

liujiandao

2023-11-16 d20acf38c36c11ee4428c3e74a17f5870dc61b51

 docs/swagger.json

@@ -1142,7 +1142,7 @@
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/test.Product"
                            "$ref": "#/definitions/request.GetById"
                        }
                    }
                ],
@@ -1213,89 +1213,9 @@
                "summary": "用id查询Product",
                "parameters": [
                    {
                        "type": "string",
                        "name": "created_at",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "deliveryTime",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "主键ID",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "maximumStock",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "minimumStock",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "modelNumber",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "name",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "number",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "productType",
                        "in": "query"
                    },
                    {
                        "type": "number",
                        "name": "purchasePrice",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "remark",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "shippingDuration",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "supplierId",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "supplierName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "unit",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "updated_at",
                        "in": "query"
                    }
                ],
@@ -1329,7 +1249,7 @@
                "parameters": [
                    {
                        "type": "string",
                        "name": "created_at",
                        "name": "categoryName",
                        "in": "query"
                    },
                    {
@@ -1339,29 +1259,8 @@
                    },
                    {
                        "type": "string",
                        "name": "endCreatedAt",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "主键ID",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "description": "关键字",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "maximumStock",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "minimumStock",
                        "in": "query"
                    },
                    {
@@ -1392,18 +1291,8 @@
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "productType",
                        "in": "query"
                    },
                    {
                        "type": "number",
                        "name": "purchasePrice",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "remark",
                        "in": "query"
                    },
                    {
@@ -1418,7 +1307,7 @@
                    },
                    {
                        "type": "string",
                        "name": "startCreatedAt",
                        "name": "supplier",
                        "in": "query"
                    },
                    {
@@ -1439,11 +1328,6 @@
                    {
                        "type": "string",
                        "name": "unit",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "updated_at",
                        "in": "query"
                    }
                ],
@@ -1477,7 +1361,7 @@
                "parameters": [
                    {
                        "type": "string",
                        "name": "created_at",
                        "name": "categoryName",
                        "in": "query"
                    },
                    {
@@ -1487,29 +1371,8 @@
                    },
                    {
                        "type": "string",
                        "name": "endCreatedAt",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "主键ID",
                        "name": "id",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "description": "关键字",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "maximumStock",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "minimumStock",
                        "in": "query"
                    },
                    {
@@ -1540,18 +1403,8 @@
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "productType",
                        "in": "query"
                    },
                    {
                        "type": "number",
                        "name": "purchasePrice",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "remark",
                        "in": "query"
                    },
                    {
@@ -1566,7 +1419,7 @@
                    },
                    {
                        "type": "string",
                        "name": "startCreatedAt",
                        "name": "supplier",
                        "in": "query"
                    },
                    {
@@ -1587,11 +1440,6 @@
                    {
                        "type": "string",
                        "name": "unit",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "updated_at",
                        "in": "query"
                    }
                ],
@@ -1629,7 +1477,7 @@
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/test.Product"
                            "$ref": "#/definitions/test.SupplierMaterial"
                        }
                    }
                ],
@@ -3710,7 +3558,7 @@
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                    "type": "string"
                },
                "purchaseId": {
                    "description": "采购id",
@@ -3909,6 +3757,15 @@
                }
            }
        },
        "request.GetById": {
            "type": "object",
            "properties": {
                "id": {
                    "description": "主键ID",
                    "type": "integer"
                }
            }
        },
        "request.IdsReq": {
            "type": "object",
            "properties": {
@@ -3931,13 +3788,57 @@
                }
            }
        },
        "request.Product": {
            "type": "object",
            "properties": {
                "categoryName": {
                    "type": "string"
                },
                "deliveryTime": {
                    "type": "integer"
                },
                "modelNumber": {
                    "type": "string"
                },
                "name": {
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
                "purchasePrice": {
                    "type": "number"
                },
                "shippingDuration": {
                    "type": "integer"
                },
                "specifications": {
                    "type": "string"
                },
                "supplier": {
                    "type": "string"
                },
                "supplierId": {
                    "type": "integer"
                },
                "supplierName": {
                    "type": "string"
                },
                "supplierNumber": {
                    "type": "string"
                },
                "unit": {
                    "type": "string"
                }
            }
        },
        "request.ProductCreate": {
            "type": "object",
            "properties": {
                "list": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/test.Product"
                        "$ref": "#/definitions/request.Product"
                    }
                }
            }
@@ -4128,66 +4029,6 @@
                }
            }
        },
        "test.Product": {
            "type": "object",
            "properties": {
                "created_at": {
                    "type": "string"
                },
                "deliveryTime": {
                    "type": "integer"
                },
                "id": {
                    "description": "主键ID",
                    "type": "integer"
                },
                "maximumStock": {
                    "type": "integer"
                },
                "minimumStock": {
                    "type": "integer"
                },
                "modelNumber": {
                    "type": "string"
                },
                "name": {
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
                "productType": {
                    "type": "string"
                },
                "purchasePrice": {
                    "type": "number"
                },
                "remark": {
                    "type": "string"
                },
                "shippingDuration": {
                    "type": "integer"
                },
                "specifications": {
                    "type": "string"
                },
                "supplier": {
                    "$ref": "#/definitions/test.Supplier"
                },
                "supplierId": {
                    "type": "integer"
                },
                "supplierName": {
                    "type": "string"
                },
                "unit": {
                    "type": "string"
                },
                "updated_at": {
                    "type": "string"
                }
            }
        },
        "test.Supplier": {
            "type": "object",
            "properties": {
@@ -4251,6 +4092,63 @@
                }
            }
        },
        "test.SupplierMaterial": {
            "type": "object",
            "properties": {
                "categoryName": {
                    "description": "产品类别名称",
                    "type": "string"
                },
                "created_at": {
                    "type": "string"
                },
                "deliveryTime": {
                    "description": "供货时长",
                    "type": "integer"
                },
                "id": {
                    "description": "主键ID",
                    "type": "integer"
                },
                "maximumStock": {
                    "type": "integer"
                },
                "minimumStock": {
                    "type": "integer"
                },
                "modelNumber": {
                    "type": "string"
                },
                "name": {
                    "type": "string"
                },
                "number": {
                    "type": "string"
                },
                "purchasePrice": {
                    "type": "number"
                },
                "shippingDuration": {
                    "description": "物流时长",
                    "type": "integer"
                },
                "specifications": {
                    "type": "string"
                },
                "supplier": {
                    "$ref": "#/definitions/test.Supplier"
                },
                "supplierId": {
                    "type": "integer"
                },
                "unit": {
                    "type": "string"
                },
                "updated_at": {
                    "type": "string"
                }
            }
        },
        "test.SupplierType": {
            "type": "object",
            "properties": {