出库、入库、盘点涉及产品重复性检查调整（从【产品编号】变更为以【产品编号、出库库房编号、入库库房编号】作为唯一标识）

yinbentan

2024-07-06 0ec0aef398704cd0219ed452f3aa96c8cdacd647

 docs/swagger.yaml

@@ -60,6 +60,17 @@
    - BaseOperationTypeInternal
    - BaseOperationTypeDisuse
    - BaseOperationTypeAdjust
  constvar.BoolType:
    enum:
    - 1
    - 2
    type: integer
    x-enum-comments:
      BoolTypeFalse: "false"
      BoolTypeTrue: "true"
    x-enum-varnames:
    - BoolTypeTrue
    - BoolTypeFalse
  constvar.CostingMethod:
    enum:
    - 1
@@ -195,6 +206,26 @@
    - MaterialModeConsumables
    - MaterialModeOther
    - MaterialModeVirtual
  constvar.MiniDictType:
    enum:
    - 1
    - 2
    - 3
    - 4
    - 5
    type: integer
    x-enum-comments:
      DisuseType: 报废类型
      StockoutType: 出库类型
      StorageType: 入库类型
      TakeStockType: 盘点类型
      TransferType: 调拨类型
    x-enum-varnames:
    - StorageType
    - StockoutType
    - TransferType
    - TakeStockType
    - DisuseType
  constvar.OperationSource:
    enum:
    - 1
@@ -337,13 +368,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:
@@ -502,9 +526,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'
@@ -518,6 +540,8 @@
        type: string
      updateTime:
        type: string
      warehouseId:
        type: integer
    type: object
  models.LogisticCompany:
    properties:
@@ -749,6 +773,27 @@
        description: 重量
        type: number
    type: object
  models.MiniDict:
    properties:
      code:
        description: 编码
        type: string
      id:
        type: integer
      isDefault:
        description: 是否默认
        type: boolean
      name:
        description: 名称
        type: string
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
        description: 字典类型
      value:
        description: 值
        type: string
    type: object
  models.MonthStats:
    properties:
      MoreUnitsArr:
@@ -805,6 +850,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:
@@ -892,6 +948,8 @@
        type: string
      custodianId:
        type: string
      dealerType:
        type: string
      details:
        items:
          $ref: '#/definitions/models.OperationDetails'
@@ -923,11 +981,6 @@
        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"`    //目标位置
        type: string
      operationSource:
        allOf:
@@ -967,6 +1020,10 @@
        type: integer
      updateTime:
        type: string
      warehouse:
        $ref: '#/definitions/models.Warehouse'
      warehouseId:
        type: integer
      waybillNumber:
        description: 运单号
        type: string
@@ -984,10 +1041,17 @@
        type: number
      auxiliaryUnit:
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型
      cost:
        description: 成本单价
        type: number
      createTime:
        type: string
      dealerType:
        description: 出入库类型
        type: string
      fromLocation:
        allOf:
@@ -1015,6 +1079,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocation:
        allOf:
@@ -1182,6 +1249,10 @@
      name:
        description: 仓库名称
        type: string
      openMonthStats:
        allOf:
        - $ref: '#/definitions/constvar.BoolType'
        description: 是否开启月度统计
      outboundTransportation:
        description: 出库运输
        type: integer
@@ -1203,6 +1274,68 @@
      warehouseLocation:
        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:
@@ -1286,12 +1419,32 @@
        - $ref: '#/definitions/constvar.RuleType'
        description: 上架规则类型 1：产品类型；2：产品类别类型
    type: object
  request.AddMiniDict:
    properties:
      isDefault:
        description: 是否默认
        type: boolean
      name:
        description: 名称
        type: string
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
        description: 字典类型
      value:
        description: 值
        type: string
    type: object
  request.AddOperation:
    properties:
      accountant:
        type: string
      accountantId:
        type: string
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 基础作业类型 5库存盘点
      comment:
        description: 备注
        type: string
@@ -1310,6 +1463,8 @@
      custodian:
        type: string
      custodianId:
        type: string
      dealerType:
        type: string
      details:
        items:
@@ -1358,6 +1513,9 @@
        description: 状态
      toLocationId:
        description: 目标位置id
        type: integer
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -1476,6 +1634,30 @@
      token:
        type: string
    type: object
  request.DoWarehouseMonthStats:
    properties:
      token:
        type: string
    type: object
  request.EditMiniDict:
    properties:
      id:
        description: 字典类型
        type: integer
      isDefault:
        description: 是否默认
        type: boolean
      name:
        description: 名称
        type: string
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
        description: 字典类型
      value:
        description: 值
        type: string
    type: object
  request.FinishLocationProductAmount:
    properties:
      locationProductAmountId:
@@ -1557,6 +1739,10 @@
        type: string
      locationId:
        type: integer
      locationIds:
        items:
          type: integer
        type: array
      page:
        description: 页码
        type: integer
@@ -1586,6 +1772,31 @@
        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:
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
        description: 字典类型
    type: object
  request.GetMonthStats:
    properties:
@@ -1598,6 +1809,10 @@
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      preload:
        type: boolean
      warehouseID:
        type: integer
    type: object
  request.GetProductList:
@@ -1638,6 +1853,18 @@
        type: integer
      productId:
        description: 产品id
        type: string
    type: object
  request.MiniDict:
    properties:
      isDefault:
        description: 是否默认
        type: boolean
      name:
        description: 名称
        type: string
      value:
        description: 值
        type: string
    type: object
  request.OperationAllList:
@@ -1704,6 +1931,9 @@
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocationId:
        description: 目标位置id
        type: integer
@@ -1716,6 +1946,10 @@
    type: object
  request.OperationList:
    properties:
      baseOperationType:
        allOf:
        - $ref: '#/definitions/constvar.BaseOperationType'
        description: 1 入库 2 出库 3 内部调拨 4 报废 5 库存盘点
      number:
        type: string
      operationTypeId:
@@ -1772,6 +2006,17 @@
        type: integer
      productId:
        type: string
    type: object
  request.SaveMiniDict:
    properties:
      list:
        items:
          $ref: '#/definitions/request.MiniDict'
        type: array
      type:
        allOf:
        - $ref: '#/definitions/constvar.MiniDictType'
        description: 字典类型
    type: object
  request.SaveUnitDict:
    properties:
@@ -1960,6 +2205,8 @@
        type: array
      id:
        type: integer
      inventoryDealerType:
        type: integer
      locationId:
        description: 源位置id
        type: integer
@@ -2001,6 +2248,9 @@
        description: 状态
      toLocationId:
        description: 目标位置id
        type: integer
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -2182,89 +2432,6 @@
info:
  contact: {}
paths:
  /api-s/v1/organize/department:
    get:
      parameters:
      - 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.Department'
                  type: array
              type: object
      summary: 查询部门信息列表
      tags:
      - 部门信息
    post:
      parameters:
      - description: 部门信息信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddDepartment'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加部门信息
      tags:
      - 部门信息
  /api-s/v1/organize/department/{id}:
    delete:
      parameters:
      - description: 部门信息信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateDepartment'
      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.UpdateDepartment'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑部门信息
      tags:
      - 部门信息
  /api-wms/v1/attachment/uploadFiles:
    post:
      responses:
@@ -2607,6 +2774,105 @@
      summary: 编辑公司
      tags:
      - 公司
  /api-wms/v1/dict/add:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddMiniDict'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加字典信息
      tags:
      - 数据字典
  /api-wms/v1/dict/delete/{id}:
    delete:
      parameters:
      - description: id
        in: path
        name: id
        required: true
        type: string
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 删除字典信息
      tags:
      - 数据字典
  /api-wms/v1/dict/edit:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.EditMiniDict'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑字典信息
      tags:
      - 数据字典
  /api-wms/v1/dict/getDictList:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetMiniDictList'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.MiniDict'
                  type: array
              type: object
      summary: 获取字典信息列表
      tags:
      - 数据字典
  /api-wms/v1/dict/save:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.SaveMiniDict'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 批量更新迷你字典(会删除原数据)
      tags:
      - 数据字典
  /api-wms/v1/forms/doMonthStats:
    post:
      parameters:
@@ -2616,6 +2882,37 @@
        required: true
        schema:
          $ref: '#/definitions/request.DoMonthStats'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.MonthStats'
                  type: array
              type: object
      summary: 手动跑月度统计库存报表
      tags:
      - 报表
  /api-wms/v1/forms/doWarehouseMonthStats:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.DoWarehouseMonthStats'
      - description: token
        in: header
        name: Authorization
@@ -2762,6 +3059,37 @@
      summary: 下载月度统计库存报表
      tags:
      - 报表
  /api-wms/v1/forms/downloadWarehouseMonthStats:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetMonthStats'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.MonthStats'
                  type: array
              type: object
      summary: 下载按仓库统计月度统计库存报表
      tags:
      - 报表
  /api-wms/v1/forms/getHistory:
    post:
      parameters:
@@ -2884,6 +3212,37 @@
                  type: array
              type: object
      summary: 月度统计库存报表
      tags:
      - 报表
  /api-wms/v1/forms/warehouseMonthStats:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetMonthStats'
      - description: token
        in: header
        name: Authorization
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.WarehouseMonthStats'
                  type: array
              type: object
      summary: 仓库月度统计库存报表
      tags:
      - 报表
  /api-wms/v1/location/addLocation:
@@ -3192,6 +3551,30 @@
      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:
@@ -3286,25 +3669,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:
@@ -3312,13 +3681,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:
      - 入库/出库
@@ -3349,7 +3728,14 @@
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
            allOf:
            - $ref: '#/definitions/util.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.Operation'
                  type: array
              type: object
      summary: 入库/出库列表
      tags:
      - 入库/出库
@@ -3498,8 +3884,8 @@
        type: integer
      - description: 仓库id
        in: query
        name: warehouseId
        type: integer
        name: warehouseIds
        type: string
      produces:
      - application/json
      responses:
@@ -3569,6 +3955,89 @@
      summary: 编辑作业类型
      tags:
      - 业务类型
  /api-wms/v1/organize/department:
    get:
      parameters:
      - 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.Department'
                  type: array
              type: object
      summary: 查询部门信息列表
      tags:
      - 部门信息
    post:
      parameters:
      - description: 部门信息信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddDepartment'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 添加部门信息
      tags:
      - 部门信息
  /api-wms/v1/organize/department/{id}:
    delete:
      parameters:
      - description: 部门信息信息
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateDepartment'
      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.UpdateDepartment'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 编辑部门信息
      tags:
      - 部门信息
  /api-wms/v1/product/addDisuse:
    post:
      parameters:
@@ -3698,6 +4167,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:
@@ -3906,9 +4391,9 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 导入物料
      summary: 导入物料/产品
      tags:
      - 物料管理
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters: