From 84eb1d685dac3a3e1b3072876b5c4ba86a7947ff Mon Sep 17 00:00:00 2001 From: Marvin Date: Sat, 15 Jan 2022 12:00:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B6=AD=E4=BF=AE=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=A4=A7=E5=B0=8F=202.=E5=8F=96=E6=B6=88NG=5FCOMPONEN?= =?UTF-8?q?T=E7=9A=84reply=5Fuserid,reply=5Fdate=E9=A0=90=E8=A8=AD?= =?UTF-8?q?=E5=80=BC=203.=E4=BF=AE=E6=94=B9NG=5FINFO=E9=97=9C=E8=81=AFSTAT?= =?UTF-8?q?ION=E6=94=B9=E7=94=A8STATION=5FID=204.=E5=8F=96=E6=B6=88NG=5FRE?= =?UTF-8?q?PAIR=E7=9A=84RMA=5FNO=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/REP/REP001V.cshtml | 2 +- AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs | 6 +++--- AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs | 4 ++-- AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs | 1 - AMESCoreStudio.WebApi/Models/AMESContext.cs | 2 +- AMESCoreStudio.WebApi/appsettings.json | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/AMESCoreStudio.Web/Views/REP/REP001V.cshtml b/AMESCoreStudio.Web/Views/REP/REP001V.cshtml index ac4e562b..cb99a2cd 100644 --- a/AMESCoreStudio.Web/Views/REP/REP001V.cshtml +++ b/AMESCoreStudio.Web/Views/REP/REP001V.cshtml @@ -148,7 +148,7 @@ //通过行tool编辑，lay-event="edit" function repair(obj) { if (obj.data.componentID) { - hg.open('維修輸入', '/REP/REP001R/' + obj.data.componentID, 1280, 720); + hg.open('維修輸入', '/REP/REP001R/' + obj.data.componentID, 1080, 640); } } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs index fc5cf426..ed2d2fba 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs @@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { data.Barcode = _context.BarcodeInfoes.Find(data.BarcodeID); data.Wip = _context.WipInfos.Find(data.WipId); - //data.Station = _context.Stationses.Find(data.RuleStationId); + data.Station = _context.Stationses.Find(data.StationId); //data.User = _context.UserInfoes.Find(data.OperatorID); //data.OperatorName = _context.UserInfoes.Find(data.OperatorID).UserName; } @@ -72,7 +72,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { data.Barcode = _context.BarcodeInfoes.Find(data.BarcodeID); data.Wip = _context.WipInfos.Find(data.WipId); - //data.Station = _context.Stationses.Find(data.RuleStationId); + data.Station = _context.Stationses.Find(data.StationId); //data.User = _context.UserInfoes.Find(data.OperatorID); //data.OperatorName = _context.UserInfoes.Find(data.OperatorID).UserName; } @@ -116,7 +116,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { data.Barcode = _context.BarcodeInfoes.Find(data.BarcodeID); data.Wip = _context.WipInfos.Find(data.WipId); - //data.Station = _context.Stationses.Find(data.RuleStationId); + data.Station = _context.Stationses.Find(data.StationId); //data.User = _context.UserInfoes.Find(data.OperatorID); //data.OperatorName = _context.UserInfoes.Find(data.OperatorID).UserName; } diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs b/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs index 8f16422e..1ad7e5af 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/NgComponent.cs @@ -204,7 +204,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("REPLY_USERID")] [DataMember] [Display(Name = "回覆人員ID")] - public int ReplyUserID { get; set; } = 0; + public int ReplyUserID { get; set; } /// /// 回覆日期 @@ -212,7 +212,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("REPLY_DATE")] [DataMember] [Display(Name = "回覆日期")] - public DateTime ReplyDate { get; set; } = System.DateTime.Now; + public DateTime ReplyDate { get; set; } /// /// DATECODE diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs index 77e7e8b7..072aef84 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs @@ -100,7 +100,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// RMA單號 /// - [Required] [Column("RMA_NO")] [StringLength(20)] [DataMember] diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index d6fa5a47..898dd096 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -90,7 +90,7 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasOne(r => r.Barcode).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired(); modelBuilder.Entity().HasOne(r => r.Wip).WithMany().HasForeignKey(r => r.WipId).IsRequired(); - //modelBuilder.Entity().HasOne(r => r.Station).WithMany().HasForeignKey(r => r.RuleStationId).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Station).WithMany().HasForeignKey(r => r.StationId).IsRequired(); //modelBuilder.Entity().HasOne(r => r.User).WithMany().HasForeignKey(r => r.OperatorID).IsRequired(); } diff --git a/AMESCoreStudio.WebApi/appsettings.json b/AMESCoreStudio.WebApi/appsettings.json index 413c8ca6..08513781 100644 --- a/AMESCoreStudio.WebApi/appsettings.json +++ b/AMESCoreStudio.WebApi/appsettings.json @@ -7,8 +7,8 @@ } }, "ConnectionStrings": { - "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHSYS;Password=12345;", - "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;" + "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHSYS;Password=ASYS666;", + "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;" //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;" }, "AllowedHosts": "*"