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

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
@@ -200,15 +211,21 @@
    - 1
    - 2
    - 3
    - 4
    - 5
    type: integer
    x-enum-comments:
      DisuseType: 报废类型
      StockoutType: 出库类型
      StorageType: 入库类型
      TakeStockType: 盘点类型
      TransferType: 调拨类型
    x-enum-varnames:
    - TransferType
    - StorageType
    - StockoutType
    - TransferType
    - TakeStockType
    - DisuseType
  constvar.OperationSource:
    enum:
    - 1
@@ -351,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:
@@ -516,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'
@@ -532,6 +540,8 @@
        type: string
      updateTime:
        type: string
      warehouseId:
        type: integer
    type: object
  models.LogisticCompany:
    properties:
@@ -840,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:
@@ -927,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: 是否调拨产生的出库
@@ -962,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:
@@ -1006,6 +1020,8 @@
        type: integer
      updateTime:
        type: string
      warehouse:
        $ref: '#/definitions/models.Warehouse'
      warehouseId:
        type: integer
      waybillNumber:
@@ -1025,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:
@@ -1056,6 +1079,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocation:
        allOf:
@@ -1223,6 +1249,10 @@
      name:
        description: 仓库名称
        type: string
      openMonthStats:
        allOf:
        - $ref: '#/definitions/constvar.BoolType'
        description: 是否开启月度统计
      outboundTransportation:
        description: 出库运输
        type: integer
@@ -1244,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:
@@ -1371,6 +1463,8 @@
      custodian:
        type: string
      custodianId:
        type: string
      dealerType:
        type: string
      details:
        items:
@@ -1540,6 +1634,11 @@
      token:
        type: string
    type: object
  request.DoWarehouseMonthStats:
    properties:
      token:
        type: string
    type: object
  request.EditMiniDict:
    properties:
      id:
@@ -1640,6 +1739,10 @@
        type: string
      locationId:
        type: integer
      locationIds:
        items:
          type: integer
        type: array
      page:
        description: 页码
        type: integer
@@ -1669,6 +1772,24 @@
        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:
@@ -1688,6 +1809,10 @@
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      preload:
        type: boolean
      warehouseID:
        type: integer
    type: object
  request.GetProductList:
@@ -1805,6 +1930,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocationId:
        description: 目标位置id
@@ -2077,6 +2205,8 @@
        type: array
      id:
        type: integer
      inventoryDealerType:
        type: integer
      locationId:
        description: 源位置id
        type: integer
@@ -2118,6 +2248,9 @@
        description: 状态
      toLocationId:
        description: 目标位置id
        type: integer
      warehouseId:
        description: 仓库id
        type: integer
      waybillNumber:
        description: 运单号
@@ -2771,6 +2904,37 @@
      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
        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/downloadHistory:
    post:
      parameters:
@@ -2895,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:
@@ -3017,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:
@@ -3325,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:
@@ -3419,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:
@@ -3445,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:
      - 入库/出库
@@ -3482,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:
      - 入库/出库
@@ -3631,8 +3884,8 @@
        type: integer
      - description: 仓库id
        in: query
        name: warehouseId
        type: integer
        name: warehouseIds
        type: string
      produces:
      - application/json
      responses:
@@ -3914,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:
@@ -4122,9 +4391,9 @@
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 导入物料
      summary: 导入物料/产品
      tags:
      - 物料管理
      - 产品
  /api-wms/v1/product/listDisuse:
    post:
      parameters: