fix

zhangqian

2024-07-18 d80428a19673e819440a34f2565b6dbbbe6ac567

 docs/swagger.yaml

@@ -212,17 +212,23 @@
    - 2
    - 3
    - 4
    - 5
    - 6
    type: integer
    x-enum-comments:
      DisuseType: 报废类型
      ProductSource: 产品来源
      StockoutType: 出库类型
      StorageType: 入库类型
      TakeStock: 盘点类型
      TakeStockType: 盘点类型
      TransferType: 调拨类型
    x-enum-varnames:
    - StorageType
    - StockoutType
    - TransferType
    - TakeStock
    - TakeStockType
    - DisuseType
    - ProductSource
  constvar.OperationSource:
    enum:
    - 1
@@ -358,6 +364,21 @@
    - WhetherTypeAsk
    - WhetherTypeAlways
    - ReservationNever
  controllers.saveProductImagesFromExcelRequest:
    properties:
      excelFilePath:
        description: excel路径 用docker cp传到容器里
        type: string
      imageColumn:
        description: 图片所在列名
        type: string
      productIdColumnIndex:
        description: 产品ID是第几列(从0开始)
        type: integer
      sheetIndex:
        description: 第几个sheet
        type: integer
    type: object
  gorm.DeletedAt:
    properties:
      time:
@@ -365,13 +386,6 @@
      valid:
        description: Valid is true if Time is not NULL
        type: boolean
    type: object
  inventory_order.WorkerInfo:
    properties:
      id:
        type: string
      name:
        type: string
    type: object
  models.Attachment:
    properties:
@@ -530,9 +544,7 @@
      location:
        $ref: '#/definitions/models.Location'
      locationId:
        description: |-
          LocationProductId int             `json:"locationProductId" gorm:"type:int;not null;comment:上架规则id"` //上架规则id
          LocationProduct   LocationProduct `json:"locationProduct" gorm:"foreignKey:LocationProductId;references:Id"`
        description: 位置id
        type: integer
      product:
        $ref: '#/definitions/models.Material'
@@ -546,6 +558,9 @@
        type: string
      updateTime:
        type: string
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  models.LogisticCompany:
    properties:
@@ -854,6 +869,17 @@
        description: 重量
        type: number
    type: object
  models.MonthStatsItemsType:
    enum:
    - 1
    - 2
    type: integer
    x-enum-comments:
      MonthStatsItemsTypeInput: 入库
      MonthStatsItemsTypeOutput: 出库
    x-enum-varnames:
    - MonthStatsItemsTypeInput
    - MonthStatsItemsTypeOutput
  models.MoveHistory:
    properties:
      amount:
@@ -912,44 +938,56 @@
  models.Operation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      auditDate:
        description: 审批时间
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      checkedBy:
        description: 验证者UserId
        type: string
      comment:
        description: 备注
        type: string
      companyID:
        description: 公司ID-客户
        type: string
      companyName:
        description: 公司名称-客户
        type: string
      contacterID:
        description: 联系人ID
        type: integer
      contacterName:
        description: 联系人姓名
        type: string
      createBy:
        description: 创建者UserId
        type: string
      createTime:
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 操作明细
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealer:
        $ref: '#/definitions/models.MiniDict'
      inventoryDealerType:
        type: integer
      isInternalOutput:
        description: 是否调拨产生的出库
@@ -962,25 +1000,26 @@
        description: 源位置id
        type: integer
      logisticCompany:
        $ref: '#/definitions/models.LogisticCompany'
        allOf:
        - $ref: '#/definitions/models.LogisticCompany'
        description: 物流公司信息
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationID    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`         //源位置id
          FromLocation      Location                 `json:"fromLocation"     gorm:"foreignKey:FromLocationID;references:Id"` //源位置
          ToLocationID      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`         //目标位置id
          ToLocation        Location                 `json:"toLocation"      gorm:"foreignKey:ToLocationID;references:Id"`    //目标位置
        description: 安排日期
        type: string
      operationSource:
        allOf:
@@ -993,16 +1032,25 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      remark:
        description: 备注
        type: string
      salesDetailsNumber:
        description: 销售明细编码
        type: string
      silkMarket:
        description: 嘉联仓储添加 SilkMarket
        type: string
      source:
        description: 来源系统
        type: string
      sourceNumber:
        description: 源单号
@@ -1021,8 +1069,11 @@
      updateTime:
        type: string
      warehouse:
        $ref: '#/definitions/models.Warehouse'
        allOf:
        - $ref: '#/definitions/models.Warehouse'
        description: 仓库信息
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1038,8 +1089,10 @@
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      baseOperationType:
        allOf:
@@ -1066,7 +1119,7 @@
        description: 是否调拨产生的出库
        type: boolean
      operationId:
        description: 操作id
        description: 操作记录id
        type: integer
      product:
        allOf:
@@ -1076,9 +1129,19 @@
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 嘉联仓储添加 SilkMarket、SilkMarketClose
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocation:
        allOf:
@@ -1088,8 +1151,10 @@
        description: 目标位置id
        type: integer
      totalGrossWeight:
        description: 总毛重
        type: number
      totalNetWeight:
        description: 总净重
        type: number
      updateTime:
        type: string
@@ -1272,6 +1337,68 @@
        description: 库存位置
        type: string
    type: object
  models.WarehouseMonthStats:
    properties:
      amount:
        description: 期末结余数量
        type: number
      beginAmount:
        description: 期初数量
        type: number
      createTime:
        type: string
      date:
        description: 日期 2024-04
        type: string
      id:
        type: integer
      inputAmount:
        description: 入库数量
        type: number
      inputItems:
        description: 入库明细
        items:
          $ref: '#/definitions/models.WarehouseStatsItems'
        type: array
      outputAmount:
        description: 出库数量
        type: number
      outputItems:
        description: 出库明细
        items:
          $ref: '#/definitions/models.WarehouseStatsItems'
        type: array
      productId:
        description: 产品id
        type: string
      productName:
        description: 产品名称
        type: string
      salePrice:
        description: 销售单价
        type: number
      unit:
        description: 单位
        type: string
      updateTime:
        type: string
      warehouseId:
        description: 仓库ID
        type: integer
    type: object
  models.WarehouseStatsItems:
    properties:
      amount:
        description: 数量
        type: number
      name:
        description: 入库来源，出库去处
        type: string
      type:
        $ref: '#/definitions/models.MonthStatsItemsType'
      warehouseMonthStatsId:
        type: integer
    type: object
  request.AddAttribute:
    properties:
      dataType:
@@ -1356,6 +1483,9 @@
    type: object
  request.AddMiniDict:
    properties:
      code:
        description: 编码
        type: string
      isDefault:
        description: 是否默认
        type: boolean
@@ -1373,13 +1503,15 @@
  request.AddOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 5库存盘点
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      comment:
        description: 备注
        type: string
@@ -1396,36 +1528,43 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      dealerType:
        description: 调拨出入库类型
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealerType:
        type: integer
      locationId:
        description: 源位置id
        type: integer
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
          FromLocationId    int                      `json:"fromLocationId" `   //源位置id
          ToLocationId      int                      `json:"toLocationId" `   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -1434,10 +1573,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口编码
        type: string
      sourceNumber:
        description: 源单号
@@ -1576,6 +1721,9 @@
    type: object
  request.EditMiniDict:
    properties:
      code:
        description: 编码
        type: string
      id:
        description: 字典类型
        type: integer
@@ -1628,9 +1776,9 @@
      pageSize:
        description: 每页大小
        type: integer
      warehouseCode:
        description: 仓库缩写
        type: string
      warehouseId:
        description: WarehouseCode string `json:"warehouseCode"` //仓库缩写
        type: integer
    type: object
  request.GetInventoryHistory:
    properties:
@@ -1656,6 +1804,11 @@
      unit:
        description: 单位
        type: string
      warehouseCode:
        type: string
      warehouseId:
        description: 仓库ID
        type: string
    type: object
  request.GetList:
    properties:
@@ -1674,6 +1827,10 @@
        type: string
      locationId:
        type: integer
      locationIds:
        items:
          type: integer
        type: array
      page:
        description: 页码
        type: integer
@@ -1703,9 +1860,30 @@
        type: integer
      type:
        type: integer
      warehouseId:
        description: 仓库ID
        type: integer
    type: object
  request.GetLocationProductList:
    properties:
      keyword:
        type: string
      locationId:
        type: integer
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      warehouseId:
        type: integer
    type: object
  request.GetMiniDictList:
    properties:
      keyword:
        description: 关键字查询
        type: string
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
@@ -1770,6 +1948,9 @@
    type: object
  request.MiniDict:
    properties:
      code:
        description: 编码
        type: string
      isDefault:
        description: 是否默认
        type: boolean
@@ -1783,6 +1964,7 @@
  request.OperationAllList:
    properties:
      number:
        description: 单号
        type: string
      page:
        description: 页码
@@ -1791,11 +1973,13 @@
        description: 每页大小
        type: integer
      sourceNumber:
        description: 源单号
        type: string
    type: object
  request.OperationCondition:
    properties:
      condition:
        description: 模糊查询条件
        type: string
      keyword:
        description: 关键字搜索
@@ -1819,8 +2003,7 @@
        description: 操作id
        type: integer
      amount:
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        description: ProductName string          `json:"productName" ` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
@@ -1833,16 +2016,26 @@
        type: number
      fromLocationId:
        description: |-
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
          Unit        string          `json:"unit"`                    //单位
          Product models.Material `json:"product" ` // 产品
        type: integer
      productId:
        description: 产品id
        type: string
      remark:
        description: 备注
        type: string
      salePrice:
        description: 销售单价
        type: number
      silkMarket:
        description: 庄口编码
        type: string
      silkMarketClose:
        description: 庄口关闭
        type: string
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocationId:
        description: 目标位置id
@@ -1859,10 +2052,12 @@
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      number:
        description: 单号
        type: string
      operationTypeId:
        description: 作业类型id
        type: integer
      page:
        description: 页码
@@ -1871,7 +2066,9 @@
        description: 每页大小
        type: integer
      status:
        $ref: '#/definitions/constvar.OperationStatus'
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
    type: object
  request.PageInfo:
    properties:
@@ -2083,8 +2280,10 @@
  request.UpdateOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
@@ -2106,16 +2305,20 @@
        description: 联系人姓名-非必填
        type: string
      custodian:
        description: 保管员名称
        type: string
      custodianId:
        description: 保管员id
        type: string
      details:
        description: 详情
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealerType:
        description: 调拨出入库分类(对应dict字典表的ID)
        type: integer
      locationId:
        description: 源位置id
@@ -2126,16 +2329,18 @@
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
          FromLocationId    int                        `json:"fromLocationId"  `   //源位置id
          ToLocationId      int                        `json:"toLocationId" `   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -2144,10 +2349,16 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口编码
        type: string
      sourceNumber:
        description: 源单号
@@ -2259,8 +2470,14 @@
      produceId:
        description: 产品id
        type: string
      productCategory:
        description: 产品类别
        type: string
      productName:
        description: 产品名称
        type: string
      productSpecs:
        description: 产品规格
        type: string
      productType:
        description: 产品类型
@@ -2316,6 +2533,21 @@
        items:
          $ref: '#/definitions/models.Material'
        type: array
    type: object
  user.GetUserRequest:
    properties:
      id:
        type: string
      nickName:
        type: string
      parentId:
        type: string
      pos:
        type: string
      userName:
        type: string
      userType:
        type: integer
    type: object
  util.Response:
    properties:
@@ -2764,6 +2996,44 @@
      summary: 获取字典信息列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getUserList:
    get:
      parameters:
      - in: query
        name: id
        type: string
      - in: query
        name: nickName
        type: string
      - in: query
        name: parentId
        type: string
      - in: query
        name: pos
        type: string
      - in: query
        name: userName
        type: string
      - in: query
        name: userType
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/user.GetUserRequest'
                  type: array
              type: object
      summary: 获取用户列表
      tags:
      - 数据字典
  /api-wms/v1/dict/save:
    post:
      parameters:
@@ -3149,7 +3419,7 @@
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.MonthStats'
                    $ref: '#/definitions/models.WarehouseMonthStats'
                  type: array
              type: object
      summary: 仓库月度统计库存报表
@@ -3357,6 +3627,11 @@
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3376,6 +3651,11 @@
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入参
        in: body
        name: object
@@ -3461,9 +3741,38 @@
      summary: 库存盘点列表
      tags:
      - 库存盘点
  /api-wms/v1/locationProductAmount/locationProductList:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetLocationProductList'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/util.ResponseList'
      summary: 获取位置对应产品列表
      tags:
      - 库存盘点
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3501,6 +3810,11 @@
  /api-wms/v1/operation/finish/{id}:
    put:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -3555,25 +3869,11 @@
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 入库/出库列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/getPersonnelList:
    get:
      parameters:
      - description: 参数
        in: body
        name: object
      - description: token
        in: header
        name: Authorization
        required: true
        schema:
          $ref: '#/definitions/request.OperationCondition'
        type: string
      produces:
      - application/json
      responses:
@@ -3581,13 +3881,23 @@
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - $ref: '#/definitions/util.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/inventory_order.WorkerInfo'
                  type: array
                  $ref: '#/definitions/models.Operation'
              type: object
      summary: 操作详情接口
      tags:
      - 入库/出库
  /api-wms/v1/operation/getPersonnelList:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 获取人员列表
      tags:
      - 入库/出库
@@ -3606,6 +3916,11 @@
  /api-wms/v1/operation/list:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 查询参数
        in: body
        name: object
@@ -3670,6 +3985,11 @@
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3689,6 +4009,11 @@
  /api-wms/v1/operation/operation/{id}:
    delete:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -3928,6 +4253,30 @@
      summary: 编辑部门信息
      tags:
      - 部门信息
  /api-wms/v1/other/saveProductImagesFromExcel:
    post:
      parameters:
      - description: 属性信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/controllers.saveProductImagesFromExcelRequest'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 从excel中获取产品图片并保存
      tags:
      - 其他
  /api-wms/v1/product/addDisuse:
    post:
      parameters:
@@ -4057,6 +4406,22 @@
      summary: 删除产品类型
      tags:
      - 产品类型
  /api-wms/v1/product/downloadInputFormat:
    get:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 下载导入物料/产品模板
      tags:
      - 产品
  /api-wms/v1/product/finishDisuse/{id}:
    put:
      parameters:
@@ -4265,9 +4630,9 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 导入物料
      summary: 导入物料/产品
      tags:
      - 物料管理
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters: