From ce429f7d12b51bd750ea752f04548878b928976a Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Wed, 22 Apr 2026 14:35:34 +0800 Subject: [PATCH] =?UTF-8?q?1.SCR=E7=BB=84=E7=AB=8B=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8G=E5=9E=8B=E5=8A=A8=E9=9D=99=E7=9B=98=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E5=B2=97=E4=BD=8D=EF=BC=8C=E4=B8=80=E4=BD=93=E6=9C=BA?= =?UTF-8?q?=E4=B8=8A=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=8C=89?= =?UTF-8?q?=E9=94=AE=EF=BC=8C=E5=90=8D=E5=AD=97=E5=8F=AB=E5=8A=A8=E7=9B=98?= =?UTF-8?q?=E4=B8=8E=E6=94=AF=E6=9E=B6=E7=AD=89=E7=BA=A7=E5=8C=B9=E9=85=8D?= =?UTF-8?q?ok=EF=BC=8C=E8=BF=99=E4=B8=AA=E8=A6=81=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=88=B0=E6=9C=BA=E7=A7=8D=E7=99=BB=E5=BD=95=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=9C=BA=E7=A7=8D=E4=BC=9A=E8=A6=81=E8=BF=99=E4=B8=AA=E6=8C=89?= =?UTF-8?q?=E9=94=AE=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=B7=A5=E4=BB=B6=E9=83=BD?= =?UTF-8?q?=E8=A6=81=E7=82=B9=E8=BF=99=E4=B8=AA=E6=8C=89=E9=94=AE=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=B3=E8=81=94=E5=88=B0=E7=BB=99=E6=88=91?= =?UTF-8?q?PLC=E7=9A=84=E6=94=BE=E8=A1=8C=E4=BF=A1=E5=8F=B7=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=202.SCR=E7=BB=84=E7=AB=8B=E6=9C=8D=E5=8A=A1=E5=99=A8G?= =?UTF-8?q?=E5=9E=8B=E7=AD=92=E4=BD=93=E7=83=A7=E5=B5=8C=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B2=BB=E5=85=B7=E5=8F=B7=EF=BC=8C13=E4=BD=8D=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GroupLine.App/ModelDto/GCylinderBurnEbDto.cs | 9 +++++++++ .../ReportFile/GCylinderBurnEbTemplate.xlsx | Bin 9927 -> 9837 bytes .../GCylinderBurnEb/GCylinderBurnEbView.xaml | 5 +++++ .../ViewModel/GCylinderBurnEbViewModel.cs | 9 +++++---- .../ViewModel/GDynStaticMachViewModel.cs | 4 ++-- GroupLine.Model/GCylinderBurnEb.cs | 5 +++++ 6 files changed, 26 insertions(+), 6 deletions(-) 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 939c0c9dc81845409781c305d7d3afbc96da9703..6ea384db75dca16c88eb01b193175d44807a8732 100644 GIT binary patch delta 2163 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 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; } /// /// 员工编号 ///