diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
index d4e9c0e..e5e9583 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
@@ -541,19 +541,35 @@ public class ScheduledTask extends BaseService {
                         //报警状态为true
                         if (resultBoolean){
                             //任务状态为执行中且正在炉子中加工的任务
-                            CurrTask currTask = currTaskServiceBiz.getOne(new QueryWrapper<CurrTask>()
+                            List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>()
                                     .eq(CurrTask.KILN_ID, kilnInfo.getId())
                                     .eq(CurrTask.IS_IN, 1)
                                     .eq(CurrTask.STATUS, 1));
-                            AlarmInfo alarmInfo=new AlarmInfo();
-                            alarmInfo.setEquipmentId(currTask.getKilnId());
-                            alarmInfo.setEquipmentName(currTask.getKilnName());
-                            alarmInfo.setType(0);
-                            alarmInfo.setAlarmCode(CodeGeneratorHelper.getAlarmCode());
-                            alarmInfo.setAlarmInfo(plcNameSpace.getEqName()+"："+plcNameSpace.getNote());
-                            alarmInfo.setTaskCode(currTask.getTaskCode());
-                            alarmInfo.setCreateTime(LocalDateTime.now());
-                            alarmInfoServiceBiz.save(alarmInfo);
+                            if (currTaskList.size()!=0){
+                                for (CurrTask currTask:currTaskList
+                                     ) {
+                                    AlarmInfo alarmInfo=new AlarmInfo();
+                                    alarmInfo.setEquipmentId(currTask.getKilnId());
+                                    alarmInfo.setEquipmentName(currTask.getKilnName());
+                                    alarmInfo.setType(0);
+                                    alarmInfo.setAlarmCode(CodeGeneratorHelper.getAlarmCode());
+                                    alarmInfo.setAlarmInfo(plcNameSpace.getEqName()+"："+plcNameSpace.getNote());
+                                    alarmInfo.setTaskCode(currTask.getTaskCode());
+                                    alarmInfo.setCreateTime(LocalDateTime.now());
+                                    alarmInfoServiceBiz.save(alarmInfo);
+                                }
+                            }
+                            else {
+                                AlarmInfo alarmInfo=new AlarmInfo();
+                                alarmInfo.setEquipmentId(kilnInfo.getId());
+                                alarmInfo.setEquipmentName(kilnInfo.getKilnName());
+                                alarmInfo.setType(0);
+                                alarmInfo.setAlarmCode(CodeGeneratorHelper.getAlarmCode());
+                                alarmInfo.setAlarmInfo(plcNameSpace.getEqName()+"："+plcNameSpace.getNote());
+                                alarmInfo.setTaskCode("0");
+                                alarmInfo.setCreateTime(LocalDateTime.now());
+                                alarmInfoServiceBiz.save(alarmInfo);
+                            }
                         }
                     } catch (IOException e) {
                         e.printStackTrace();