xml修改零件

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}

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 @@
     </select>
 
     <select id="listByPartCodeNew" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity">
-        select * from DS_PART_RELATION a inner join DS_PART b on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and b.SIN_TER_TYPE = #{indexNum}
+        select * from DS_PART_RELATION a inner join DS_PART_BASICS b on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and b.SIN_TER_TYPE = #{indexNum}
     </select>
 
     <select id="getByPartCodeAndSubCodeMes" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartSub">
-        select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a inner join DS_PART b
+        select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a inner join DS_PART_BASICS b
             on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
     </select>
 
@@ -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

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

@@ -486,9 +486,10 @@ public class InspectionTaskController extends BladeController {
         List<ReviewSheet> 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<WorkPlan>().lambda().eq(WorkPlan::getId, detail.getWpId()));
         List<ProduceMonitorSlotListVO> list = new ArrayList<>();
         if(null != workPlan){