1.库存盘点列表增加status状态

jiangshuai

2023-09-28 6203a1f61eb9bdcd7bacae6bdb1ee64cf977151e

1.库存盘点列表增加status状态

 controllers/location_product_amount.go

@@ -51,7 +51,8 @@
                    material.unit,
                    wms_location_product_amount.create_date,
                    wms_operation_details.amount as adjust_amount,
                    wms_operation.id as operation_id`).
                    wms_operation.id as operation_id,
                    wms_operation.status`).
        InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
        InnerJoins("inner join material on material.id=wms_location_product.product_id").
        InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id").

 models/location_product_amount.go

@@ -4,6 +4,7 @@
    "fmt"
    "github.com/shopspring/decimal"
    "gorm.io/gorm"
    "wms/constvar"
    "wms/pkg/mysqlx"
)

@@ -29,17 +30,18 @@

    LocationProductAmountWithOperation struct {
        //LocationProductAmount LocationProductAmount `json:"locationProductAmount"`
        LocationProductAmountId int             `json:"locationProductAmount" gorm:"location_product_amount_id"`
        LocationId              int             `json:"locationId" gorm:"column:location_id"`
        LocationName            string          `json:"locationName" gorm:"column:location_name"`
        ProductId               string          `json:"productId" gorm:"column:product_id"`
        ProductName             string          `json:"productName" gorm:"column:product_name"`
        Amount                  decimal.Decimal `json:"amount" gorm:"column:amount"`
        Unit                    string          `json:"unit" gorm:"column:unit"`
        CreateDate              string          `json:"createDate" gorm:"column:create_date"`
        AdjustAmount            decimal.Decimal `json:"adjustAmount" gorm:"column:adjust_amount"`
        DifferenceAmount        decimal.Decimal `json:"differenceAmount" gorm:"-"`
        OperationId             int             `json:"operationId" gorm:"column:operation_id"`
        LocationProductAmountId int                      `json:"locationProductAmount" gorm:"location_product_amount_id"`
        LocationId              int                      `json:"locationId" gorm:"column:location_id"`
        LocationName            string                   `json:"locationName" gorm:"column:location_name"`
        ProductId               string                   `json:"productId" gorm:"column:product_id"`
        ProductName             string                   `json:"productName" gorm:"column:product_name"`
        Amount                  decimal.Decimal          `json:"amount" gorm:"column:amount"`
        Unit                    string                   `json:"unit" gorm:"column:unit"`
        CreateDate              string                   `json:"createDate" gorm:"column:create_date"`
        AdjustAmount            decimal.Decimal          `json:"adjustAmount" gorm:"column:adjust_amount"`
        DifferenceAmount        decimal.Decimal          `json:"differenceAmount" gorm:"-"`
        OperationId             int                      `json:"operationId" gorm:"column:operation_id"`
        Status                  constvar.OperationStatus `json:"status" gorm:"status"`
    }
)