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

jiangshuai

2023-09-20 6becb6b281b34e17197a25af86acd35628e88811

 docs/swagger.yaml

@@ -138,6 +138,20 @@
    - Task
    - Object
    - TaskAndObject
  constvar.ProductType:
    enum:
    - 1
    - 2
    - 3
    type: integer
    x-enum-comments:
      Consumables: 消耗品
      Server: 服务
      StoredProduct: 可储存的产品
    x-enum-varnames:
    - Consumables
    - Server
    - StoredProduct
  constvar.ReservationMethod:
    enum:
    - 1
@@ -232,7 +246,7 @@
        type: string
      parentId:
        description: 上级id
        type: integer
        type: string
      replenishLocation:
        description: 是否补充位置
        type: boolean
@@ -246,13 +260,16 @@
  models.Material:
    properties:
      HSCode:
        description: HS编码
        type: string
      amount:
        description: 数量
        type: number
      barcode:
        description: 条码
        type: string
      buyExplain:
        description: 采购说明
        type: string
      canBePurchased:
        description: 是否可采购
@@ -260,25 +277,35 @@
      categoryId:
        description: 产品类别id
        type: integer
      categoryName:
        description: 产品类别名称
        type: string
      companyId:
        description: 公司id
        type: integer
      companyName:
        description: 公司名称
        type: string
      controlStrategy:
        $ref: '#/definitions/constvar.InvoicingStrategy'
        allOf:
        - $ref: '#/definitions/constvar.InvoicingStrategy'
        description: 控制策略
      cost:
        description: 成本
        type: number
      currencyName:
        description: 币种名称
        type: string
      customerTaxes:
        description: 客户税百分比
        type: number
      deliveryAdvanceTime:
        description: 交货提前时间(天)
        type: integer
      id:
        type: string
      inStorageExplain:
        description: 入库说明
        type: string
      internalNotes:
        description: 内部说明
@@ -287,16 +314,18 @@
        description: 内部参考
        type: string
      internalTransferExplain:
        description: 内部调拨说明
        type: string
      invoicingStrategy:
        allOf:
        - $ref: '#/definitions/constvar.InvoicingStrategy'
        description: wms添加字段
        description: 开票策略
      isSale:
        description: PurchaseType      constvar.PurchaseType `gorm:"type:int(11);comment:采购类型"
          json:"purchaseType"`
        type: boolean
      maxInventory:
        description: 最大库存
        type: number
      minInventory:
        description: |-
@@ -316,35 +345,54 @@
        description: MaterialType constvar.ProductType  `gorm:"index;type:int(11);comment:物料类型(数字)"
          json:"materialType"`
      name:
        description: 物料名称
        type: string
      orderCreation:
        $ref: '#/definitions/constvar.OrderCreation'
        allOf:
        - $ref: '#/definitions/constvar.OrderCreation'
        description: 订单创建
      originCountryId:
        description: 原产地id
        type: integer
      originCountryName:
        description: 原产地名称
        type: string
      outStorageExplain:
        description: 出库说明
        type: string
      principal:
        description: 负责人
        type: string
      productTagId:
        description: 产品标签
        description: 产品标签id
        type: integer
      productTagName:
        description: 产品标签名称
        type: string
      productType:
        allOf:
        - $ref: '#/definitions/constvar.ProductType'
        description: wms添加字段
      purchasePrice:
        description: 采购价格
        type: number
      salePrice:
        description: 销售单价
        type: number
      selectProduct:
        description: 可选产品id
        type: integer
      sellExplain:
        description: 销售说明
        type: string
      supplier:
        description: |-
          FSource           string                  `gorm:"type:varchar(191);comment:生产车间" json:"-"`
          Status            constvar.MaterialStatus `gorm:"type:int(11);comment:状态" json:"status"`
        type: string
      templateID:
        description: Note              string                  `gorm:"type:varchar(1024);comment:备注"
          json:"note"`
        type: string
      unit:
        description: LockAmount        decimal.Decimal         `gorm:"type:decimal(35,18);default:0;comment:锁定数量"
@@ -450,6 +498,7 @@
        description: 上级id
        type: integer
      routeId:
        description: 路线id
        type: integer
      routeName:
        description: 公司
@@ -460,6 +509,9 @@
      active:
        description: 是否启用，传true就行
        type: boolean
      address:
        description: 地址
        type: string
      buyToResupply:
        description: 是否购买补给，已购买产品能够发送到此仓库
        type: boolean
@@ -476,9 +528,18 @@
        type: string
      id:
        type: integer
      inboundTransportation:
        description: 入向运输
        type: integer
      locationId:
        description: 位置id
        type: integer
      name:
        description: 仓库名称
        type: string
      outboundTransportation:
        description: 出库运输
        type: integer
      partnerId:
        description: 合作伙伴id
        type: integer
@@ -493,6 +554,9 @@
          type: string
        type: array
      updateTime:
        type: string
      warehouseLocation:
        description: 库存位置
        type: string
    required:
    - code
@@ -618,6 +682,9 @@
      active:
        description: 是否启用，传true就行
        type: boolean
      address:
        description: 地址
        type: string
      buyToResupply:
        description: 购买补给，已购买产品能够发送到此仓库
        type: boolean
@@ -626,9 +693,18 @@
        maxLength: 5
        minLength: 1
        type: string
      inboundTransportation:
        description: 入向运输
        type: integer
      locationId:
        description: 位置id
        type: integer
      name:
        description: 仓库名称
        type: string
      outboundTransportation:
        description: 出库运输
        type: integer
      partnerId:
        description: 合作伙伴id
        type: integer
@@ -785,35 +861,6 @@
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  request.UpdateWarehouse:
    properties:
      active:
        description: 是否启用，传true就行
        type: boolean
      buyToResupply:
        description: 购买补给，已购买产品能够发送到此仓库
        type: boolean
      code:
        description: 仓库编码
        maxLength: 5
        minLength: 1
        type: string
      id:
        type: integer
      name:
        description: 仓库名称
        type: string
      partnerId:
        description: 合作伙伴id
        type: integer
      resupplyWhIds:
        description: 补给来源仓库ID
        items:
          type: string
        type: array
    required:
    - code
    type: object
  util.Response:
    properties:
@@ -1098,6 +1145,96 @@
      summary: 修改入库/出库信息
      tags:
      - 入库/出库
  /api-wms/v1/operationType/operationType:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.OperationType'
                  type: array
              type: object
      summary: 查询作业类型列表
      tags:
      - 作业类型
    post:
      parameters:
      - description: 作业类型信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddOperationType'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加作业类型
      tags:
      - 作业类型
  /api-wms/v1/operationType/operationType/{id}:
    delete:
      parameters:
      - description: 作业类型id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 删除作业类型
      tags:
      - 作业类型
    put:
      parameters:
      - description: 作业类型信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateOperationType'
      - description: 作业类型id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑作业类型
      tags:
      - 作业类型
  /api-wms/v1/product/addProduct:
    post:
      parameters:
@@ -1308,20 +1445,14 @@
      summary: 修改产品类型
      tags:
      - 产品类型
  /api-wms/v1/warehouse/operationType:
  /api-wms/v1/warehouse/getWarehouseDetails/{id}:
    get:
      parameters:
      - in: query
        name: keyword
      - description: 仓库id
        in: path
        name: id
        required: true
        type: string
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      produces:
      - application/json
      responses:
@@ -1329,24 +1460,23 @@
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - $ref: '#/definitions/util.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.OperationType'
                  type: array
                  $ref: '#/definitions/models.Warehouse'
              type: object
      summary: 查询作业类型列表
      summary: 获取仓库详情
      tags:
      - 作业类型
      - 仓库
  /api-wms/v1/warehouse/updateWarehouse:
    post:
      parameters:
      - description: 作业类型信息
      - description: 仓库信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddOperationType'
          $ref: '#/definitions/models.Warehouse'
      produces:
      - application/json
      responses:
@@ -1354,50 +1484,9 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加作业类型
      summary: 编辑仓库
      tags:
      - 作业类型
  /api-wms/v1/warehouse/operationType/{id}:
    delete:
      parameters:
      - description: 作业类型id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 删除作业类型
      tags:
      - 作业类型
    put:
      parameters:
      - description: 作业类型信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateOperationType'
      - description: 作业类型id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑作业类型
      tags:
      - 作业类型
      - 仓库
  /api-wms/v1/warehouse/warehouse:
    get:
      parameters:
@@ -1463,29 +1552,6 @@
          schema:
            $ref: '#/definitions/util.Response'
      summary: 删除仓库
      tags:
      - 仓库
    put:
      parameters:
      - description: 仓库信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateWarehouse'
      - description: 仓库id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑仓库
      tags:
      - 仓库
swagger: "2.0"