liujiandao
2023-10-21 26a2ae9619dfff4c43487ca39307c06be635c23f
Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
3个文件已修改
10 ■■■■■ 已修改文件
controllers/location_product_amount.go 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/product_controller.go 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/material.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/location_product_amount.go
@@ -77,10 +77,12 @@
                return
            }
        } else {
            if len(operation.Details) > 0 {
            records[k].AdjustAmount = operation.Details[0].Amount
                records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
            }
            records[k].OperationId = operation.Id
            records[k].Status = operation.Status
            records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
        }
    }
    util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
controllers/product_controller.go
@@ -535,6 +535,10 @@
        util.ResponseFormat(c, code.RequestParamError, "该信息无法修改")
        return
    }
    if params.ProductId == "" {
        util.ResponseFormat(c, code.RequestParamError, "请选择报废产品")
        return
    }
    detail := &models.OperationDetails{
        ProductId: params.ProductId,
        //ProductName: params.ProductName,
@@ -551,6 +555,7 @@
        ToLocationID:    params.ToLocationId,
        OperationDate:   params.OperationDate,
        Details:         []*models.OperationDetails{detail},
        BaseOperationType: params.BaseOperationType,
    }
    if err := models.WithTransaction(func(tx *gorm.DB) error {
        if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
models/material.go
@@ -511,6 +511,7 @@
    ProductName    string                   `json:"productName" gorm:"type:varchar(255);not null;comment:产品名称"` //产品名称
    Amount         decimal.Decimal          `json:"amount" gorm:"type:decimal(20,2);not null;comment:数量"`       //数量
    Unit           string                   `json:"unit" gorm:"type:varchar(31);comment:单位"`
    BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"type:tinyint;not null;comment:基础作业类型"` //基础作业类型
}
func (slf *MaterialSearch) Update(record *Material) error {