From 359f2f3fd0da6d69474cce87353beb54bfdbf90c Mon Sep 17 00:00:00 2001 From: lishihai <dslsh@dscom> Date: 星期四, 20 六月 2024 14:24:52 +0800 Subject: [PATCH] 概述->新建或编辑(出库/入库)信息,编辑的时候显示保存的成本单价和销售单价 --- controllers/operation.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 3 deletions(-) diff --git a/controllers/operation.go b/controllers/operation.go index 62bb487..98f633a 100644 --- a/controllers/operation.go +++ b/controllers/operation.go @@ -47,6 +47,7 @@ func (slf OperationController) Add(c *gin.Context) { var reqParams request.AddOperation var params models.Operation + if err := c.BindJSON(&reqParams); err != nil { util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�") return @@ -90,8 +91,26 @@ util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�") return } + err = models.WithTransaction(func(db *gorm.DB) error { + if err := models.NewOperationSearch().Create(¶ms); err != nil { + return err + } + od := params.Details + for _, v := range od { + //material, err := models.NewMaterialSearch().SetID(v.ProductId).First() + //if err != nil {return err} + material := new(models.Material) + material.ID = v.ProductId + material.Cost = v.Cost + material.SalePrice = v.SalePrice + if err := models.NewMaterialSearch().SetOrm(db).Update(material); err != nil { + return err + } + } + return nil + }) - if err := models.NewOperationSearch().Create(¶ms); err != nil { + if err != nil { logx.Errorf("Operation create err: %v", err) util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error()) return @@ -161,9 +180,9 @@ } func (slf OperationController) CheckParams(params models.Operation) error { - if params.SourceNumber == "" { + /*if params.SourceNumber == "" { return errors.New("璇峰~鍏ユ簮鍗曞彿") - } + }*/ if params.Number == "" { return errors.New("璇峰~鍏ュ崟鍙�") @@ -250,10 +269,29 @@ if int(params.Status) != 0 { search.SetStatus(params.Status) } + materials, err := models.NewMaterialSearch().FindNotTotal() + if err != nil { + util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error()) + return + } + costMap := make(map[string]decimal.Decimal) + salePriceMap := make(map[string]decimal.Decimal) + for _, material := range materials { + costMap[material.ID] = material.Cost + salePriceMap[material.ID] = material.SalePrice + } list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find() if err != nil { util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error()) return + } + for _, v := range list { + for _, v1 := range v.Details { + //v1.SalePrice = decimal.NewFromFloat(1.2345) + //v1.Cost = decimal.NewFromFloat(9.678) + v1.SalePrice = v1.Cost + v1.Cost = v1.SalePrice + } } util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize) @@ -314,6 +352,18 @@ if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(¶ms); err != nil { return err } + od := params.Details + for _, v := range od { + //material, err := models.NewMaterialSearch().SetID(v.ProductId).First() + //if err != nil {return err} + material := new(models.Material) + material.ID = v.ProductId + material.Cost = v.Cost + material.SalePrice = v.SalePrice + if err := models.NewMaterialSearch().SetOrm(tx).Update(material); err != nil { + return err + } + } return nil }); err != nil { util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触锛�"+err.Error()) -- Gitblit v1.8.0