|
|
|
|
@ -74,9 +74,6 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes |
|
|
|
|
@Resource |
|
|
|
|
private HttpRequestService httpRequestService; |
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private WorkOrderMapper prWorkOrderMapper; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public JSONArray detailPage(PlanTest prPlanTest) { |
|
|
|
|
PlanTest test = baseMapper.selectById(prPlanTest.getId()); |
|
|
|
|
@ -167,7 +164,7 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes |
|
|
|
|
@Override |
|
|
|
|
public JSONArray detail(PlanTest planTest) { |
|
|
|
|
// 查询woId
|
|
|
|
|
List<WorkOrder> prWorkOrderList = prWorkOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>() |
|
|
|
|
List<WorkOrder> prWorkOrderList = workOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>() |
|
|
|
|
.eq(WorkOrder::getWpId, planTest.getWpId())); |
|
|
|
|
if (prWorkOrderList == null || prWorkOrderList.isEmpty()){ |
|
|
|
|
return null; |
|
|
|
|
@ -186,7 +183,7 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes |
|
|
|
|
.isNull(PlanTest::getResult)); |
|
|
|
|
if (planTestList != null && !planTestList.isEmpty()) { |
|
|
|
|
for (PlanTest prPlanTest : planTestList) { |
|
|
|
|
List<WorkOrder> prWorkOrderList = prWorkOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>() |
|
|
|
|
List<WorkOrder> prWorkOrderList = workOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>() |
|
|
|
|
.eq(WorkOrder::getWpId, prPlanTest.getWpId())); |
|
|
|
|
JSONObject obj = httpRequestService.testRec(prWorkOrderList.get(0).getWoCode(), prPlanTest.getErpId(),prPlanTest.getDataId()); |
|
|
|
|
if (obj != null) { |
|
|
|
|
|