diff --git a/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-105235.xlsx b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-105235.xlsx
new file mode 100644
index 00000000..25903bb6
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2025年51周1日计划-12-20-105235.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251220105308工作簿1.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251220105308工作簿1.xlsx
new file mode 100644
index 00000000..7c07ae28
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251220105308工作簿1.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251220105516工作簿1.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251220105516工作簿1.xlsx
new file mode 100644
index 00000000..05fdf85a
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251220105516工作簿1.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251220105604工作簿1.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251220105604工作簿1.xlsx
new file mode 100644
index 00000000..05fdf85a
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251220105604工作簿1.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251220105705工作簿1.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251220105705工作簿1.xlsx
new file mode 100644
index 00000000..05fdf85a
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251220105705工作簿1.xlsx differ
diff --git a/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs b/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs
index eefe3ff9..2b1f4050 100644
--- a/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs
+++ b/ZR.Model/MES/andon/Dto/AndonAlarmTypeDictDto.cs
@@ -45,5 +45,6 @@ namespace ZR.Model.MES.andon.Dto
{
public string label { get; set; }
public string value { get; set; }
+ public int ResponseTime { get; set; }
}
}
\ No newline at end of file
diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs
index c0d45ba5..e4d334a9 100644
--- a/ZR.Model/MES/pro/ProWorkorder_v2.cs
+++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs
@@ -82,14 +82,14 @@ namespace ZR.Model.MES.pro
/// 预计合格数
///
[SugarColumn(ColumnName = "pqualifiednum")]
- [ExcelColumn(Name = "预计合格数", IndexName = "J")]
+ [ExcelColumn(Name = "预计合格数", IndexName = "K")]
public int PQualifiedNum { get; set; }
///
/// 预计合格率
///
[SugarColumn(ColumnName = "pqualifiedRate")]
- [ExcelColumn(Name = "预计合格率", IndexName = "K")]
+ [ExcelColumn(Name = "预计合格率", IndexName = "J")]
public decimal PQualifiedRate { get; set; }
///
diff --git a/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs b/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs
index 69313b72..67fbd021 100644
--- a/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs
+++ b/ZR.Service/mes/andon/AndonAlarmTypeDictService.cs
@@ -86,7 +86,8 @@ namespace ZR.Service.mes.andon
.Select(it => new AlarmTypePullDownDto
{
label = it.TypeCode,
- value = it.TypeName
+ value = it.TypeName,
+ ResponseTime = it.ResponseTime
}).ToList();
return ApiResult.Success("成功", response);
}