Merge remote-tracking branch 'origin/jialian' into jialian

yinbentan

2024-07-16 33cb0eb308c1b62e25211600383371c31907025e

 docs/swagger.yaml

@@ -361,6 +361,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:
@@ -541,7 +556,6 @@
      updateTime:
        type: string
      warehouseId:
        description: 仓库id
        type: integer
    type: object
  models.LogisticCompany:
@@ -920,52 +934,38 @@
  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
@@ -982,26 +982,20 @@
        description: 源位置id
        type: integer
      logisticCompany:
        allOf:
        - $ref: '#/definitions/models.LogisticCompany'
        description: 物流公司信息
        $ref: '#/definitions/models.LogisticCompany'
      logisticCompanyId:
        description: 物流公司id
        type: string
      logisticWeight:
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: 安排日期
        type: string
      operationSource:
        allOf:
@@ -1014,25 +1008,16 @@
        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: 源单号
@@ -1051,11 +1036,8 @@
      updateTime:
        type: string
      warehouse:
        allOf:
        - $ref: '#/definitions/models.Warehouse'
        description: 仓库信息
        $ref: '#/definitions/models.Warehouse'
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1071,10 +1053,8 @@
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
        type: number
      auxiliaryUnit:
        description: 辅助单位
        type: string
      baseOperationType:
        allOf:
@@ -1101,7 +1081,7 @@
        description: 是否调拨产生的出库
        type: boolean
      operationId:
        description: 操作记录id
        description: 操作id
        type: integer
      product:
        allOf:
@@ -1111,17 +1091,10 @@
        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
@@ -1133,10 +1106,8 @@
        description: 目标位置id
        type: integer
      totalGrossWeight:
        description: 总毛重
        type: number
      totalNetWeight:
        description: 总净重
        type: number
      updateTime:
        type: string
@@ -1217,47 +1188,6 @@
      updateTime:
        type: string
    type: object
  models.SilkDict:
    properties:
      createdAt:
        type: string
      deletedAt:
        $ref: '#/definitions/gorm.DeletedAt'
      dictType:
        allOf:
        - $ref: '#/definitions/models.SilkDictType'
        description: 字典类型
      id:
        type: integer
      name:
        description: 名称
        type: string
      number:
        description: 编号
        type: string
      remark:
        description: 备注
        type: string
      updatedAt:
        type: string
    type: object
  models.SilkDictType:
    enum:
    - 1
    - 2
    - 3
    - 4
    type: integer
    x-enum-comments:
      DictTypeColor: 颜色
      DictTypeMarket: 庄口
      DictTypeSpec: 规格
      DictTypeWorkshop: 车间
    x-enum-varnames:
    - DictTypeMarket
    - DictTypeWorkshop
    - DictTypeColor
    - DictTypeSpec
  models.SystemConfig:
    properties:
      configType:
@@ -1523,15 +1453,13 @@
  request.AddOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
        description: 基础作业类型 5库存盘点
      comment:
        description: 备注
        type: string
@@ -1548,16 +1476,12 @@
        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
@@ -1567,24 +1491,21 @@
        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" `   //源位置id
          ToLocationId      int                      `json:"toLocationId" `   //目标位置id
          FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -1593,16 +1514,10 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -1823,9 +1738,6 @@
        type: string
      warehouseCode:
        type: string
      warehouseId:
        description: 仓库ID
        type: string
    type: object
  request.GetList:
    properties:
@@ -1975,7 +1887,6 @@
  request.OperationAllList:
    properties:
      number:
        description: 单号
        type: string
      page:
        description: 页码
@@ -1984,13 +1895,11 @@
        description: 每页大小
        type: integer
      sourceNumber:
        description: 源单号
        type: string
    type: object
  request.OperationCondition:
    properties:
      condition:
        description: 模糊查询条件
        type: string
      keyword:
        description: 关键字搜索
@@ -2014,7 +1923,8 @@
        description: 操作id
        type: integer
      amount:
        description: ProductName string          `json:"productName" ` //产品名称
        description: ProductName string          `json:"productName" gorm:"type:varchar(255);not
          null;comment:产品名称"` //产品名称
        type: number
      auxiliaryAmount:
        description: 辅助数量
@@ -2027,24 +1937,17 @@
        type: number
      fromLocationId:
        description: |-
          Unit        string          `json:"unit"`                    //单位
          Product models.Material `json:"product" ` // 产品
          Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
          Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
        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
@@ -2063,12 +1966,10 @@
      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: 页码
@@ -2077,9 +1978,7 @@
        description: 每页大小
        type: integer
      status:
        allOf:
        - $ref: '#/definitions/constvar.OperationStatus'
        description: 状态
        $ref: '#/definitions/constvar.OperationStatus'
    type: object
  request.PageInfo:
    properties:
@@ -2291,10 +2190,8 @@
  request.UpdateOperation:
    properties:
      accountant:
        description: 会计名称
        type: string
      accountantId:
        description: 会计id
        type: string
      baseOperationType:
        allOf:
@@ -2316,20 +2213,16 @@
        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
@@ -2340,18 +2233,16 @@
        description: 物流重量
        type: number
      manager:
        description: 主管名称
        type: string
      managerId:
        description: 主管id
        type: string
      number:
        description: 单号
        type: string
      operationDate:
        description: |-
          FromLocationId    int                        `json:"fromLocationId"  `   //源位置id
          ToLocationId      int                        `json:"toLocationId" `   //目标位置id
          FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
          ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
        type: string
      operationTypeId:
        description: 作业类型id
@@ -2360,16 +2251,10 @@
        description: 作业类型名称
        type: string
      receiverAddr:
        description: 收货地址
        type: string
      receiverName:
        description: 收货人姓名
        type: string
      receiverPhone:
        description: 联系电话
        type: string
      silkMarket:
        description: 庄口
        type: string
      sourceNumber:
        description: 源单号
@@ -2481,14 +2366,8 @@
      produceId:
        description: 产品id
        type: string
      productCategory:
        description: 产品类别
        type: string
      productName:
        description: 产品名称
        type: string
      productSpecs:
        description: 产品规格
        type: string
      productType:
        description: 产品类型
@@ -2544,21 +2423,6 @@
        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:
@@ -3005,74 +2869,6 @@
                  type: array
              type: object
      summary: 获取字典信息列表
      tags:
      - 数据字典
  /api-wms/v1/dict/getSilkDictList/{type}:
    get:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 字典类型
        in: path
        name: type
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.SilkDict'
                  type: array
              type: object
      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:
@@ -3668,11 +3464,6 @@
  /api-wms/v1/locationProductAmount/add:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3692,11 +3483,6 @@
  /api-wms/v1/locationProductAmount/finish:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入参
        in: body
        name: object
@@ -3809,11 +3595,6 @@
  /api-wms/v1/locationProductAmount/update:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -3851,11 +3632,6 @@
  /api-wms/v1/operation/finish/{id}:
    put:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -3957,11 +3733,6 @@
  /api-wms/v1/operation/list:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 查询参数
        in: body
        name: object
@@ -4026,11 +3797,6 @@
  /api-wms/v1/operation/operation:
    post:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: 入库/出库信息
        in: body
        name: object
@@ -4050,11 +3816,6 @@
  /api-wms/v1/operation/operation/{id}:
    delete:
      parameters:
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      - description: id
        in: path
        name: id
@@ -4294,6 +4055,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: