1. 更新Model

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1545,16 +1545,18 @@ namespace AMESCoreStudio.Web.Controllers
         {
             await GetFactoryUnit();
             await GetLineInfo();
-            model.WipInfo.WipNO = "WO0001A1";
+            model.WipNO = "WO0001A1";
-            var q = await _pcsApi.GetWipInfoByWipNO(model.WipInfo.WipNO);
+            var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
-            if (q.Count() != 0)
+            //if (q.Count() != 0)
-            { 
+            //{ 
-                model.WipInfo = q.Where(w => w.UnitNO == model.WipInfo.UnitNO).FirstOrDefault();
+            //    model.ItemNO = _pcsApi.GetWipAtt(model.WipNO)
-                model.wipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+
-                model.WipSopLog = await _pcsApi.GetWipSopLog(model.WipInfo.WipID);
+            //    model.WipInfo = q.Where(w => w.UnitNO == model.WipInfo.UnitNO).FirstOrDefault();
-                model.wipSop = await _pcsApi.GetWipSop(model.WipSopLog.WipSopID);
+            //    model.wipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
-                model.materialKpDto = await _pcsApi.GetMaterialKpQuery(model.wipAtt.ItemNO, model.WipInfo.UnitNO);
+            //    model.WipSopLog = await _pcsApi.GetWipSopLog(model.WipInfo.WipID);
-            }
+            //    model.wipSop = await _pcsApi.GetWipSop(model.WipSopLog.WipSopID);
+            //    model.materialKpDto = await _pcsApi.GetMaterialKpQuery(model.wipAtt.ItemNO, model.WipInfo.UnitNO);
+            //}
             //var a = _pcsApi.GetWipInfoByWipNO()
             //try
             //{

AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs

@@ -10,36 +10,56 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
 {
     public class PCS021ViewModel
     {
+        /// <summary>
+        /// 供單號碼
+        /// </summary>
+        public string WipNO { get; set; }
+
+        /// <summary>
+        /// 工單數
+        /// </summary>
+        public int PlanQTY { get; set; } = 0;
+
+        /// <summary>
+        /// 線別
+        /// </summary>
+        public int? LineID { get; set; }
+
+        /// <summary>
+        /// 生產單位
+        /// </summary>
+        public string UnitNO { get; set; } 
+
+        /// <summary>
+        /// 作業暫
+        /// </summary>
+        public string Station { get; set; }
+
+        /// <summary>
+        /// SOP路徑
+        /// </summary>
+        public string SopPath { get; set; } = "";
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        public string ItemNO { get; set; }
+
+        /// <summary>
+        /// input
+        /// </summary>
+        public string Input { get; set; }
+
+        /// <summary>
+        /// input
+        /// </summary>
+        public List<string> Inputs { get; set; }
+
+        /// <summary>
+        /// 料號相關資料 治具 工項 keyparts
+        /// </summary>
+        public MaterialItem MaterialItem { get; set; }
 
-        //public string WipNO { get; set; }
 
-        //public int PlanQTY { get; set; } = 0;
-
-        //public int? LineID { get; set; }
-
-        //public string UnitNO { get; set; } = "1";
-
-        //public string itemNO
-
-        //    public string input
-
-        //    public IEnumerable<MaterialStationsItem> materialStations
-
-        //    public IEnumerable<MaterialOutfit> materialOutfits
-
-        public WipInfo WipInfo { get; set; }
-
-        public WipAtt wipAtt { get; set; }
-
-        public WipSop wipSop { get; set; }
-
-        public WipSopLog WipSopLog {get;set;}
-        
-        public IEnumerable<MaterialKpDto> materialKpDto { get; set; }
-
-
-        public IEnumerable<WipBarcode> WipBarcodes { get; set; }
-
-        public IEnumerable<RuleStation> RuleStation { get; set; }
     }
 }

AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@@ -1,4 +1,4 @@
-@model AMESCoreStudio.Web.ViewModels.PCS.PCS021ViewModel
+@*@model AMESCoreStudio.Web.ViewModels.PCS.PCS021ViewModel
 @{
     ViewData["Title"] = "過站作業";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
@@ -295,4 +295,4 @@
         });
 
     </script>
-}
+}*@

AMESCoreStudio.Web/Views/Shared/PCS/_SOPPartial.cshtml

@@ -6,7 +6,7 @@
 <div class="layui-card">
     <div>
         <hr />
-        <dl class="dl-horizontal">
+        @*<dl class="dl-horizontal">
             <dt>編號</dt>
             <dd>@Model.wipSop.NewName</dd>
             <dt>屬性</dt>
@@ -15,7 +15,7 @@
             </dd>
             <dt>名稱</dt>
             <dd>@Model.wipSop.NewName</dd>
-        </dl>
+        </dl>*@
     </div>
 </div>
 

AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using System.Collections.Generic;
 
 #nullable disable
 
@@ -81,19 +82,19 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 料號治具資訊資料檔
         /// </summary>
-        [ForeignKey("ItemID")]
+     
-        public virtual IEquatable<MaterialOutfit> materialOutfits  { get; set; }
+        public virtual List<MaterialOutfit> MaterialOutfits { get; set; }
 
         /// <summary>
         /// 料號治具資訊資料檔
         /// </summary>
-        [ForeignKey("ItemID")]
+  
-        public virtual IEquatable<MaterialKp> materialKps { get; set; }
+        public virtual List<MaterialKp> MaterialKps { get; set; }
 
         /// <summary>
         /// 料號站別工項資料檔
         /// </summary>
-        [ForeignKey("ItemID")]
+        
-        public virtual IEquatable<MaterialStationsItem> materialStationsItems { get; set; }
+        public virtual List<MaterialStationsItem> MaterialStationsItems { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs

@@ -20,6 +20,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Key]
         [Column("MATERIAL_KP_ID")]
         [DataMember]
+         [Required]
         public int MaterialKpID { get; set; }
 
         /// <summary>
@@ -28,6 +29,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("ITEM_ID")]
         [Display(Name = "料號ID")]
         [DataMember]
+        [Required]
         public int ItemID { get; set; }
 
         /// <summary>

AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs

@@ -29,7 +29,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "料號ID")]
         [Column("ITEM_ID")]
-        public int ItemId { get; set; }
+        public int ItemID { get; set; }
 
         /// <summary>
         /// 治具NO
@@ -83,5 +83,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required]
         public DateTime? UpdateDate { get; set; }
+
+        /// <summary>
+        /// 料號主檔
+        /// </summary>
+        [ForeignKey("ItemID")]
+        public virtual MaterialItem MaterialItem { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs

@@ -113,5 +113,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public DateTime? UpdateDate { get; set; }
 
 
+        /// <summary>
+        /// 料號主檔
+        /// </summary>
+        [ForeignKey("ItemID")]
+        public virtual MaterialItem MaterialItem { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/WipSop.cs

@@ -117,5 +117,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [ForeignKey("UnitNo")]
         public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit FactoryUnit { get; set; }
+
+        public virtual List<WipSopLog> WipSopLogs { get; set; }
     }
 }