过程记录模版修改

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

@@ -228,9 +228,14 @@
         select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER  b on a.yo_id = b.id and a.yo_id = #{yoId}
     </select>
 
+<!--    <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">-->
+<!--        select * from MES_RB_FILE_PRESERVE_DETAIL a inner  join MES_RB_FILE_PRESERVE_SLOT  b-->
+<!--            on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0-->
+<!--    </select>-->
+
+
     <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">
-        select * from MES_RB_FILE_PRESERVE_DETAIL a inner  join MES_RB_FILE_PRESERVE_SLOT  b
+        select * from MES_RB_FILE_PRESERVE_DETAIL a where a.rfps_id = #{id} and a.IS_DELETED = 0
-            on a.rfps_id = b.id and a.rfps_id = #{id} and a.IS_DELETED = 0
     </select>
 
     <select id="listByWoIdAllMes" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">

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

@@ -332,8 +332,9 @@ public class InspectionTaskController extends BladeController {
         Integer insertIndex = 0;
         if (preserveSlotList.size() > 0) {
             List<MesRbFilePreserveDetailEntity> childrenList;
-            List<MesRbFilePreserveDetailDTO> childrenListNew = new ArrayList<>();
+
             for (MesRbFilePreserveSlotEntity dsRbFilePreserveSlot : preserveSlotList) {
+                List<MesRbFilePreserveDetailDTO> childrenListNew = new ArrayList<>();
                 if(null != dsRbFilePreserveSlot.getInsertIndex()){
                     if(Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex()) > insertIndex){
                         insertIndex = Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex());