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

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

@@ -7,28 +7,28 @@

type AddOperation struct {
    ID                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
    Number            string                   `json:"number" gorm:"column:number;type:varchar(255)"`             //单号
    SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                     //源单号
    OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`   //作业类型id
    Number            string                   `json:"number" gorm:"column:number;type:varchar(255)"`                   //单号
    SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
    OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`     //作业类型id
    OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:作业类型名称"` //作业类型名称
    Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`            //状态
    Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`                //状态
    //FromLocationId    int                      `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
    //ToLocationId      int                      `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
    OperationDate     string                     `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"` //安排日期
    Details           []*OperationDetails        `json:"details"`
    ContacterID       int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`           //联系人ID-非必填
    ContacterID       int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`             //联系人ID-非必填
    ContacterName     string                     `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"` //联系人姓名-非必填
    CompanyID         string                     `json:"companyID"`                                           //公司ID-客户
    CompanyName       string                     `json:"companyName" gorm:"type:varchar(127);comment:公司名称"`   //公司名称-客户名称
    Comment           string                     `json:"comment" gorm:"type:text;comment:备注"`                 //备注
    CompanyID         string                     `json:"companyID"`                                                //公司ID-客户
    CompanyName       string                     `json:"companyName" gorm:"type:varchar(127);comment:公司名称"`    //公司名称-客户名称
    Comment           string                     `json:"comment" gorm:"type:text;comment:备注"`                    //备注
    LogisticCompanyId string                     `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:物流公司id"`
    WaybillNumber     string                     `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`    //运单号
    Weight            decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`           //重量
    WaybillNumber     string                     `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`     //运单号
    Weight            decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`             //重量
    LogisticWeight    decimal.Decimal            `gorm:"type:decimal(20,2);comment:物流重量" json:"logisticWeight"` //物流重量
    ReceiverName      string                     `json:"receiverName" gorm:"type:varchar(31);comment:收货人姓名"`
    ReceiverPhone     string                     `json:"receiverPhone" gorm:"type:varchar(31);comment:联系电话"`
    ReceiverAddr      string                     `json:"receiverAddr" gorm:"type:varchar(255);comment:收货地址"`
    LocationId        int                        `json:"locationId"   gorm:"type:int;not null;comment:源位置id"`     //源位置id
    LocationId        int                        `json:"locationId"   gorm:"type:int;not null;comment:源位置id"`      //源位置id
    ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:仓库位置id"` //目标位置id
    ManagerId         string                     `json:"managerId" gorm:"type:varchar(255);comment:主管id"`
    Manager           string                     `json:"manager" gorm:"type:varchar(255);comment:主管名称"`
@@ -37,21 +37,22 @@
    CustodianId       string                     `json:"custodianId" gorm:"type:varchar(255);comment:保管员id"`
    Custodian         string                     `json:"custodian" gorm:"type:varchar(255);comment:保管员名称"`
    BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型 5库存盘点
    WarehouseId       int                        `json:"warehouseId" gorm:"type:int;not null;comment:仓库id"`             //仓库id
    WarehouseId       int                        `json:"warehouseId" gorm:"type:int;not null;comment:仓库id"`                 //仓库id
    DealerType        string                     `json:"dealerType" gorm:"type:varchar(255);comment:调拨出入库类型"`
}

type OperationDetails struct {
    OperationId int    `json:"OperationId" gorm:"type:int;not null;comment:操作记录id"`      //操作id
    OperationId int    `json:"OperationId" gorm:"type:int;not null;comment:操作记录id"`    //操作id
    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(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
    FromLocationId   int             `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`  //源位置id
    ToLocationId     int             `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"` //目标位置id
    TotalGrossWeight decimal.Decimal `json:"totalGrossWeight" gorm:"type:decimal(20,3);comment:总毛重"`  //总毛重
    TotalNetWeight   decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:总净重"`    //总净重
    TotalGrossWeight decimal.Decimal `json:"totalGrossWeight" gorm:"type:decimal(20,3);comment:总毛重"`   //总毛重
    TotalNetWeight   decimal.Decimal `json:"totalNetWeight" gorm:"type:decimal(20,3);comment:总净重"`     //总净重
    AuxiliaryAmount  decimal.Decimal `json:"auxiliaryAmount" gorm:"type:decimal(20,3);comment:辅助数量"`  //辅助数量
    AuxiliaryUnit    string          `json:"auxiliaryUnit" gorm:"type:varchar(191);comment:辅助单位"`     //辅助单位
    Remark           string          `gorm:"type:varchar(1024);comment:备注" json:"remark"`
@@ -70,29 +71,29 @@

type UpdateOperation struct {
    ID                int                      `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
    Number            string                   `json:"number" gorm:"column:number;type:varchar(255)"`             //单号
    SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                     //源单号
    OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`   //作业类型id
    Number            string                   `json:"number" gorm:"column:number;type:varchar(255)"`                   //单号
    SourceNumber      string                   `json:"sourceNumber" gorm:"type:varchar(255)"`                           //源单号
    OperationTypeId   int                      `json:"operationTypeId" gorm:"type:int;not null;comment:作业类型id"`     //作业类型id
    OperationTypeName string                   `json:"operationTypeName" gorm:"type:varchar(127);comment:作业类型名称"` //作业类型名称
    Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`            //状态
    Status            constvar.OperationStatus `json:"status" gorm:"type:int(11);not null;comment:状态"`                //状态
    //FromLocationId    int                        `json:"fromLocationId"   gorm:"type:int;not null;comment:源位置id"`   //源位置id
    //ToLocationId      int                        `json:"toLocationId"    gorm:"type:int;not null;comment:目标位置id"`   //目标位置id
    OperationDate       string                     `json:"operationDate" gorm:"type:varchar(31);comment:安排日期"` //安排日期
    Details             []*OperationDetails        `json:"details"`
    ContacterID         int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`           //联系人ID-非必填
    ContacterID         int                        `json:"contacterID" gorm:"type:int;comment:联系人ID"`             //联系人ID-非必填
    ContacterName       string                     `json:"contacterName" gorm:"type:varchar(63);comment:联系人姓名"` //联系人姓名-非必填
    CompanyID           string                     `json:"companyID"`                                           //公司ID-客户
    CompanyName         string                     `json:"companyName" gorm:"type:varchar(127);comment:公司名称"`   //公司名称-客户名称
    Comment             string                     `json:"comment" gorm:"type:text;comment:备注"`                 //备注
    BaseOperationType   constvar.BaseOperationType `json:"baseOperationType"`                                   //基础作业类型
    CompanyID           string                     `json:"companyID"`                                                //公司ID-客户
    CompanyName         string                     `json:"companyName" gorm:"type:varchar(127);comment:公司名称"`    //公司名称-客户名称
    Comment             string                     `json:"comment" gorm:"type:text;comment:备注"`                    //备注
    BaseOperationType   constvar.BaseOperationType `json:"baseOperationType"`                                        //基础作业类型
    LogisticCompanyId   string                     `json:"logisticCompanyId"   gorm:"type:varchar(191);comment:物流公司id"`
    WaybillNumber       string                     `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`    //运单号
    Weight              decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`           //重量
    WaybillNumber       string                     `json:"waybillNumber" gorm:"type:varchar(255);comment:运单号"`     //运单号
    Weight              decimal.Decimal            `gorm:"type:decimal(20,2);comment:重量" json:"weight"`             //重量
    LogisticWeight      decimal.Decimal            `gorm:"type:decimal(20,2);comment:物流重量" json:"logisticWeight"` //物流重量
    ReceiverName        string                     `json:"receiverName" gorm:"type:varchar(31);comment:收货人姓名"`
    ReceiverPhone       string                     `json:"receiverPhone" gorm:"type:varchar(31);comment:联系电话"`
    ReceiverAddr        string                     `json:"receiverAddr" gorm:"type:varchar(255);comment:收货地址"`
    LocationId          int                        `json:"locationId"   gorm:"type:int;not null;comment:源位置id"`     //源位置id
    LocationId          int                        `json:"locationId"   gorm:"type:int;not null;comment:源位置id"`      //源位置id
    ToLocationId        int                        `json:"toLocationId"    gorm:"type:int;not null;comment:仓库位置id"` //目标位置id
    ManagerId           string                     `json:"managerId" gorm:"type:varchar(255);comment:主管id"`
    Manager             string                     `json:"manager" gorm:"type:varchar(255);comment:主管名称"`