|
|
@ -2399,7 +2399,7 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationData(user *globa |
|
|
|
} |
|
|
|
workPlaceMap[relateDate.WorkPlace.WorkPlaceNr] = relateDate.WorkPlace.WorkPlaceId |
|
|
|
} |
|
|
|
stepDao := dal.NewSerialOrderStepLstDAO(session, user.PlantNr, user.UserId) |
|
|
|
//stepDao := dal.NewSerialOrderStepLstDAO(session, user.PlantNr, user.UserId)
|
|
|
|
poIdLiInterface := make([]interface{}, 0, len(displayPoLi)) |
|
|
|
selectPoIdLi := make([]string, 0, len(displayPoLi)) |
|
|
|
for _, poId := range displayPoLi { |
|
|
@ -2411,19 +2411,19 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationData(user *globa |
|
|
|
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()) |
|
|
|
} |
|
|
|
//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())
|
|
|
|
//}
|
|
|
|
var result model.TraceData |
|
|
|
result.Status = true |
|
|
|
result.BarCode = serialOrderId |
|
|
|
result.Desc = article.Descr1 |
|
|
|
for _, step := range stepLi { |
|
|
|
if step.Status != baseModel.WO_STATUS_FINISHED { |
|
|
|
result.Status = false |
|
|
|
} |
|
|
|
} |
|
|
|
//for _, step := range stepLi {
|
|
|
|
// if step.Status != baseModel.WO_STATUS_FINISHED {
|
|
|
|
// result.Status = false
|
|
|
|
// }
|
|
|
|
//}
|
|
|
|
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()) |
|
|
@ -2434,6 +2434,7 @@ func (impl *SerialOrderServiceImplement) GetSerialOrderOperationData(user *globa |
|
|
|
poStatusMap[poData.PO] = "成功" |
|
|
|
} else { |
|
|
|
poStatusMap[poData.PO] = "失败" |
|
|
|
result.Status = false |
|
|
|
} |
|
|
|
} |
|
|
|
articleAtocdDao := baseDal.NewArticleAtcodLstDAO(session, user.PlantNr, user.UserId) |
|
|
|