1. PCS001 程式UI畫面已拉好一板

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -65,18 +65,34 @@ namespace AMESCoreStudio.Web.Controllers
         /// 廠別/委外廠
         /// </summary>
         /// <returns></returns>
-        private async Task GetFactoryInfoType()
+        private async Task GetFactoryInfo()
         {
             var result = await _pcsApi.GetFactoryInfo();
 
             var FactoryInfo = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
-                FactoryInfo.Add(new SelectListItem(result[i].FactoryNO + "-" + result[i].FactoryNameCH, result[i].FactoryID.ToString()));
+                FactoryInfo.Add(new SelectListItem(result[i].FactoryNo + "-" + result[i].FactoryNameCh, result[i].FactoryID.ToString()));
             }
             ViewBag.FactoryInfoList = FactoryInfo;
         }
 
+        /// <summary>
+        /// 生產單位
+        /// </summary>
+        /// <returns></returns>
+        private async Task GetFactoryUnit()
+        {
+            var result = await _pcsApi.GetFactoryUnit();
+
+            var FactoryUnit = new List<SelectListItem>();
+            for (int i = 0; i < result.Count; i++)
+            {
+                FactoryUnit.Add(new SelectListItem(result[i].UnitName,result[i].UnitNo.ToString()));
+            }
+            ViewBag.FactoryUnitList = FactoryUnit;
+        }
+
         /// <summary>
         /// 正背面
         /// </summary>
@@ -377,6 +393,71 @@ namespace AMESCoreStudio.Web.Controllers
 
             ViewBag.GetSolderPasteList = SolderPaste;
         }
+
+        /// <summary>
+        /// PCS List1 共用 BIOS/Checksum
+        /// </summary>
+        private void GetPCSList1()
+        {
+            var PCSList1 = new List<SelectListItem>(){
+                new SelectListItem() {
+                    Text = "NA",
+                    Value = "NA",
+                },
+                new SelectListItem
+                {
+                    Text = "Check",
+                    Value = "Check",
+                },
+                new SelectListItem
+                {
+                    Text = "Program",
+                    Value = "Program",
+                },
+                new SelectListItem
+                {
+                    Text = "備註說明",
+                    Value = "備註說明",
+                }
+            };
+
+            ViewBag.PCSList1 = PCSList1;
+        }
+
+        /// <summary>
+        /// SOP相關下班
+        /// </summary>
+        private void GetPCSOPList()
+        {
+            var PCSOPList = new List<SelectListItem>(){
+                new SelectListItem() {
+                    Text = "SOP",
+                    Value = "SOP",
+                },
+                new SelectListItem
+                {
+                    Text = "技術轉移",
+                    Value = "技術轉移",
+                },
+                new SelectListItem
+                {
+                    Text = "NA",
+                    Value = "NA",
+                },
+                new SelectListItem
+                {
+                    Text = "暫時文件",
+                    Value = "備暫時文件",
+                },
+                new SelectListItem
+                {
+                    Text = "備註說明",
+                    Value = "備註說明",
+                }
+            };
+
+            ViewBag.PCSOPList = PCSOPList;
+        }
         #endregion
 
 
@@ -390,12 +471,25 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> PCS001C()
         {
             await GetProductType();
-            GetWipSEQType();
-            GetWipType();
-            GetCustomerType();
+            await GetFactoryInfo();
+            await GetFactoryUnit();
             await GetLineInfo();
             await GetMFGType();
             await GetProcessTypes();
+            GetSMDType();
+            GetDIPType();
+            GetWipSEQType();
+            GetBurnType();
+            GetPartsBakeType();
+            GetPCBBakeType();
+            GetPCBWorkingType();
+            GetSolderPaste();
+            GetWipType();
+            GetCustomerType();
+            GetPCSList1();
+            GetPCSOPList();
+            //var result = new WipAllViewModel();
+            //return View(result);
             return View();
         }
 
@@ -403,36 +497,43 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> PCS001CSaveAsync(WipAllViewModel model)
         {
-            if (ModelState.IsValid)
+            //if (ModelState.IsValid)
+            //{
+            IResultModel result;
+            if (model.WipInfo.WipID == 0)
             {
-                IResultModel result;
-                if (model.WipInfo.WipID == 0)
-                {
-                    result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
-                    result = await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.WipAtt));
-                }
-                else
-                {
-                    result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
-                }
+                // Checkbox轉換
+                model.WipInfo.ECNCheck = model.WipInfo.ECNCheck == "true" ? "Y" : "N";
+                model.WipInfo.ModelCheck = model.WipInfo.ModelCheck == "true" ? "Y" : "N";
+                model.WipInfo.InputFlag = model.WipInfo.InputFlag == "true" ? "Y" : "N";
+                model.WipInfo.Priority = model.WipInfo.Priority == "true" ? "Y" : "N";
+
+                result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
+                model.WipAtt.WipNO = model.WipInfo.WipNO;
+                result = await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.WipAtt));
+            }
+            else
+            {
+                result = await _pcsApi.PostWipInfo(JsonConvert.SerializeObject(model.WipInfo));
+            }
 
-                if (!result.Success)
+            if (!result.Success)
+            {
+                var _msg = model.WipInfo.WipID == 0 ? "添加成功！" : "修改成功！";
+                return RedirectToAction("Refresh", "Home", new { msg = _msg });
+            }
+            else
+            {
+                if (result.Errors.Count > 0)
                 {
-                    var _msg = model.WipInfo.WipID == 0 ? "添加成功！" : "修改成功！";
-                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
                 }
                 else
                 {
-                    if (result.Errors.Count > 0)
-                    {
-                        ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
-                    }
-                    else
-                    {
-                        ModelState.AddModelError("error", result.Msg);
-                    }
+                    ModelState.AddModelError("error", result.Msg);
                 }
             }
+            //}
             if (model.WipInfo.WipID == 0)
             {
                 return View("PCS001C", model);

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -4,6 +4,7 @@ using WebApiClient.Attributes;
 using AMESCoreStudio.WebApi;
 using Microsoft.AspNetCore.Mvc;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
 
 namespace AMESCoreStudio.Web
 {
@@ -23,14 +24,21 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/LineInfos")]
-        ITask<List<LineInfo>> GetLineInfo();
+        ITask<List<AMESCoreStudio.WebApi.Models.BAS.LineInfo>> GetLineInfo();
 
         /// <summary>
         /// 廠別/委外廠
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FactoryInfos")]
-        ITask<List<FactoryInfo>> GetFactoryInfo();
+        ITask<List<AMESCoreStudio.WebApi.Models.BAS.FactoryInfo>> GetFactoryInfo();
+
+        /// <summary>
+        /// 獲取生產製程單位
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FactoryUnits")]
+        ITask<List<AMESCoreStudio.WebApi.Models.BAS.FactoryUnit>> GetFactoryUnit();
 
         /// <summary>
         /// 正背面

AMESCoreStudio.WebApi/Controllers/AMES/WipAttsController.cs

@@ -48,6 +48,29 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return WipAtt;
         }
 
+        /// <summary>
+        /// 工單機種資料 to Wipatt_NO
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        // GET: api/RolePrograms/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<IEnumerable<WipAtt>>> GetWipAtt(int id)
+        {
+            IQueryable<WipAtt> q = _context.WipAtts;
+
+            q = q.Where(p => p.WipNO.Equals(id));
+
+            var WipAtt = await q.ToListAsync();
+
+            if (WipAtt == null)
+            {
+                return NotFound();
+            }
+
+            return WipAtt;
+        }
+
         /// <summary>
         /// 新增工單資料
         /// </summary>
@@ -61,13 +84,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             Helper helper = new Helper(_context);
             //WipAtt.wi = helper.GetIDKey("WIP_ID").Result;
-            wipatt.CreateDate = DateTime.Now;
             wipatt.CreateUserID = 0;
 
             _context.WipAtts.Add(wipatt);
             await _context.SaveChangesAsync();
 
-            return CreatedAtAction("GetSystemInfo", new { id = wipatt.WipNO }, wipatt);
+            return CreatedAtAction("GetWipAtt", new { id = wipatt.WipNO }, wipatt);
         }
     }
 }

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -61,7 +61,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             Helper helper = new Helper(_context);
             WipInfo.WipID = helper.GetIDKey("WIP_ID").Result;
-            WipInfo.CreateDate = DateTime.Now;
             WipInfo.CreateUserID = 0;
 
             _context.WipInfos.Add(WipInfo);

AMESCoreStudio.WebApi/Models/AMES/WipAtt.cs

@@ -35,7 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("ECN")]
         [DataMember]
-        [Display(Name = "版本")]
+        [Display(Name = "ECN版本")]
         public string ECN { get; set; }
 
         /// <summary>
@@ -53,7 +53,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "正背面")]
-        public decimal Side { get; set; }
+        public decimal Side { get; set; } = -1;
 
         /// <summary>
         /// 聯板數
@@ -62,7 +62,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "聯板數")]
-        public decimal Boards { get; set; }
+        public decimal Boards { get; set; } = 1;
 
         /// <summary>
         /// Datecode
@@ -127,7 +127,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "單位重量")]
-        public decimal UnitWeight { get; set; }
+        public decimal UnitWeight { get; set; } =0;
 
         /// <summary>
         /// 誤差範圍
@@ -136,7 +136,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "誤差範圍")]
-        public decimal WeightRange { get; set; }
+        public decimal WeightRange { get; set; } = 0;
 
         /// <summary>
         /// 建立者
@@ -152,7 +152,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("CREATE_DATE")]
         [DataMember]
         [Display(Name = "建立日期")]
-        public DateTime CreateDate { get; set; }
+        public DateTime CreateDate { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 修改日期
@@ -160,7 +160,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("UPDATE_DATE")]
         [DataMember]
         [Display(Name = "修改日期")]
-        public DateTime UpdateDate { get; set; }
+        public DateTime UpdateDate { get; set; } = DateTime.Now;
 
     }
 }

AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

@@ -37,7 +37,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "計劃數量")]
-        public decimal PlanQTY { get; set; }
+        public decimal PlanQTY { get; set; } = 0;
 
         /// <summary>
         /// 第一站完成數量
@@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "第一站完成數量")]
-        public decimal CompleteQTY { get; set; }
+        public decimal CompleteQTY { get; set; } = 0;
 
         /// <summary>
         /// 線別ID
@@ -64,7 +64,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "生產單位")]
-        public string UnitNO { get; set; }
+        public string UnitNO { get; set; } = "1";
 
         /// <summary>
         /// 產品別
@@ -73,7 +73,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品別")]
-        public decimal ProductTypeID { get; set; }
+        public decimal ProductTypeID { get; set; } = 1;
 
         /// <summary>
         /// 業務
@@ -98,7 +98,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "流程ID")]
-        public decimal FlowRuleID { get; set; }
+        public decimal FlowRuleID { get; set; } = 0;
 
         /// <summary>
         /// 工單狀態
@@ -107,7 +107,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單狀態")]
-        public string StatusNO { get; set; }
+        public string StatusNO { get; set; } = "N";
 
         /// <summary>
         /// 工單開工次數
@@ -116,7 +116,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單開工次數")]
-        public decimal WipTimes { get; set; }
+        public decimal WipTimes { get; set; } = 0;
 
         /// <summary>
         /// 包裝起始箱號
@@ -133,7 +133,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "單箱數量")]
-        public decimal BoxCNT { get; set; }
+        public decimal BoxCNT { get; set; } = 1;
 
         /// <summary>
         /// 判斷前製程是否已經投入 (Y-判斷;N-不判斷)
@@ -142,7 +142,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "判斷前製程")]
-        public string InputFlag { get; set; }
+        public string InputFlag { get; set; } = "N";
 
         /// <summary>
         /// 混線投入機種檢查(Y-檢查;N-不檢查)
@@ -151,7 +151,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "混線投入機")]
-        public string ModelCheck { get; set; }
+        public string ModelCheck { get; set; } = "Y";
 
         /// <summary>
         /// 制令序號
@@ -160,7 +160,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "制令序號")]
-        public decimal WipSEQ { get; set; }
+        public decimal WipSEQ { get; set; } = 1;
 
         /// <summary>
         /// 混線投入ECN相同檢查(Y-檢查;N-不檢查)
@@ -169,7 +169,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "混線投入ECN相同檢查")]
-        public string ECNCheck { get; set; }
+        public string ECNCheck { get; set; } = "N";
 
         /// <summary>
         /// 建立者
@@ -185,7 +185,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("CREATE_DATE")]
         [DataMember]
         [Display(Name = "建立日期")]
-        public DateTime CreateDate { get; set; }
+        public DateTime CreateDate { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 修改日期
@@ -193,7 +193,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("UPDATE_DATE")]
         [DataMember]
         [Display(Name = "修改日期")]
-        public DateTime UpdateDate { get; set; }
+        public DateTime UpdateDate { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 打印狀態
@@ -202,7 +202,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "打印狀態")]
-        public decimal PrintFlag { get; set; }
+        public decimal PrintFlag { get; set; } = 0;
 
         /// <summary>
         /// 工單備註
@@ -227,7 +227,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "線上強制工單")]
-        public string Priority { get; set; }
+        public string Priority { get; set; } = "N";
 
         /// <summary>
         /// 預計開工日期