From 704ed54fce751c7a5b004db4dd4fb69e911f7955 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Sun, 24 Apr 2022 16:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E8=BF=90=E7=BF=BB?= =?UTF-8?q?=E8=BD=A6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jit/implments/ShipOrder.service.impl.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/services/jit/implments/ShipOrder.service.impl.go b/services/jit/implments/ShipOrder.service.impl.go index 1b32186..837078f 100644 --- a/services/jit/implments/ShipOrder.service.impl.go +++ b/services/jit/implments/ShipOrder.service.impl.go @@ -18,6 +18,7 @@ import ( model "LAPP_ACURA_MOM_BACKEND/models/jit" omModel "LAPP_ACURA_MOM_BACKEND/models/om" "LAPP_ACURA_MOM_BACKEND/utils" + "fmt" json "github.com/json-iterator/go" "github.com/kataras/iris/v12" "strconv" @@ -1351,6 +1352,7 @@ func (impl *ShipOrderServiceImplement) ChangeAdvanceToFormal(user *global.User, advanceShipOrderDataMap[key] += 1 } } + fmt.Println("advanceShipOrderDataMap:", advanceShipOrderDataMap) formalShipOrderItemLi, err := shipOrderLstDao.Select([]grmi.Predicate{meta.ShipOrderItemLst_ShipOrderId.NewPredicate(grmi.Equal, formalShipOrderId)}, []grmi.Field{meta.ShipOrderItemLst_Pos}) if err != nil { return grmi.NewBusinessError("查询正式发运单子项失败, error:" + err.Error()) @@ -1362,9 +1364,9 @@ func (impl *ShipOrderServiceImplement) ChangeAdvanceToFormal(user *global.User, formalShipOrderCarSetMap[shipOrderItem.PackTemplateId] = 1 } else { formalShipOrderCarSetMap[shipOrderItem.PackTemplateId] += 1 - } } + formalShipOrderDataMap := make(map[string]int) for productFamilyId, qty := range formalShipOrderCarSetMap { productLi, err := productFamilyRelateDao.SelectPackProductByFamilyId(formalShipOrder.ProjectId, productFamilyId) if err != nil { @@ -1374,12 +1376,22 @@ func (impl *ShipOrderServiceImplement) ChangeAdvanceToFormal(user *global.User, for _, product := range productLi { key += product.ProductId } + _, exist := formalShipOrderDataMap[key] + if !exist { + formalShipOrderDataMap[key] = qty + } else { + formalShipOrderDataMap[key] += qty + } + + } + for key, qty := range formalShipOrderDataMap { advanceQty, exist := advanceShipOrderDataMap[key] if !exist { - return grmi.NewBusinessError("两个发运单发运子项不匹配, 包装模板不匹配, 包装模板ID:" + productFamilyId) + fmt.Println("key:", key) + return grmi.NewBusinessError("两个发运单发运子项不匹配, 包装模板不匹配") } if qty != advanceQty { - return grmi.NewBusinessError("两个发运单发运子项不匹配, 包装模板数量不匹配, 包装模板ID:" + productFamilyId) + return grmi.NewBusinessError("两个发运单发运子项不匹配, 包装模板数量不匹配") } } //advanceShipOrderItemLi, err := shipOrderLstDao.Select([]grmi.Predicate{meta.ShipOrderItemLst_ShipOrderId.NewPredicate(grmi.Equal, advanceShipOrderId), meta.ShipOrderItemLst_Status.NewPredicate(grmi.Equal, model.SHIP_STATUS_CLOSED)}, []grmi.Field{meta.ShipOrderItemLst_Pos})