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

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 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
@@ -669,6 +687,13 @@
        type: number
      createTime:
        type: string
      fromLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 源位置
      fromLocationId:
        description: 源位置id
        type: integer
      id:
        type: integer
      operationId:
@@ -681,6 +706,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 +927,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 +941,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
@@ -1202,9 +1236,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 +1426,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 +1440,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
@@ -2803,6 +2847,24 @@
      summary: 获取产品列表
      tags:
      - 产品
  /api-wms/v1/product/getUserInfo:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  additionalProperties: true
                  type: object
              type: object
      summary: 获取登录用户信息
      tags:
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters: