修复发运翻车的bug

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})