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

jiangshuai

2023-11-08 47000c8d61e28bc590d085753c8b9ceff8546121

 docs/swagger.yaml

@@ -178,6 +178,17 @@
    - ReservationMethodAtConfirm
    - ReservationMethodManual
    - ReservationMethodByDate
  constvar.RuleType:
    enum:
    - 1
    - 2
    type: integer
    x-enum-comments:
      RuleType_Product: 产品上架规则
      RuleType_ProductCategory: 产品类别上架规则
    x-enum-varnames:
    - RuleType_Product
    - RuleType_ProductCategory
  constvar.WhetherType:
    enum:
    - 1
@@ -233,6 +244,10 @@
    type: object
  models.Location:
    properties:
      children:
        items:
          $ref: '#/definitions/models.Location'
        type: array
      companyId:
        description: 公司id
        type: integer
@@ -687,6 +702,10 @@
      productId:
        description: 产品id
        type: string
      ruleType:
        allOf:
        - $ref: '#/definitions/constvar.RuleType'
        description: 上架规则类型 1：产品类型；2：产品类别类型
    type: object
  request.AddOperation:
    properties:
@@ -905,6 +924,22 @@
      wareHouseCode:
        type: string
    type: object
  request.GetLocationList:
    properties:
      jointName:
        description: 拼接名称
        type: string
      keyWord:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      type:
        type: integer
    type: object
  request.GetProductList:
    properties:
      categoryId:
@@ -922,12 +957,19 @@
    properties:
      keyWord:
        type: string
      locationId:
        type: integer
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      productId:
        type: string
      type:
        description: 类型:bh=补货
        type: string
    type: object
  request.GetRuleList:
    properties:
@@ -1087,6 +1129,10 @@
      productId:
        description: 产品id
        type: string
      ruleType:
        allOf:
        - $ref: '#/definitions/constvar.RuleType'
        description: 上架规则类型 1：产品类型；2：产品类别类型
    type: object
  request.UpdateLocationProductAmount:
    properties:
@@ -1664,7 +1710,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetProductList'
          $ref: '#/definitions/request.GetLocationList'
      produces:
      - application/json
      responses:
@@ -1682,6 +1728,25 @@
      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:
    post:
      parameters: