热表打印

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -269,9 +269,11 @@
     </select>
 
     <select id="getDataByWpIdAndIndex" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
+        select * from (
         select a.* from MES_MAC_TOOL_USE a
                             inner join MES_WORK_PLAN wp on a.WP_ID = wp.ID
-        where wp.Id=#{wpId} and a.mtu_index=#{numberIndex} order by a.Id desc
+        where wp.Id=#{wpId} and a.mtu_index=#{numberIndex} order by a.create_time desc
+                      ) where rownum = 1
     </select>
 
     <select id="getHangNumIsNull" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
@@ -287,7 +289,7 @@
     <!--    </select>-->
 
     <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.quality.pojo.entity.ProReTemplate">
-        select from QA_PRO_RE_TEMPLATE a where 1=1
+        select * from QA_PRO_RE_TEMPLATE a where 1=1
         <if test="wcId != null">
             and a.WC_ID = #{wcId}
         </if>

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

@@ -747,6 +747,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 modelTwo.put("procedureSet", procedureSet);
                 modelTwo.put("slotList", slotList);
                 modelTwo.put("tankInfo", tankInfo);
+                List<MesRbFilePreserveSlotEntity> dsRbFilePreserveSlotList = new ArrayList<>();
                 if (WorkPlan.PRINT_TYPE_PROCESS.equals(prWorkPlan.getPrintType())) {
                     // 同槽信息（从设备，工装使用记录获取）
                     List<ProduceMonitorSlotListVO> slotVOList = null;
@@ -772,9 +773,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                             slotList.add(slotJson);
                         }
                     }
-                    List<MesRbFilePreserveSlotEntity> dsRbFilePreserveSlotList = buildDsRbFilePreserveSlotList(prWorkPlan);
-                    modelTwo.put("dsRbFilePreserveSlotList", dsRbFilePreserveSlotList);
+                    dsRbFilePreserveSlotList = buildDsRbFilePreserveSlotList(prWorkPlan);
                 }
+                modelTwo.put("dsRbFilePreserveSlotList", dsRbFilePreserveSlotList);
                 // 设备编号信息（从设备，工装使用记录获取）
                 List<MacToolUse> mtuList = workPlanMapper.listMacToolUse(prWorkPlan.getId(), Boolean.FALSE);
                 if (CollectionUtils.isNotEmpty(mtuList)) {