1. 修正DB欄位名稱及型態

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -154,9 +154,9 @@ namespace AMESCoreStudio.Web.Controllers
 
             // 判斷預設值是否更改過，如果有就判斷必填欄位
             if (model.BiRatio != 0 ||
-                model.BiosVer != 0 ||
                 model.PartsBakeTime != 0 ||
                 model.PcbBake != 0 ||
+                 !string.IsNullOrWhiteSpace(model.BiosVer) ||
                 !string.IsNullOrWhiteSpace(model.BiTemperature) ||
                 !string.IsNullOrWhiteSpace(model.BiTime) ||
                 !string.IsNullOrWhiteSpace(model.Checksum) ||
@@ -1201,7 +1201,7 @@ namespace AMESCoreStudio.Web.Controllers
                     items.Add(new SelectListItem()
                     {
                         Text = result[i].StationDesc,
-                        Value = result[i].RuleStationID.ToString(),
+                        Value = result[i].StationID.ToString(),
                         Group = group
                     });
                 }
@@ -1931,11 +1931,11 @@ namespace AMESCoreStudio.Web.Controllers
             var result_wipNo = await _pcsApi.GetWipInfoByWipNO(model.wipInfo.WipNO);
             foreach (var item in result_wipNo)
             {
-                foreach (var Outfits in model.WipOutfits.Where(w => w.RuleStationID != null && w.UnitNo == item.UnitNO))
+                foreach (var Outfits in model.WipOutfits.Where(w => w.StationID != null && w.UnitNo == item.UnitNO))
                 {
                     var RuleStation = await _pcsApi.GetRuleStationByFlow(item.FlowRuleID);
 
-                    if (!RuleStation.Where(w => Outfits.RuleStationID == w.RuleStationID).Any())
+                    if (!RuleStation.Where(w => Outfits.StationID == w.StationID).Any())
                     {
                         ModelState.AddModelError("error", "治具組合中生產單位與作業站不匹配");
                         return View("PCS003", model);
@@ -2285,9 +2285,15 @@ namespace AMESCoreStudio.Web.Controllers
             int WipQty = model.WipInfo.PlanQTY;
             string InputStartNo = model.WipBarcode.StartNO.Trim();
             string InputEndNo = model.WipBarcode.EndNO.Trim();
+
+            if (model.WipBarcodes == null)
+            {
+                model.WipBarcodes = new List<WipBarcode>();
+            }
+
             if (InputStartNo.Length <= NoLength || InputEndNo.Length <= NoLength)
             {
-                _msg += "條碼區間號碼長度不能小於" + NoLength + 1;
+                _msg += "條碼區間號碼長度不能小於" + (NoLength + 1);
                 ModelState.AddModelError("error", _msg);
                 return View(model);
             }
@@ -3475,7 +3481,7 @@ namespace AMESCoreStudio.Web.Controllers
                 {
 
                     model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
-                    model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.RuleStationID == model.RuleStation).OrderBy(o => o.StationsItemSeq).ToList();
+                    model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.StationID == model.Station).OrderBy(o => o.StationsItemSeq).ToList();
                     if (model.MaterialStationsItems.Count() == 0)
                     {
                         //ModelState.AddModelError("error", "找不到該站別作業工項");
@@ -3483,8 +3489,8 @@ namespace AMESCoreStudio.Web.Controllers
 
                     // 治具
                     var q1 = await _pcsApi.GetWipOutfitByWipNo(model.WipNO);
-                    q1 = q1.Where(w => (w.UnitNo == model.UnitNO && w.RuleStationID == null) ||
+                    q1 = q1.Where(w => (w.UnitNo == model.UnitNO && w.StationID == null) ||
-                                       (w.UnitNo == model.UnitNO && w.RuleStationID == model.RuleStation)).ToList();
+                                       (w.UnitNo == model.UnitNO && w.StationID == model.Station)).ToList();
                     model.wipOutfits.Clear();
                     foreach (var item in q1)
                     {

AMESCoreStudio.Web/Views/BAS/BAS017C.cshtml

@@ -35,11 +35,11 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
+                <label asp-for="StationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" class="custom-select col-sm-9">
+                <select id="RuleStationID" asp-for="StationID" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
-                <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="StationsItemNo" class="control-label col-sm-3"></label>

AMESCoreStudio.Web/Views/BAS/BAS017U.cshtml

@@ -34,11 +34,11 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
+                <label asp-for="StationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9"> 
+                <select id="RuleStationID" asp-for="StationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9"> 
                     <option value="">請選擇</option>
                 </select>
-                <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="StationsItemNo" class="control-label col-sm-3"></label>

AMESCoreStudio.Web/Views/BAS/BAS018C.cshtml

@@ -47,11 +47,11 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
+                <label asp-for="StationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" class="custom-select col-sm-9">
+                <select id="RuleStationID" asp-for="StationID" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
-                <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
             <div class="form-group">

AMESCoreStudio.Web/Views/BAS/BAS018U.cshtml

@@ -46,11 +46,11 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
-                <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
+                <label asp-for="StationID" class="control-label col-sm-3"></label>
-                <select id="RuleStationID" asp-for="RuleStationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9">
+                <select id="RuleStationID" asp-for="StationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9">
                     <option value="">請選擇</option>
                 </select>
-                <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
+                <span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
             <div class="form-group">

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -925,7 +925,7 @@
                                         </td>
 
                                         <td>
-                                            <select asp-for="@index.RuleStationID" name="WipOutfits[@l].RuleStationID" asp-items="@ViewBag.RuleStationByWipNoUnitNoList" class=""></select>
+                                            <select asp-for="@index.StationID" name="WipOutfits[@l].StationID" asp-items="@ViewBag.RuleStationByWipNoUnitNoList" class=""></select>
                                         </td>
                                         <td>
                                             <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a>

AMESCoreStudio.WebApi/Controllers/AMES/WipOutfitController.cs

@@ -57,7 +57,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             var q = from q1 in _context.WipOutfits.Where(w => w.WipNo.Contains(id))
                     join q2 in _context.FactoryUnits on q1.UnitNo equals q2.UnitNo
-                    join q3 in _context.RuleStations on q1.RuleStationID equals q3.RuleStationID
+                    join q3 in _context.Stationses on q1.StationID equals q3.StationID
                     into cp
                     from q3 in cp.DefaultIfEmpty()
                     join q4 in _context.OutfitCommodityInfoes on q1.PartNo equals q4.CommodityNo
@@ -71,8 +71,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         PartNoName = q4.CommodityName,
                         UnitNo = q1.UnitNo,
                         UnitNoName = q2.UnitName,
-                        RuleStationID = q1.RuleStationID,
+                        StationID = q1.StationID,
-                        StationName = q3.StationDesc ?? ""
+                        StationName = q3.StationName ?? ""
                     };
 
             return await q.ToListAsync();

AMESCoreStudio.WebApi/DTO/AMES/WipOutfitDto.cs

@@ -61,7 +61,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// 作業站ID
         /// </summary>
 
-        public int? RuleStationID { get; set; }
+        public int? StationID { get; set; }
 
         /// <summary>
         /// 作業站名稱

AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs

@@ -72,11 +72,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 站別
         /// </summary>
-        [Column("RULE_STATION_ID")]
+        [Column("STATION_ID")]
         [Display(Name = "站別")]
         [DataMember]
         [Required]
-        public int RuleStationID { get; set; }
+        public int StationID { get; set; }
 
         /// <summary>
         /// 建立UserID
@@ -125,7 +125,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 製程單位主檔
         /// </summary>
-        [ForeignKey("RuleStationID")]
+        [ForeignKey("StationID")]
         public virtual AMESCoreStudio.WebApi.Models.BAS.Stations RStation { get; set; }
 
         /// <summary>

AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs

@@ -44,11 +44,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 站別
         /// </summary>
-        [Column("RULE_STATION_ID")]
+        [Column("STATION_ID")]
         [DataMember]
         [Required]
         [Display(Name = "站別")]
-        public int RuleStationID { get; set; }
+        public int StationID { get; set; }
 
         /// <summary>
         /// 站(前段)
@@ -137,7 +137,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 製程單位主檔
         /// </summary>
-        [ForeignKey("RuleStationID")]
+        [ForeignKey("StationID")]
         public virtual AMESCoreStudio.WebApi.Models.BAS.Stations RStation { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs

@@ -276,10 +276,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// BIOS版本
         /// </summary>
-        [Column("BIOS_VER", TypeName = "NUMBER")]
+        [Column("BIOS_VER")]
         [DataMember]
         [Display(Name = "BIOS版本")]
-        public decimal BiosVer { get; set; }
+        public string BiosVer { get; set; }
 
         /// <summary>
         /// BIOS備註

AMESCoreStudio.WebApi/Models/AMES/WipOutfit.cs

@@ -67,11 +67,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string UnitNo { get; set; }
 
         /// <summary>
-        /// 作業站
+        /// 作業站ID
         /// </summary>
-        [Column("RULE_STATION_ID")]
+        [Column("STATION_ID")]
         [DataMember]
-        public int? RuleStationID { get; set; }
+        public int? StationID { get; set; }
 
         /// <summary>
         /// 建立UserID

AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs

@@ -118,9 +118,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [DataMember]
         [Display(Name = "BIOS版本")]
-        [Column("BIOS_VER", TypeName = "NUMBER")]
+        [Column("BIOS_VER")]
         [Required(ErrorMessage = "{0},不能空白")]
-        public decimal BiosVer { get; set; }
+        public string BiosVer { get; set; }
 
         /// <summary>
         /// Check Sum