diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java index aec14320..c55f6036 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java @@ -22,7 +22,7 @@ import java.util.List; ) public interface IErpMesRbWoClient { - String API_PREFIX = "/feign/erpdata/mesrbwo"; + String API_PREFIX = "/feign/client/mesrbwo"; String GET_LIST = API_PREFIX + "/getList"; String GET_WO = API_PREFIX + "/getWoOne"; String SYN_MES_WO = API_PREFIX + "/synMesRbWo"; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 0a0b798d..dd23ea5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -71,6 +71,12 @@ public class PlanTestController extends BladeController { return R.data(detailVO); } +// @PostMapping(value = "/detailPage") +// public R detailPage(@RequestBody JSONObject data) { +// PrPlanTest prPlanTest = data.getObject("prPlanTest", PrPlanTest.class); +// return R.ok(prPlanTestService.detailPage(prPlanTest)); +// } + /** * [转试记录] list分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 7ed0fc2f..9d86d723 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -263,6 +263,7 @@ wo.WO_CODE AS woCode, wo.PART_CODE AS partCode, wp.Id as wpId, + wo.Id as woId, wo.CARD_NO AS cardNo FROM MES_WORK_ORDER wo -- 车间作业计划 wp