diff --git a/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs b/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
index 150fd21..ccfb98f 100644
--- a/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
+++ b/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
@@ -45,6 +45,15 @@ private string _ATrayNo;
get { return _ATrayNo; }
set { _ATrayNo = value; RaisePropertyChanged(() => ATrayNo); }
}
+private string _FixtureNo;
+ ///
+ /// 治具号
+ ///
+ public string FixtureNo
+ {
+ get { return _FixtureNo; }
+ set { _FixtureNo = value; RaisePropertyChanged(() => FixtureNo); }
+ }
private string _OpNo;
///
/// 员工编号
diff --git a/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx b/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx
index 939c0c9..6ea384d 100644
Binary files a/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx and b/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx differ
diff --git a/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
index 7e0f9bd..efbd7ae 100644
--- a/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
+++ b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
@@ -132,6 +132,11 @@
Binding="{Binding ATrayNo}"
Header="A托盘号" />
+
+
();
- SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
- SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+ SearchStartDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ SearchEndDate = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
MachineName = CurrentMachineName + " - 搜索条件";
diff --git a/GroupLine.Model/GCylinderBurnEb.cs b/GroupLine.Model/GCylinderBurnEb.cs
index fb8e098..28b23bf 100644
--- a/GroupLine.Model/GCylinderBurnEb.cs
+++ b/GroupLine.Model/GCylinderBurnEb.cs
@@ -33,6 +33,11 @@ namespace GroupLine.Model
///
[Column(DbType = "nvarchar(10)")]
public string ATrayNo { get; set; }
+///
+ /// 治具号
+ ///
+ [Column(DbType = "nvarchar(20)")]
+ public string FixtureNo { get; set; }
///
/// 员工编号
///