转试记录详情

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java

@@ -60,7 +60,7 @@ public class PlanTestController extends BladeController {
 	/**
 	 * [转试记录] 详情
 	 */
-	@GetMapping("/detail")
+	@GetMapping("/detailPage")
 	@ApiOperationSupport(order = 10)
 	@Operation(summary = "详情", description  = "传入PlanTest Obj")
 	public R<PlanTestVO> detail(PlanTest planTest) {
@@ -71,6 +71,14 @@ public class PlanTestController extends BladeController {
 		return R.data(detailVO);
 	}
 
+
+	@GetMapping(value = "/detail")
+	public R detailPage(PlanTest planTest) {
+		return R.data(service.detailPage(planTest));
+	}
+
+
+
 //	@PostMapping(value = "/detailPage")
 //	public R detailPage(@RequestBody JSONObject data) {
 //		PrPlanTest prPlanTest = data.getObject("prPlanTest", PrPlanTest.class);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
@@ -19,6 +20,12 @@ import java.util.List;
  * @since 2025-12-24
  */
 public interface IPlanTestService extends BaseService<PlanTest> {
+
+
+
+	JSONArray detailPage(PlanTest prPlanTest);
+
+
 	/**
 	 * 自定义分页
 	 *

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java

@@ -3,6 +3,8 @@
  */
 package org.springblade.desk.quality.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
@@ -12,6 +14,10 @@ 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.pojo.entity.WorkOrder;
+import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.service.IWorkOrderService;
+import org.springblade.desk.produce.service.IWorkPlanService;
 import org.springblade.desk.quality.excel.PlanTestExcel;
 import org.springblade.desk.quality.mapper.PlanTestMapper;
 import org.springblade.desk.quality.pojo.entity.PlanTest;
@@ -20,7 +26,13 @@ import org.springblade.desk.quality.service.IPlanTestService;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
@@ -32,8 +44,8 @@ import java.util.List;
  */
 @Service
 @Data
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+//@AllArgsConstructor
+//@EqualsAndHashCode(callSuper = true)
 @Slf4j
 public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTest> implements IPlanTestService {
 
@@ -41,6 +53,52 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes
     private IUserClient userClient;
     @Resource
     private IDictClient dictClient;
+    @Resource
+    private RestTemplate httpClientTemplate;
+    @Value("${request.lims.url}")
+    private String limsUrl;
+    @Resource
+    private IWorkPlanService workPlanService;
+    @Resource
+    private IWorkOrderService workOrderService;
+
+    @Override
+    public JSONArray detailPage(PlanTest prPlanTest) {
+        PlanTest test = baseMapper.selectById(prPlanTest.getId());
+        WorkPlan prWorkPlan = workPlanService.getById(test.getWpId());
+        WorkOrder prWorkOrder = workOrderService.getById(prWorkPlan.getWoId());
+
+        JSONObject obj = testRec(prWorkOrder.getWoCode(), test.getErpId(),test.getDataId());
+        if (obj != null) {
+            JSONObject data = obj.getJSONObject("data");
+            return data.getJSONArray("nodeEndTime");
+        }
+        return null;
+    }
+
+    public JSONObject testRec(String woCode, String erpId, String str1) {
+        // 头信息
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        JSONObject object = new JSONObject();
+        object.put("workOrderCode", woCode);
+        object.put("id", str1);
+//        object.put("id", erpId);
+        HttpEntity<JSONObject> entity = new HttpEntity<>(object, headers);
+        ResponseEntity<JSONObject> responseEntity = null;
+        try {
+            responseEntity = httpClientTemplate.postForEntity(limsUrl + "/api/cloud-customized/zhonghanggd/zhgdMesLxDatasources/mesGetLxList", entity, JSONObject.class);
+            JSONObject result = responseEntity.getBody();
+            if (result != null && result.getBoolean("success")) {
+                return result.getJSONObject("data");
+            } else {
+                log.error("转试计划详情接口调用失败!" + result.getString("msg"));
+            }
+        } catch (Exception e) {
+            log.error("转试计划详情接口调用失败!" + e.getMessage());
+        }
+        return null;
+    }
 
     @Override
     public IPage<PlanTestVO> selectPlanTestPage(IPage<PlanTestVO> page, PlanTestVO planTest) {

blade-service/blade-desk/src/main/resources/application-dev.yml

@@ -49,6 +49,7 @@ role-config:
 request:
   newErp:
     url: "http://192.168.119.68:10113"
+
   #用水用电接口请求地址(iot)
   iot:
     #热表分厂组织id(部门id)