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

yinbentan

2024-07-06 0ec0aef398704cd0219ed452f3aa96c8cdacd647

 docs/swagger.yaml

@@ -212,17 +212,20 @@
    - 2
    - 3
    - 4
    - 5
    type: integer
    x-enum-comments:
      DisuseType: 报废类型
      StockoutType: 出库类型
      StorageType: 入库类型
      TakeStock: 盘点类型
      TakeStockType: 盘点类型
      TransferType: 调拨类型
    x-enum-varnames:
    - StorageType
    - StockoutType
    - TransferType
    - TakeStock
    - TakeStockType
    - DisuseType
  constvar.OperationSource:
    enum:
    - 1
@@ -365,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:
@@ -530,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'
@@ -546,6 +540,8 @@
        type: string
      updateTime:
        type: string
      warehouseId:
        type: integer
    type: object
  models.LogisticCompany:
    properties:
@@ -854,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:
@@ -941,15 +948,13 @@
        type: string
      custodianId:
        type: string
      dealerType:
        type: string
      details:
        items:
          $ref: '#/definitions/models.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealer:
        $ref: '#/definitions/models.MiniDict'
      inventoryDealerType:
        type: integer
      isInternalOutput:
        description: 是否调拨产生的出库
@@ -976,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:
@@ -1079,6 +1079,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocation:
        allOf:
@@ -1272,6 +1275,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:
@@ -1399,13 +1464,13 @@
        type: string
      custodianId:
        type: string
      dealerType:
        type: string
      details:
        items:
          $ref: '#/definitions/request.OperationDetails'
        type: array
      id:
        type: integer
      inventoryDealerType:
        type: integer
      locationId:
        description: 源位置id
@@ -1674,6 +1739,10 @@
        type: string
      locationId:
        type: integer
      locationIds:
        items:
          type: integer
        type: array
      page:
        description: 页码
        type: integer
@@ -1702,6 +1771,24 @@
        description: 每页大小
        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:
@@ -1843,6 +1930,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocationId:
        description: 目标位置id
@@ -3149,7 +3239,7 @@
            - properties:
                data:
                  items:
                    $ref: '#/definitions/models.MonthStats'
                    $ref: '#/definitions/models.WarehouseMonthStats'
                  type: array
              type: object
      summary: 仓库月度统计库存报表
@@ -3461,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:
@@ -3555,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:
@@ -3581,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:
      - 入库/出库
@@ -4057,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:
@@ -4265,9 +4391,9 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 导入物料
      summary: 导入物料/产品
      tags:
      - 物料管理
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters: