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

jiangshuai

2023-11-08 47000c8d61e28bc590d085753c8b9ceff8546121

 docs/swagger.yaml

@@ -87,6 +87,7 @@
    - 9
    type: integer
    x-enum-comments:
      LocationTypeAdjust: 库存盘点
      LocationTypeCustomer: 客户位置
      LocationTypeDisuse: 报废位置
      LocationTypeInternal: 内部位置
@@ -177,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
@@ -232,6 +244,10 @@
    type: object
  models.Location:
    properties:
      children:
        items:
          $ref: '#/definitions/models.Location'
        type: array
      companyId:
        description: 公司id
        type: integer
@@ -528,7 +544,7 @@
        - $ref: '#/definitions/constvar.InventoryValuation'
        description: 库存计价
      name:
        description: 位置名称
        description: 分类名称
        type: string
      parentId:
        description: 上级id
@@ -538,6 +554,46 @@
        type: integer
      routeName:
        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:
@@ -646,22 +702,10 @@
      productId:
        description: 产品id
        type: string
    type: object
  request.AddLocationProductAmount:
    properties:
      adjustAmount:
        description: 差值
        type: number
      decimal:
        description: 库存数量
        type: number
      difference_amount:
        description: 计数数量
        type: number
      locationId:
        type: integer
      productId:
        type: string
      ruleType:
        allOf:
        - $ref: '#/definitions/constvar.RuleType'
        description: 上架规则类型 1：产品类型；2：产品类别类型
    type: object
  request.AddOperation:
    properties:
@@ -739,6 +783,9 @@
      name:
        description: 仓库名称
        type: string
      prefix:
        description: 前缀
        type: string
      printLabel:
        description: 是否打印标签
        type: boolean
@@ -798,6 +845,101 @@
    required:
    - code
    type: object
  request.FinishLocationProductAmount:
    properties:
      locationProductAmountId:
        description: 库存盘点id
        type: integer
      operationId:
        description: 出入库id
        type: integer
      productId:
        description: 产品id
        type: string
    type: object
  request.GetAmountAndPrediction:
    properties:
      locationId:
        type: integer
      productId:
        type: string
    type: object
  request.GetInventoryForms:
    properties:
      categoryIds:
        description: 产品类型id
        items:
          type: integer
        type: array
      keyWord:
        description: 搜索条件
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      warehouseCode:
        description: 仓库缩写
        type: string
    type: object
  request.GetInventoryHistory:
    properties:
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      keyWord:
        description: 搜索条件
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      produceId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      unit:
        description: 单位
        type: string
    type: object
  request.GetLocationForms:
    properties:
      keyWord:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      productId:
        type: string
      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:
@@ -810,6 +952,33 @@
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetReorderRuleList:
    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:
      locationId:
        description: 位置id
        type: integer
      productId:
        description: 产品id
        type: string
    type: object
  request.OperationAllList:
    properties:
@@ -849,8 +1018,8 @@
      pageSize:
        description: 每页大小
        type: integer
      sourceNumber:
        type: string
      status:
        $ref: '#/definitions/constvar.OperationStatus'
    type: object
  request.PageInfo:
    properties:
@@ -871,7 +1040,18 @@
      pageSize:
        description: 每页大小
        type: integer
      sourceNumber:
    type: object
  request.QueryOperationHistory:
    properties:
      locationId:
        type: integer
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      productId:
        type: string
    type: object
  request.QueryOperationList:
@@ -942,6 +1122,35 @@
        type: integer
      locationId:
        description: 位置id
        type: integer
      productCategoryId:
        description: 产品种类id
        type: integer
      productId:
        description: 产品id
        type: string
      ruleType:
        allOf:
        - $ref: '#/definitions/constvar.RuleType'
        description: 上架规则类型 1：产品类型；2：产品类别类型
    type: object
  request.UpdateLocationProductAmount:
    properties:
      adjustAmount:
        description: LocationProductAmountId int             `json:"locationProductAmountId"`
          //库存盘点id
        type: number
      amount:
        description: 库存数量
        type: number
      differenceAmount:
        description: 计数数量
        type: number
      locationId:
        description: 位置id
        type: integer
      operationId:
        description: 出入库id
        type: integer
      productCategoryId:
        description: 产品种类id
@@ -1030,6 +1239,9 @@
      name:
        description: 仓库名称
        type: string
      prefix:
        description: 前缀
        type: string
      printLabel:
        description: 是否打印标签
        type: boolean
@@ -1049,6 +1261,110 @@
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  response.InventoryForms:
    properties:
      amount:
        description: 在库数量
        type: number
      availableNumber:
        description: 可用库存
        type: number
      cost:
        description: 成本
        type: number
      in:
        description: 入库
        type: number
      out:
        description: 出库
        type: number
      produceId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      productType:
        description: 产品类型
        type: string
      unit:
        description: 单位
        type: string
      value:
        description: 总价值
        type: number
    type: object
  response.InventoryHistory:
    properties:
      amount:
        description: 数量
        type: number
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      contactedName:
        description: 完成者
        type: string
      date:
        description: 日期
        type: string
      fromLocation:
        description: 源位置
        type: string
      number:
        description: 单号
        type: string
      productName:
        description: 产品名称
        type: string
      status:
        description: 状态
        type: string
      toLocation:
        description: 目标位置
        type: string
      unit:
        description: 单位
        type: string
    type: object
  response.LocationForms:
    properties:
      amount:
        description: 数量
        type: number
      locationName:
        description: 位置名称
        type: string
      produceId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      productTypeName:
        description: 产品类别
        type: string
      unit:
        description: 单位
        type: string
      value:
        description: 总价值
        type: number
    type: object
  response.RuleList:
    properties:
      locationList:
        description: 位置列表
        items:
          $ref: '#/definitions/models.Location'
        type: array
      productList:
        description: 产品列表
        items:
          $ref: '#/definitions/models.Material'
        type: array
    type: object
  util.Response:
    properties:
@@ -1248,6 +1564,84 @@
      summary: 编辑公司
      tags:
      - 公司
  /api-wms/v1/forms/getHistory:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetInventoryHistory'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.InventoryHistory'
                  type: array
              type: object
      summary: 获取历史信息
      tags:
      - 报表
  /api-wms/v1/forms/getInventoryForms:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetInventoryForms'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.InventoryForms'
                  type: array
              type: object
      summary: 获取库存报表
      tags:
      - 报表
  /api-wms/v1/forms/getLocationForms:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetLocationForms'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.LocationForms'
                  type: array
              type: object
      summary: 获取位置报表
      tags:
      - 报表
  /api-wms/v1/location/addLocation:
    post:
      parameters:
@@ -1316,7 +1710,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetProductList'
          $ref: '#/definitions/request.GetLocationList'
      produces:
      - application/json
      responses:
@@ -1332,6 +1726,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:
@@ -1428,7 +1841,7 @@
      summary: 修改上架规则
      tags:
      - 上架规则
  /api-wms/v1/locationProductamount/add:
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: 入库/出库信息
@@ -1436,7 +1849,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddLocationProductAmount'
          $ref: '#/definitions/request.UpdateLocationProductAmount'
      produces:
      - application/json
      responses:
@@ -1447,7 +1860,52 @@
      summary: 添加库存盘点信息
      tags:
      - 库存盘点
  /api-wms/v1/locationProductamount/list:
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: 入参
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.FinishLocationProductAmount'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 应用、验证
      tags:
      - 库存盘点
  /api-wms/v1/locationProductAmount/getRuleList:
    post:
      parameters:
      - description: 查询信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetRuleList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.RuleList'
                  type: array
              type: object
      summary: 获取上架规则
      tags:
      - 库存盘点
  /api-wms/v1/locationProductAmount/list:
    post:
      parameters:
      - description: 查询参数
@@ -1464,6 +1922,25 @@
          schema:
            $ref: '#/definitions/util.Response'
      summary: 库存盘点列表
      tags:
      - 库存盘点
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: 入库/出库信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateLocationProductAmount'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 修改库存盘点信息
      tags:
      - 库存盘点
  /api-wms/v1/operation/finish/{id}:
@@ -1503,7 +1980,7 @@
      summary: 入库/出库列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/listAll:
  /api-wms/v1/operation/listTransfer:
    post:
      parameters:
      - description: 参数
@@ -1519,7 +1996,7 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 调拨
      summary: 库存调拨列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/operation:
@@ -1578,6 +2055,22 @@
      summary: 修改入库/出库信息
      tags:
      - 入库/出库
  /api-wms/v1/operationType/listTransfer:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.ResponseList'
      summary: 调拨类型列表
      tags:
      - 业务类型
  /api-wms/v1/operationType/operationType:
    get:
      parameters:
@@ -1889,6 +2382,32 @@
      summary: 报废列表
      tags:
      - 产品
  /api-wms/v1/product/listHistory:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.QueryOperationHistory'
      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/listOperaton:
    post:
      parameters:
@@ -1972,6 +2491,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: