Merge pull request '任务解析一条数据只返回一个错误' (#42) from feature_hondaDemand into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/42

services/pln/implments/HondaDemand.service.impl.go

@@ -108,7 +108,27 @@ func NewHondaDemandServiceImplement() *HondaDemandServiceImplement {
 	//创建任务队列
 	utils.EmailSendFoudnMap["demandAnalysis"] = hondaDemandServiceImplement
 	utils.EmailSendStruct["demandAnalysis"] = utils.NewEmailSendStruct(5, "demandAnalysis", 10, "AnalysisFile")
-
+	//查询解析中以及待解析数据加入任务
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	dao := dal.NewHondaDemandDAO(session, baseModel.PlantNr, "system")
+	condition := DefaultConditionOfHondaDemandAndPaging
+	urlParameters := make(map[string]string)
+	urlParameters[meta.HondaDemand_Parsed.Name] = "1"
+	predicates, err := condition.BuildPredicates(urlParameters)
+	if err != nil {
+		panic(err.Error())
+	}
+	list, err := dao.Select(predicates, condition.OrderByFields)
+	if err != nil {
+		panic(err.Error())
+	}
+	for _, v := range list {
+		utils.EmailSendStruct["demandAnalysis"].SeyChannels(utils.ChannelsInfo{
+			Key:  v.DemandId,
+			Info: v,
+		})
+	}
 	return hondaDemandServiceImplement
 }
 
@@ -345,6 +365,36 @@ func (impl *HondaDemandServiceImplement) AnalysisFile(info utils.ChannelsInfo) (
 	for _, v := range itemInfo {
 		familyInfo, ok := familyMap[v.ProductFamilyId]
 		if ok {
+			if v.ColorValue != familyInfo.ColorValue {
+				errList = append(errList, model.HondaDemandErrorLst{
+					DemandId:    entity.DemandId,
+					Pos:         v.Pos,
+					ErrorType:   "",
+					ErrorInfo:   "车型" + v.ProductFamilyId + "：颜色配置不一致;",
+					ErrorStatus: "开",
+				})
+				continue
+			}
+			if v.ModelValue != familyInfo.ModelValue {
+				errList = append(errList, model.HondaDemandErrorLst{
+					DemandId:    entity.DemandId,
+					Pos:         v.Pos,
+					ErrorType:   "",
+					ErrorInfo:   "车型" + v.ProductFamilyId + "：车型代码不一致;",
+					ErrorStatus: "开",
+				})
+				continue
+			}
+			if v.ConfigValue != familyInfo.ConfigValue {
+				errList = append(errList, model.HondaDemandErrorLst{
+					DemandId:    entity.DemandId,
+					Pos:         v.Pos,
+					ErrorType:   "",
+					ErrorInfo:   "车型" + v.ProductFamilyId + "：配置代码不一致;",
+					ErrorStatus: "开",
+				})
+				continue
+			}
 			for _, val := range familyInfo.Relate {
 
 				custOrderId, err := snrDao.GetNextSnr(familyInfo.Project.CustOrderSnr)
@@ -359,40 +409,6 @@ func (impl *HondaDemandServiceImplement) AnalysisFile(info utils.ChannelsInfo) (
 					_ = errDao.InsertOne(&errData)
 					return false, info
 				}
-				isTrue := false
-				if v.ColorValue != familyInfo.ColorValue {
-					errList = append(errList, model.HondaDemandErrorLst{
-						DemandId:    entity.DemandId,
-						Pos:         v.Pos,
-						ErrorType:   "",
-						ErrorInfo:   "车型" + v.ProductFamilyId + "：颜色配置不一致;",
-						ErrorStatus: "开",
-					})
-					isTrue = true
-				}
-				if v.ModelValue != familyInfo.ModelValue {
-					errList = append(errList, model.HondaDemandErrorLst{
-						DemandId:    entity.DemandId,
-						Pos:         v.Pos,
-						ErrorType:   "",
-						ErrorInfo:   "车型" + v.ProductFamilyId + "：车型代码不一致;",
-						ErrorStatus: "开",
-					})
-					isTrue = true
-				}
-				if v.ConfigValue != familyInfo.ConfigValue {
-					errList = append(errList, model.HondaDemandErrorLst{
-						DemandId:    entity.DemandId,
-						Pos:         v.Pos,
-						ErrorType:   "",
-						ErrorInfo:   "车型" + v.ProductFamilyId + "：配置代码不一致;",
-						ErrorStatus: "开",
-					})
-					isTrue = true
-				}
-				if isTrue {
-					continue
-				}
 				custOrder = append(custOrder, model.CustOrder{
 					CustOrderId:     custOrderId,
 					ProductFamilyId: v.ProductFamilyId,