operation 中 location定义的bug

jiangshuai

2023-12-28 2b6b5128653ca122c8136e557351ac11246da20a

operation 中 location定义的bug

 docs/docs.go

@@ -2748,12 +2748,26 @@
            "enum": [
                "原材料",
                "半成品",
                "成品"
                "成品",
                "辅料",
                "耗材",
                "其他",
                "虚拟件"
            ],
            "x-enum-comments": {
                "MaterialModeAuxiliary": "辅料",
                "MaterialModeConsumables": "耗材",
                "MaterialModeOther": "其他",
                "MaterialModeVirtual": "虚拟件, 不能销售，不能出入库，不能采购"
            },
            "x-enum-varnames": [
                "MaterialModeRaw",
                "MaterialModeSemi",
                "MaterialModeFinished"
                "MaterialModeFinished",
                "MaterialModeAuxiliary",
                "MaterialModeConsumables",
                "MaterialModeOther",
                "MaterialModeVirtual"
            ]
        },
        "constvar.OperationStatus": {
@@ -3352,7 +3366,10 @@
                        "$ref": "#/definitions/models.OperationDetails"
                    }
                },
                "fromLocation": {
                "id": {
                    "type": "integer"
                },
                "location": {
                    "description": "源位置",
                    "allOf": [
                        {
@@ -3360,11 +3377,8 @@
                        }
                    ]
                },
                "fromLocationId": {
                "locationID": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "logisticCompany": {
@@ -3382,6 +3396,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationID    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `         //源位置id\nFromLocation      Location                 ` + "`" + `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` + "`" + ` //源位置\nToLocationID      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `         //目标位置id\nToLocation        Location                 ` + "`" + `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"` + "`" + `    //目标位置",
                    "type": "string"
                },
                "operationTypeId": {
@@ -3416,18 +3431,6 @@
                        }
                    ]
                },
                "toLocation": {
                    "description": "目标位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
                },
@@ -3451,6 +3454,18 @@
                "createTime": {
                    "type": "string"
                },
                "fromLocation": {
                    "description": "源位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "fromLocationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
@@ -3469,6 +3484,18 @@
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocation": {
                    "description": "目标位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
@@ -3781,11 +3808,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -3800,7 +3827,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "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",
                    "type": "string"
                },
                "operationTypeId": {
@@ -3831,10 +3858,6 @@
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "waybillNumber": {
                    "description": "运单号",
@@ -4224,9 +4247,17 @@
                    "description": "ProductName string          ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` + "`" + ` //产品名称",
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"` + "`" + `                    //单位\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
                    "type": "integer"
                },
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                }
            }
        },
@@ -4489,11 +4520,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -4508,7 +4539,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "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",
                    "type": "string"
                },
                "operationTypeId": {
@@ -4539,10 +4570,6 @@
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "waybillNumber": {
                    "description": "运单号",
@@ -4846,8 +4873,6 @@
    Description:      "",
    InfoInstanceName: "swagger",
    SwaggerTemplate:  docTemplate,
    LeftDelim:        "{{",
    RightDelim:       "}}",
}

func init() {

 docs/swagger.json

@@ -2736,12 +2736,26 @@
            "enum": [
                "原材料",
                "半成品",
                "成品"
                "成品",
                "辅料",
                "耗材",
                "其他",
                "虚拟件"
            ],
            "x-enum-comments": {
                "MaterialModeAuxiliary": "辅料",
                "MaterialModeConsumables": "耗材",
                "MaterialModeOther": "其他",
                "MaterialModeVirtual": "虚拟件, 不能销售，不能出入库，不能采购"
            },
            "x-enum-varnames": [
                "MaterialModeRaw",
                "MaterialModeSemi",
                "MaterialModeFinished"
                "MaterialModeFinished",
                "MaterialModeAuxiliary",
                "MaterialModeConsumables",
                "MaterialModeOther",
                "MaterialModeVirtual"
            ]
        },
        "constvar.OperationStatus": {
@@ -3340,7 +3354,10 @@
                        "$ref": "#/definitions/models.OperationDetails"
                    }
                },
                "fromLocation": {
                "id": {
                    "type": "integer"
                },
                "location": {
                    "description": "源位置",
                    "allOf": [
                        {
@@ -3348,11 +3365,8 @@
                        }
                    ]
                },
                "fromLocationId": {
                "locationID": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "logisticCompany": {
@@ -3370,6 +3384,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationID    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`         //源位置id\nFromLocation      Location                 `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` //源位置\nToLocationID      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`         //目标位置id\nToLocation        Location                 `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"`    //目标位置",
                    "type": "string"
                },
                "operationTypeId": {
@@ -3404,18 +3419,6 @@
                        }
                    ]
                },
                "toLocation": {
                    "description": "目标位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
                },
@@ -3439,6 +3442,18 @@
                "createTime": {
                    "type": "string"
                },
                "fromLocation": {
                    "description": "源位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "fromLocationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
@@ -3457,6 +3472,18 @@
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocation": {
                    "description": "目标位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
@@ -3769,11 +3796,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -3788,7 +3815,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "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",
                    "type": "string"
                },
                "operationTypeId": {
@@ -3819,10 +3846,6 @@
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "waybillNumber": {
                    "description": "运单号",
@@ -4212,9 +4235,17 @@
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"`                    //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
                    "type": "integer"
                },
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                }
            }
        },
@@ -4477,11 +4508,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -4496,7 +4527,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "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",
                    "type": "string"
                },
                "operationTypeId": {
@@ -4527,10 +4558,6 @@
                            "$ref": "#/definitions/constvar.OperationStatus"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "waybillNumber": {
                    "description": "运单号",

 docs/swagger.yaml

@@ -166,11 +166,24 @@
    - 原材料
    - 半成品
    - 成品
    - 辅料
    - 耗材
    - 其他
    - 虚拟件
    type: string
    x-enum-comments:
      MaterialModeAuxiliary: 辅料
      MaterialModeConsumables: 耗材
      MaterialModeOther: 其他
      MaterialModeVirtual: 虚拟件, 不能销售，不能出入库，不能采购
    x-enum-varnames:
    - MaterialModeRaw
    - MaterialModeSemi
    - MaterialModeFinished
    - MaterialModeAuxiliary
    - MaterialModeConsumables
    - MaterialModeOther
    - MaterialModeVirtual
  constvar.OperationStatus:
    enum:
    - 1
@@ -603,14 +616,14 @@
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
      fromLocation:
      id:
        type: integer
      location:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 源位置
      fromLocationId:
      locationID:
        description: 源位置id
        type: integer
      id:
        type: integer
      logisticCompany:
        $ref: '#/definitions/models.LogisticCompany'
@@ -623,6 +636,11 @@
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
          FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
          ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
          ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
        type: string
      operationTypeId:
        description: 作业类型id
@@ -645,13 +663,6 @@
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
      toLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 目标位置
      toLocationId:
        description: 目标位置id
        type: integer
      updateTime:
        type: string
      waybillNumber:
@@ -669,6 +680,13 @@
        type: number
      createTime:
        type: string
      fromLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 源位置
      fromLocationId:
        description: 源位置id
        type: integer
      id:
        type: integer
      operationId:
@@ -681,6 +699,13 @@
      productId:
        description: 产品id
        type: string
      toLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 目标位置
      toLocationId:
        description: 目标位置id
        type: integer
      updateTime:
        type: string
    type: object
@@ -895,10 +920,10 @@
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      fromLocationId:
        description: 源位置id
        type: integer
      id:
        type: integer
      locationId:
        description: 源位置id
        type: integer
      logisticCompanyId:
        type: string
@@ -909,7 +934,9 @@
        description: 单号
        type: string
      operationDate:
        description: 安排日期
        description: |-
          FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -930,9 +957,6 @@
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
      toLocationId:
        description: 目标位置id
        type: integer
      waybillNumber:
        description: 运单号
        type: string
@@ -1202,9 +1226,17 @@
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        type: number
      fromLocationId:
        description: |-
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
        type: integer
      productId:
        description: 产品id
        type: string
      toLocationId:
        description: 目标位置id
        type: integer
    type: object
  request.OperationList:
    properties:
@@ -1384,10 +1416,10 @@
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      fromLocationId:
        description: 源位置id
        type: integer
      id:
        type: integer
      locationId:
        description: 源位置id
        type: integer
      logisticCompanyId:
        type: string
@@ -1398,7 +1430,9 @@
        description: 单号
        type: string
      operationDate:
        description: 安排日期
        description: |-
          FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -1419,9 +1453,6 @@
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
      toLocationId:
        description: 目标位置id
        type: integer
      waybillNumber:
        description: 运单号
        type: string

 models/operation.go

@@ -44,7 +44,7 @@
        ReceiverAddr  string `json:"receiverAddr" gorm:"type:varchar(255);comment:收货地址"`

        LocationID int      `json:"locationID"   gorm:"type:int;not null;comment:源位置id"` //源位置id
        Location   Location `json:"location" gorm:"foreignkey:locationID;references:Id"` //源位置
        Location   Location `json:"location" gorm:"foreignkey:LocationID;references:Id"` //源位置
    }

    OperationSearch struct {