1.修改維修窗口大小

2.取消NG_COMPONENT的reply_userid,reply_date預設值
3.修改NG_INFO關聯STATION改用STATION_ID
4.取消NG_REPAIR的RMA_NO非必填

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);
             }
         }
 

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;
             }

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; }
 
         /// <summary>
         /// 回覆日期
@@ -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; }
 
         /// <summary>
         /// DATECODE

AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs

@@ -100,7 +100,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// RMA單號
         /// </summary>
-        [Required]
         [Column("RMA_NO")]
         [StringLength(20)]
         [DataMember]

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -90,7 +90,7 @@ namespace AMESCoreStudio.WebApi
 
             modelBuilder.Entity<NgInfo>().HasOne(r => r.Barcode).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired();
             modelBuilder.Entity<NgInfo>().HasOne(r => r.Wip).WithMany().HasForeignKey(r => r.WipId).IsRequired();
-            //modelBuilder.Entity<NgInfo>().HasOne(r => r.Station).WithMany().HasForeignKey(r => r.RuleStationId).IsRequired();
+            modelBuilder.Entity<NgInfo>().HasOne(r => r.Station).WithMany().HasForeignKey(r => r.StationId).IsRequired();
             //modelBuilder.Entity<NgInfo>().HasOne(r => r.User).WithMany().HasForeignKey(r => r.OperatorID).IsRequired();
         }
 

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=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHSYS;Password=ASYS666;",
-    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
+    "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": "*"