操作明细增加当时库存数量供盘点操作用

zhangqian

2024-07-05 dec0da77e3537bcd71bb31067258194327da9bfa

操作明细增加当时库存数量供盘点操作用

 docs/docs.go

@@ -1,4 +1,5 @@
// Package docs Code generated by swaggo/swag. DO NOT EDIT
// Code generated by swaggo/swag. DO NOT EDIT.

package docs

import "github.com/swaggo/swag"
@@ -5213,6 +5214,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5220,12 +5224,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealer": {
                    "$ref": "#/definitions/models.MiniDict"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "isInternalOutput": {
@@ -5265,7 +5263,6 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationID    int                      ` + "`" + `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"` + "`" + `         //源位置id\nFromLocation      Location                 ` + "`" + `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` + "`" + ` //源位置\nToLocationID      int                      ` + "`" + `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"` + "`" + `         //目标位置id\nToLocation        Location                 ` + "`" + `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"` + "`" + `    //目标位置",
                    "type": "string"
                },
                "operationSource": {
@@ -5417,6 +5414,10 @@
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocation": {
@@ -5983,6 +5984,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5990,9 +5994,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "locationId": {
@@ -6655,6 +6656,10 @@
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"

 docs/swagger.json

@@ -5202,6 +5202,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5209,12 +5212,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealer": {
                    "$ref": "#/definitions/models.MiniDict"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "isInternalOutput": {
@@ -5254,7 +5251,6 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationID    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`         //源位置id\nFromLocation      Location                 `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` //源位置\nToLocationID      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`         //目标位置id\nToLocation        Location                 `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"`    //目标位置",
                    "type": "string"
                },
                "operationSource": {
@@ -5406,6 +5402,10 @@
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocation": {
@@ -5972,6 +5972,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5979,9 +5982,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "locationId": {
@@ -6644,6 +6644,10 @@
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"

 docs/swagger.yaml

@@ -948,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: 是否调拨产生的出库
@@ -983,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:
@@ -1086,6 +1079,9 @@
        type: string
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocation:
        allOf:
@@ -1468,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
@@ -1935,6 +1931,9 @@
      salePrice:
        description: 销售单价
        type: number
      stockAmount:
        description: 库存数量，盘点时用
        type: number
      toLocationId:
        description: 目标位置id
        type: integer

 models/operation_details.go

@@ -17,7 +17,8 @@
        BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
        ProductId         string                     `json:"productId" gorm:"type:varchar(191);not null;comment:产品id"`      //产品id
        //ProductName string          `json:"productName" gorm:"type:varchar(255);not null;comment:产品名称"` //产品名称
        Amount decimal.Decimal `json:"amount" gorm:"type:decimal(20,2);not null;comment:数量"` //数量
        Amount      decimal.Decimal `json:"amount" gorm:"type:decimal(30,10);not null;comment:数量"` //数量
        StockAmount decimal.Decimal `json:"stockAmount" gorm:"type:decimal(30,10);"`               //库存数量，盘点时用
        //Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
        Product Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`


 request/operation.go

@@ -46,6 +46,7 @@
    ProductId   string `json:"productId" gorm:"type:varchar(191);not null;comment:产品id"` //产品id
    //ProductName string          `json:"productName" gorm:"type:varchar(255);not null;comment:产品名称"` //产品名称
    Amount decimal.Decimal `json:"amount" gorm:"type:decimal(20,2);not null;comment:数量"` //数量
    StockAmount decimal.Decimal `json:"stockAmount" gorm:"type:decimal(30,10);"`                //库存数量，盘点时用
    //Unit        string          `json:"unit" gorm:"type:varchar(31);comment:单位"`                    //单位
    //Product models.Material `json:"product" gorm:"foreignKey:ProductId;references:ID"`
    FromLocationId   int             `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"` //源位置id