|
|
|
@ -69,13 +69,19 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public JSONArray detailPage(PlanTest prPlanTest) { |
|
|
|
public JSONArray detailPage(PlanTest prPlanTest) { |
|
|
|
PlanTest test = baseMapper.selectById(prPlanTest.getId()); |
|
|
|
PlanTest test = baseMapper.selectById(prPlanTest.getId()); |
|
|
|
WorkPlan prWorkPlan = workPlanService.getById(test.getWpId()); |
|
|
|
if(null != test){ |
|
|
|
WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId()); |
|
|
|
WorkPlan prWorkPlan = workPlanService.getById(test.getWpId()); |
|
|
|
|
|
|
|
if(null != prWorkPlan){ |
|
|
|
|
|
|
|
WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId()); |
|
|
|
|
|
|
|
if(null != prWorkOrder){ |
|
|
|
|
|
|
|
JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId()); |
|
|
|
|
|
|
|
if (obj != null) { |
|
|
|
|
|
|
|
JSONObject data = obj.getJSONObject("data"); |
|
|
|
|
|
|
|
return data.getJSONArray("nodeEndTime"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId()); |
|
|
|
} |
|
|
|
if (obj != null) { |
|
|
|
|
|
|
|
JSONObject data = obj.getJSONObject("data"); |
|
|
|
|
|
|
|
return data.getJSONArray("nodeEndTime"); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
|
|
|
|