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

liujiandao

2023-09-23 79eca4ef507f418b88a0817f43a9ea25750a818a

 docs/swagger.yaml

@@ -77,6 +77,7 @@
    - 5
    - 6
    - 7
    - 8
    type: integer
    x-enum-comments:
      LocationTypeCustomer: 客户位置
@@ -94,6 +95,7 @@
    - LocationTypeInventoryLoss
    - LocationTypeProduction
    - LocationTypeTransit
    - LocationTypeDisuse
  constvar.MaterialMode:
    enum:
    - 原材料
@@ -241,6 +243,9 @@
      isScrapLocation:
        description: 是否报废位置
        type: boolean
      jointName:
        description: 拼接名称
        type: string
      name:
        description: 位置名称
        type: string
@@ -414,6 +419,84 @@
      weight:
        description: 重量
        type: number
    type: object
  models.Operation:
    properties:
      comment:
        type: string
      companyID:
        type: integer
      companyName:
        type: string
      contacterID:
        type: integer
      contacterName:
        type: string
      createTime:
        type: string
      details:
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
      fromLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 源位置
      fromLocationId:
        description: 源位置id
        type: integer
      id:
        type: integer
      number:
        description: 单号
        type: string
      operationDate:
        type: string
      operationTypeId:
        description: 作业类型id
        type: integer
      operationTypeName:
        description: 作业类型名称
        type: string
      sourceNumber:
        description: 源单号
        type: string
      status:
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
      toLocation:
        allOf:
        - $ref: '#/definitions/models.Location'
        description: 目标位置
      toLocationId:
        description: 目标位置id
        type: integer
      updateTime:
        type: string
    type: object
  models.OperationDetails:
    properties:
      amount:
        description: 数量
        type: number
      createTime:
        type: string
      id:
        type: integer
      operationId:
        description: 操作id
        type: integer
      productId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      unit:
        type: string
      updateTime:
        type: string
    type: object
  models.OperationType:
    properties:
@@ -598,6 +681,23 @@
        description: 备注
        type: string
    type: object
  request.AddDisuse:
    properties:
      amount:
        type: number
      fromLocationId:
        type: integer
      productId:
        type: string
      productName:
        type: string
      sourceNumber:
        type: string
      toLocationId:
        type: integer
      unit:
        type: string
    type: object
  request.AddOperation:
    properties:
      comment:
@@ -633,6 +733,9 @@
      operationTypeId:
        description: 作业类型id
        type: integer
      operationTypeName:
        description: 作业类型名称
        type: string
      sourceNumber:
        description: 源单号
        type: string
@@ -741,21 +844,73 @@
        description: 每页大小
        type: integer
    type: object
  request.OperationAllList:
    properties:
      number:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      sourceNumber:
        type: string
    type: object
  request.OperationDetails:
    properties:
      OperationId:
        description: 操作id
        type: integer
      amount:
        description: 数量
        type: number
      productId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      quantity:
        description: 数量
        type: number
      unit:
        type: string
    type: object
  request.OperationList:
    properties:
      number:
        type: string
      operationTypeId:
        type: integer
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      sourceNumber:
        type: string
    type: object
  request.QueryDisuseList:
    properties:
      number:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      sourceNumber:
        type: string
    type: object
  request.QueryOperationList:
    properties:
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      productId:
        type: string
    type: object
  request.UpdateCompany:
@@ -781,6 +936,31 @@
        type: integer
      remark:
        description: 备注
        type: string
    type: object
  request.UpdateDisuse:
    properties:
      amount:
        type: number
      fromLocationId:
        type: integer
      id:
        type: integer
      number:
        type: string
      operationDate:
        type: string
      productId:
        type: string
      productName:
        type: string
      sourceNumber:
        type: string
      status:
        $ref: '#/definitions/constvar.OperationStatus'
      toLocationId:
        type: integer
      unit:
        type: string
    type: object
  request.UpdateOperation:
@@ -818,6 +998,9 @@
      operationTypeId:
        description: 作业类型id
        type: integer
      operationTypeName:
        description: 作业类型名称
        type: string
      sourceNumber:
        description: 源单号
        type: string
@@ -1197,22 +1380,15 @@
      summary: 更改记录状态
      tags:
      - 入库/出库
  /api-wms/v1/operation/operation:
    get:
      consumes:
      - application/json
  /api-wms/v1/operation/list:
    post:
      parameters:
      - in: query
        name: operationTypeId
        type: integer
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.OperationList'
      produces:
      - application/json
      responses:
@@ -1223,6 +1399,26 @@
      summary: 入库/出库列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/listAll:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.OperationAllList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 调拨
      tags:
      - 入库/出库
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: 入库/出库信息
@@ -1259,7 +1455,8 @@
      summary: 删除入库/出库信息
      tags:
      - 入库/出库
    put:
  /api-wms/v1/operation/update:
    post:
      parameters:
      - description: 入库信息
        in: body
@@ -1267,11 +1464,6 @@
        required: true
        schema:
          $ref: '#/definitions/request.UpdateOperation'
      - description: 入库信息id
        in: path
        name: id
        required: true
        type: integer
      produces:
      - application/json
      responses:
@@ -1372,6 +1564,25 @@
      summary: 编辑作业类型
      tags:
      - 业务类型
  /api-wms/v1/product/addDisuse:
    post:
      parameters:
      - description: 入库/出库信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddDisuse'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加报废信息
      tags:
      - 产品
  /api-wms/v1/product/addProduct:
    post:
      parameters:
@@ -1446,6 +1657,24 @@
      summary: 删除产品类型
      tags:
      - 产品类型
  /api-wms/v1/product/finishDisuse/{id}:
    put:
      parameters:
      - description: id
        in: path
        name: id
        required: true
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 验证报废
      tags:
      - 产品
  /api-wms/v1/product/getProductCategoryDetails/{id}:
    get:
      parameters:
@@ -1544,6 +1773,70 @@
      summary: 获取产品列表
      tags:
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.QueryDisuseList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 报废列表
      tags:
      - 产品
  /api-wms/v1/product/listOperaton:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.QueryOperationList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.Operation'
                  type: array
              type: object
      summary: 产品历史出入库信息
      tags:
      - 产品
  /api-wms/v1/product/updateDisuse:
    post:
      parameters:
      - description: 入库/出库信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateDisuse'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 修改报废信息
      tags:
      - 产品
  /api-wms/v1/product/updateProduct:
    post:
      parameters: