add
wangpengfei
2023-08-26 2083c6a4f3c69d7f0f1deca562b50df3e8bfd91e
add

add related supplier function
6个文件已修改
76 ■■■■■ 已修改文件
docs/docs.go 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.json 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/swagger.yaml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
log/2023-08-26/info.log 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
model/test/product.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/test/product.go 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go
@@ -3784,6 +3784,11 @@
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "supplierId",
                        "in": "query"
@@ -3894,6 +3899,11 @@
                    {
                        "type": "integer",
                        "name": "shippingDuration",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
@@ -4012,6 +4022,11 @@
                    {
                        "type": "integer",
                        "name": "shippingDuration",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
@@ -8690,6 +8705,12 @@
                "shippingDuration": {
                    "type": "integer"
                },
                "specifications": {
                    "type": "string"
                },
                "supplier": {
                    "$ref": "#/definitions/test.Supplier"
                },
                "supplierId": {
                    "type": "integer"
                },
docs/swagger.json
@@ -3775,6 +3775,11 @@
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "name": "supplierId",
                        "in": "query"
@@ -3885,6 +3890,11 @@
                    {
                        "type": "integer",
                        "name": "shippingDuration",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
@@ -4003,6 +4013,11 @@
                    {
                        "type": "integer",
                        "name": "shippingDuration",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "specifications",
                        "in": "query"
                    },
                    {
@@ -8681,6 +8696,12 @@
                "shippingDuration": {
                    "type": "integer"
                },
                "specifications": {
                    "type": "string"
                },
                "supplier": {
                    "$ref": "#/definitions/test.Supplier"
                },
                "supplierId": {
                    "type": "integer"
                },
docs/swagger.yaml
@@ -1535,6 +1535,10 @@
        type: string
      shippingDuration:
        type: integer
      specifications:
        type: string
      supplier:
        $ref: '#/definitions/test.Supplier'
      supplierId:
        type: integer
      unit:
@@ -3751,6 +3755,9 @@
        name: shippingDuration
        type: integer
      - in: query
        name: specifications
        type: string
      - in: query
        name: supplierId
        type: integer
      - in: query
@@ -3819,6 +3826,9 @@
      - in: query
        name: shippingDuration
        type: integer
      - in: query
        name: specifications
        type: string
      - in: query
        name: startCreatedAt
        type: string
@@ -3892,6 +3902,9 @@
        name: shippingDuration
        type: integer
      - in: query
        name: specifications
        type: string
      - in: query
        name: startCreatedAt
        type: string
      - in: query
log/2023-08-26/info.log
@@ -30,3 +30,15 @@
[srm]2023/08/26 - 15:33:32.998    info    D:/basic.com/srm/initialize/router.go:37    register swagger handler
[srm]2023/08/26 - 15:33:33.016    info    D:/basic.com/srm/initialize/router.go:83    router register success
[srm]2023/08/26 - 15:33:33.030    info    D:/basic.com/srm/core/server.go:36    server run success on     {"address": ":8889"}
[srm]2023/08/26 - 15:40:40.778    info    D:/basic.com/srm/initialize/gorm.go:60    register table success
[srm]2023/08/26 - 15:40:40.783    info    D:/basic.com/srm/initialize/router.go:37    register swagger handler
[srm]2023/08/26 - 15:40:40.804    info    D:/basic.com/srm/initialize/router.go:83    router register success
[srm]2023/08/26 - 15:40:40.818    info    D:/basic.com/srm/core/server.go:36    server run success on     {"address": ":8889"}
[srm]2023/08/26 - 16:06:14.342    info    D:/basic.com/srm/initialize/gorm.go:60    register table success
[srm]2023/08/26 - 16:06:14.348    info    D:/basic.com/srm/initialize/router.go:37    register swagger handler
[srm]2023/08/26 - 16:06:14.369    info    D:/basic.com/srm/initialize/router.go:83    router register success
[srm]2023/08/26 - 16:06:14.370    info    D:/basic.com/srm/core/server.go:36    server run success on     {"address": ":8889"}
[srm]2023/08/26 - 16:09:16.255    info    D:/basic.com/srm/initialize/gorm.go:60    register table success
[srm]2023/08/26 - 16:09:16.259    info    D:/basic.com/srm/initialize/router.go:37    register swagger handler
[srm]2023/08/26 - 16:09:16.277    info    D:/basic.com/srm/initialize/router.go:83    router register success
[srm]2023/08/26 - 16:09:16.292    info    D:/basic.com/srm/core/server.go:36    server run success on     {"address": ":8889"}
model/test/product.go
@@ -10,10 +10,12 @@
    Name             string   `json:"name" form:"name" gorm:"column:name;comment:名称;size:255;"`
    Number           string   `json:"number" form:"number" gorm:"column:number;comment:编码;size:255;"`
    SupplierId       uint     `json:"supplierId" form:"supplierId" gorm:"column:supplier_id;comment:供应商id;size:255;"`
    Supplier         Supplier `json:"supplier" form:"supplier" gorm:"foreignKey:SupplierId;references:ID;comment:供应商"`
    Unit             string   `json:"unit" form:"unit" gorm:"column:unit;comment:计量单位;size:255;"`
    PurchasePrice    *float64 `json:"purchasePrice" form:"purchasePrice" gorm:"column:purchase_price;comment:采购价格;"`
    DeliveryTime     *int     `json:"deliveryTime" form:"deliveryTime" gorm:"column:delivery_time;comment:;size:11;"`
    ShippingDuration *int     `json:"shippingDuration" form:"shippingDuration" gorm:"column:shipping_duration;comment:物流时长;size:11;"`
    Specifications   string   `json:"specifications" form:"specifications" gorm:"column:specifications;comment:规格;size:255;"`
    ProductType      string   `json:"productType" form:"productType" gorm:"column:product_type;comment:产品类别;size:255;"`
    MinimumStock     *int     `json:"minimumStock" form:"minimumStock" gorm:"column:minimum_stock;comment:最低库存;"`
    MaximumStock     *int     `json:"maximumStock" form:"maximumStock" gorm:"column:maximum_stock;comment:最高库存;"`
service/test/product.go
@@ -66,11 +66,16 @@
    if info.Unit != "" {
        db = db.Where("unit LIKE ?", "%"+info.Unit+"%")
    }
    if info.SupplierId != 0 {
        db = db.Where("supplier_id = ?", info.SupplierId)
    }
    err = db.Count(&total).Error
    if err != nil {
        return
    }
    err = db.Limit(limit).Offset(offset).Find(&ps).Error
    err = db.Limit(limit).Offset(offset).Preload("Supplier").Find(&ps).Error
    return ps, total, err
}