修复查询工艺操作结果的bug

services/om/implments/SerialOrder.service.impl.go

@@ -2369,9 +2369,12 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationData(user *globa
 	}
 	poIdLi := make([]string, 0, len(poLi))
 	for _, po := range poLi {
+		if po.IsLastPO || po.IsLastPOForBK {
+			continue
+		}
 		poIdLi = append(poIdLi, po.PO)
 	}
-	displayPoLi := poIdLi[:len(poIdLi)-1]
+	displayPoLi := poIdLi
 	// 查询工序关联的所有工位
 	processWorkPlaceDao := baseDal.NewProcessWorkPlaceLstDAO(session, user.PlantNr, user.UserId)
 	relateWorkPlaceLi, err := processWorkPlaceDao.SelectByProcess(displayPoLi)
@@ -2391,12 +2394,13 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationData(user *globa
 	selectPoIdLi := make([]string, 0, len(displayPoLi))
 	for _, poId := range displayPoLi {
 		_, exist := ignorePOMap[poId]
-		if !exist {
+		if exist {
 			continue
 		}
 		poIdLiInterface = append(poIdLiInterface, poId)
 		selectPoIdLi = append(selectPoIdLi, poId)
 	}
+
 	stepLi, err := stepDao.Select([]grmi.Predicate{meta.SerialOrderStepLst_SerialOrderId.NewPredicate(grmi.Equal, serialOrderId), meta.SerialOrderStepLst_PO.NewPredicate(grmi.Include, poIdLiInterface...)}, nil)
 	if err != nil {
 		return nil, grmi.NewBusinessError("查询工单工步数据失败, error:" + err.Error())
@@ -2623,7 +2627,7 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationTraceData(user *
 	selectPoIdLi := make([]string, 0, len(poIdLi))
 	for _, poId := range poIdLi {
 		_, exist := ignorePOMap[poId]
-		if !exist {
+		if exist {
 			continue
 		}
 		selectPoIdLi = append(selectPoIdLi, poId)
@@ -2646,7 +2650,7 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationTraceData(user *
 	var result model.TraceData
 	result.IsFirstPiece = serialOrder.IsFirstPieceToggle
 	result.TraceDataTraceData = make([]model.POOperationData, 0)
-	for _, poId := range poIdLi {
+	for _, poId := range selectPoIdLi {
 		opLi, err := opDao.GetOpRecvDataByPO(serialOrderId, poId)
 		if err != nil {
 			return nil, grmi.NewBusinessError("查询工艺操作数据失败, error:" + err.Error())