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

jiangshuai

2023-11-03 015c07410b59bafd606bd4f567a61355c4f15958

 docs/swagger.yaml

@@ -244,6 +244,10 @@
    type: object
  models.Location:
    properties:
      children:
        items:
          $ref: '#/definitions/models.Location'
        type: array
      companyId:
        description: 公司id
        type: integer
@@ -552,6 +556,46 @@
        description: 公司
        type: string
    type: object
  models.ReorderRule:
    properties:
      amount:
        description: 在库数量
        type: number
      createTime:
        type: string
      id:
        type: integer
      location:
        $ref: '#/definitions/models.Location'
      locationId:
        description: 位置id
        type: integer
      maxInventory:
        description: 最大库存
        type: number
      minInventory:
        description: 最小库存
        type: number
      orderNumber:
        description: 订购数量
        type: number
      prediction:
        description: 预测数量
        type: number
      product:
        $ref: '#/definitions/models.Material'
      productId:
        description: 产品id
        type: string
      route:
        description: 路线
        type: string
      unit:
        description: 单位
        type: string
      updateTime:
        type: string
    type: object
  models.Warehouse:
    properties:
      active:
@@ -813,6 +857,13 @@
        description: 产品id
        type: string
    type: object
  request.GetAmountAndPrediction:
    properties:
      locationId:
        type: integer
      productId:
        type: string
    type: object
  request.GetInventoryForms:
    properties:
      categoryIds:
@@ -885,6 +936,22 @@
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetReorderRuleList:
    properties:
      keyWord:
        type: string
      locationId:
        type: integer
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      type:
        description: 类型:bh=补货
        type: string
    type: object
  request.GetRuleList:
    properties:
@@ -1215,6 +1282,10 @@
      amount:
        description: 数量
        type: number
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      contactedName:
        description: 完成者
        type: string
@@ -1637,6 +1708,25 @@
                  type: array
              type: object
      summary: 获取位置列表
      tags:
      - 位置
  /api-wms/v1/location/getLocationTreeList:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.Location'
                  type: array
              type: object
      summary: 获取位置列表树
      tags:
      - 位置
  /api-wms/v1/location/updateLocation:
@@ -2383,6 +2473,116 @@
      summary: 修改产品类型
      tags:
      - 产品类型
  /api-wms/v1/reorderRule/addReorderRule:
    post:
      parameters:
      - description: 重订货规则
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/models.ReorderRule'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加重订货规则
      tags:
      - 重订货规则
  /api-wms/v1/reorderRule/getAmountAndPrediction:
    post:
      parameters:
      - description: 重订货规则
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetAmountAndPrediction'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    additionalProperties: true
                    type: object
                  type: array
              type: object
      summary: 获取在库与预测数量
      tags:
      - 重订货规则
  /api-wms/v1/reorderRule/getReorderRuleList:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetReorderRuleList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.ReorderRule'
                  type: array
              type: object
      summary: 获取重订货规则列表
      tags:
      - 重订货规则
  /api-wms/v1/reorderRule/orderAgain:
    post:
      parameters:
      - description: 重订货规则
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/models.ReorderRule'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 再订一次
      tags:
      - 重订货规则
  /api-wms/v1/reorderRule/updateReorderRule:
    post:
      parameters:
      - description: 重订货规则
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/models.ReorderRule'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 更新重订货规则
      tags:
      - 重订货规则
  /api-wms/v1/warehouse/getWarehouseDetails/{id}:
    get:
      parameters: