|
|
|
|
@ -14,6 +14,7 @@ import lombok.EqualsAndHashCode; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.desk.produce.mapper.WorkOrderMapper; |
|
|
|
|
import org.springblade.desk.produce.pojo.entity.WorkOrder; |
|
|
|
|
import org.springblade.desk.produce.pojo.entity.WorkPlan; |
|
|
|
|
import org.springblade.desk.produce.service.IWorkOrderService; |
|
|
|
|
@ -59,14 +60,17 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes |
|
|
|
|
private String limsUrl; |
|
|
|
|
@Resource |
|
|
|
|
private IWorkPlanService workPlanService; |
|
|
|
|
// @Resource
|
|
|
|
|
// private IWorkOrderService workOrderService;
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
|
private IWorkOrderService workOrderService; |
|
|
|
|
private WorkOrderMapper workOrderMapper; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public JSONArray detailPage(PlanTest prPlanTest) { |
|
|
|
|
PlanTest test = baseMapper.selectById(prPlanTest.getId()); |
|
|
|
|
WorkPlan prWorkPlan = workPlanService.getById(test.getWpId()); |
|
|
|
|
WorkOrder prWorkOrder = workOrderService.getById(prWorkPlan.getWoId()); |
|
|
|
|
WorkOrder prWorkOrder = workOrderMapper.selectById(prWorkPlan.getWoId()); |
|
|
|
|
|
|
|
|
|
JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId()); |
|
|
|
|
if (obj != null) { |
|
|
|
|
|