|
|
@ -2653,6 +2653,12 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationTraceData(user * |
|
|
|
selectPoIdLi = append(selectPoIdLi, poId) |
|
|
|
poIdLiInterface = append(poIdLiInterface, poId) |
|
|
|
} |
|
|
|
var result model.TraceData |
|
|
|
result.BarCode = serialOrderId |
|
|
|
result.Desc = article.Descr1 |
|
|
|
result.Status = true |
|
|
|
result.IsFirstPiece = serialOrder.IsFirstPieceToggle |
|
|
|
result.TraceDataTraceData = make([]model.POOperationData, 0) |
|
|
|
poDataLi, err := serialOrderPoDao.Select([]grmi.Predicate{meta.SerialOrderPOLst_SerialOrderId.NewPredicate(grmi.Equal, serialOrderId), meta.SerialOrderPOLst_PO.NewPredicate(grmi.Include, poIdLiInterface...)}, nil) |
|
|
|
if err != nil { |
|
|
|
return nil, grmi.NewBusinessError("查询工单工序操作数据失败, error:" + err.Error()) |
|
|
@ -2663,15 +2669,12 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationTraceData(user * |
|
|
|
poStatusMap[poData.PO] = "成功" |
|
|
|
} else { |
|
|
|
poStatusMap[poData.PO] = "失败" |
|
|
|
result.Status = false |
|
|
|
} |
|
|
|
} |
|
|
|
// 通过工序和工单ID查询工步操作结果
|
|
|
|
opDao := dal.NewSerialOrderOPDetailRecvDataLstDAO(session, user.PlantNr, user.UserId) |
|
|
|
var result model.TraceData |
|
|
|
result.BarCode = serialOrderId |
|
|
|
result.Desc = article.Descr1 |
|
|
|
result.IsFirstPiece = serialOrder.IsFirstPieceToggle |
|
|
|
result.TraceDataTraceData = make([]model.POOperationData, 0) |
|
|
|
|
|
|
|
for _, poId := range selectPoIdLi { |
|
|
|
opLi, err := opDao.GetOpRecvDataByPO(serialOrderId, poId) |
|
|
|
if err != nil { |
|
|
|