diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
index 96c5ca4b..c778576b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml
@@ -49,7 +49,7 @@
INNER JOIN MES_work_plan b ON a.WP_ID = b.ID
INNER JOIN MES_WORK_ORDER c ON b.WO_ID = c.ID
INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID
- INNER JOIN ds_part f ON d.part_code = f.part_code
+ INNER JOIN DS_PART_BASICS f ON d.part_code = f.part_code
WHERE
a.MTN_CODE IN ( SELECT a.MTN_CODE FROM MES_MAC_TOOL_USE a LEFT JOIN MES_EQUIPMENT b ON a.EQUIPMENT_CARD =
b.ID WHERE a.WP_ID = #{id}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index e0651ff2..a25ac852 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -81,7 +81,7 @@
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
- inner join DS_PART f on d.PART_CODE = f.PART_CODE
+ inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -106,7 +106,7 @@
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
- inner join DS_PART f on d.PART_CODE = f.PART_CODE
+ inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
where a.MTN_CODE in (
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -144,11 +144,11 @@
@@ -207,7 +207,7 @@
inner join MES_WORK_PLAN b on a.WP_ID = b.ID
inner join MES_WORK_ORDER c on b.WO_ID = c.ID
inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
- inner join ds_part f on d.part_code = f.part_code
+ inner join DS_PART_BASICS f on d.part_code = f.part_code
where a.MTN_CODE in(
select a.MTN_CODE from MES_MAC_TOOL_USE a
left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
index 606683e2..d875da1f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
@@ -486,9 +486,10 @@ public class InspectionTaskController extends BladeController {
List listSheet = rsSubService.list(qw);
- InspectionTask inspectionTask = new InspectionTask();
- inspectionTask.setId(id);
- InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
+// InspectionTask inspectionTask = new InspectionTask();
+// inspectionTask.setId(id);
+// InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
+ InspectionTask detail = service.getById( id);
WorkPlan workPlan = workPlanService.getOne(new QueryWrapper().lambda().eq(WorkPlan::getId, detail.getWpId()));
List list = new ArrayList<>();
if(null != workPlan){