1. 修正生產履歷-組件變更

2. 過站判斷顯示-工程備註
3. WipAtt 加入料號查詢
4. 修正工單資訊-KeyParts 順序顯示

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -2691,26 +2691,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             // 組件清單
-            var barcodeitems = await _pcsApi.GetBarcodeItemByBarCodeID(result_barcodeinfo.BarcodeID);
-            foreach (var barcodeitem in barcodeitems.OrderBy(o => o.CreateDate))
-            {
-                result.BarCodeKPs.Add(new BarCodeKP
-                {
-                    Station = barcodeitem.S.StationDesc,
-                    KPPartNo = barcodeitem.PartNo,
-                    KPItemNo = barcodeitem.KpItemNo,
-                    InputDate = barcodeitem.CreateDate.ToString()
-                });
-            }
-            var wipKp = await _pcsApi.GetWipKpByWipNo(result.WinInfos.FirstOrDefault().WipNo);
-            wipKp = wipKp.OrderBy(o => o.KpSeq).ToList();
-            int i = 0;
-            foreach(var item in result.BarCodeKPs.OrderBy(o => o.InputDate))
-            {
-                item.KPItemNo = wipKp[i].KpName;
-                item.No = wipKp[i].KpNoName;
-                i++;
-            }
+            result.BarCodeKPs = await _pcsApi.GetBarcodeItemByBarCodeIDPCS009(result_barcodeinfo.BarcodeID);
 
 
             // 治具清單
@@ -2726,18 +2707,8 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             // 組件變更
-            var barcodeitemchanges = await _pcsApi.GetBarcodeItemChangesByBarCodeID(result_barcodeinfo.BarcodeID);
-            foreach (var barcodeitemchange in barcodeitemchanges.OrderBy(o => o.CreateDate))
-            {
-                result.KPChanges.Add(new KPChange
-                {
-                    KPPartNo = barcodeitemchange.PartNoOld,
-                    KPItemNo = barcodeitemchange.ItemNo,
-                    ChangeType = barcodeitemchange.ChangeType,
-                    Date = barcodeitemchange.CreateDate.ToString(),
-                    User = barcodeitemchange.CreateUserID.ToString()
-                });
-            }
+            result.KPChanges = await _pcsApi.GetBarcodeItemChangesByBarCodeIDPCS009(result_barcodeinfo.BarcodeID);
+
 
 
             return View(result);
@@ -3506,11 +3477,10 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                 }
 
-                //var wipsop = await _pcsApi.GetWipSop(q.FirstOrDefault().WipID);
-                //if (wipsop != null)
-                //{
-                //    ////model.SopPath = wipsop.GetMaterialSop.FilePath + wipsop.GetMaterialSop.NewName;
-                //}
+                // 工程工單備註
+                var wipsystem = await _pcsApi.GetWipSystem(model.WipNO);
+                if (wipsystem != null)
+                    model.SystemMemo = wipsystem.Memo;
 
             }
 

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -316,7 +316,7 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
-        #region BarcodeItem BarCode組件維護 PCS021
+        #region BarcodeItem BarCode組件維護 PCS021 PCS009
         /// <summary>
         /// 查詢組件序號 by BarCodeID
         /// </summary>
@@ -324,6 +324,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/BarcodeItems/ByBarCodeID")]
         ITask<List<BarcodeItem>> GetBarcodeItemByBarCodeID(int barcodeID);
 
+        /// <summary>
+        /// 查詢組件序號 by BarCodeID 生產履歷
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/BarcodeItems/ByBarCodeIDPCS009")]
+        ITask<List<BarcodeItemDTO>> GetBarcodeItemByBarCodeIDPCS009(int barcodeID);
+
         /// <summary>
         /// 查詢組件序號 by BarCode
         /// </summary>
@@ -763,8 +770,8 @@ namespace AMESCoreStudio.Web
         /// BarcodeItemChanges By BarCodeID 
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/BarcodeItemChanges/{id}")]
-        ITask<List<BarcodeItemChange>> GetBarcodeItemChangesByBarCodeID(int id);
+        [WebApiClient.Attributes.HttpGet("api/BarcodeItemChanges/ByBarCodeIDPCS009/{id}")]
+        ITask<List<BarcodeItemChangeDTO>> GetBarcodeItemChangesByBarCodeIDPCS009(int id);
 
 
         #endregion

AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs

@@ -15,8 +15,8 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
             WinInfos = new List<WinInfo>();
             BarCodeLogs = new List<BarCodeLog>();
             BarCodeChanges = new List<BarCodeChange>();
-            BarCodeKPs = new List<BarCodeKP>();
-            KPChanges = new List<KPChange>();
+            BarCodeKPs = new List<BarcodeItemDTO>();
+            KPChanges = new List<BarcodeItemChangeDTO>();
             Outfits = new List<Outfit>();
         }
 
@@ -68,7 +68,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         /// <summary>
         /// 組件清單
         /// </summary>
-        public List<BarCodeKP> BarCodeKPs { get; set; }
+        public List<BarcodeItemDTO> BarCodeKPs { get; set; }
 
         /// <summary>
         /// 治具清單
@@ -83,7 +83,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         /// <summary>
         /// 組件變更
         /// </summary>
-        public List<KPChange> KPChanges { get; set; }
+        public List<BarcodeItemChangeDTO> KPChanges { get; set; }
     }
 
     /// <summary>
@@ -178,36 +178,6 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         public string InputDate { get; set; }
     }
 
-    /// <summary>
-    /// 組件清單
-    /// </summary>
-    public class BarCodeKP
-    {
-        /// <summary>
-        /// 編號名稱
-        /// </summary>
-        public string No { get; set; }
-
-        /// <summary>
-        /// 站别
-        /// </summary>
-        public string Station { get; set; }
-
-        /// <summary>
-        /// 組件代碼
-        /// </summary>
-        public string KPPartNo { get; set; }
-
-        /// <summary>
-        /// 組件料號
-        /// </summary>
-        public string KPItemNo { get; set; }
-
-        /// <summary>
-        /// 過站日期
-        /// </summary>
-        public string InputDate { get; set; }
-    }
 
     /// <summary>
     /// 治具清單

AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs

@@ -105,6 +105,12 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         /// 站別測試類別代碼
         /// </summary>
         public string StationTestType { get; set; }
+
+        /// <summary>
+        /// 工程備註
+        /// </summary>
+        public string SystemMemo { get; set; }
+
         /// <summary>
         /// inputs
         /// </summary>

AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml

@@ -252,19 +252,19 @@
                         {
                             <tr>
                                 <td>
-                                    @index.Station
+                                    @index.StationName
                                 </td>
                                 <td>
-                                    @index.No
+                                    @index.ItemNoName
                                 </td>
                                 <td>
-                                    @index.KPPartNo
+                                    @index.PartNo
                                 </td>
                                 <td>
-                                    @index.KPItemNo
+                                    @index.KpItemNo
                                 </td>
                                 <td>
-                                    @index.InputDate
+                                    @index.CreateDate
                                 </td>
                             </tr>
                         }
@@ -316,6 +316,49 @@
                 <fieldset class="layui-elem-field layui-field-title">
                     <legend style="color: #e18917">組件變更</legend>
                 </fieldset>
+                <table class="layui-table" lay-even lay-size="sm">
+                    <thead>
+                        <tr>
+                            <th>
+                                站別名稱
+                            </th>
+                            <th>
+                                組件名稱
+                            </th>
+                            <th>
+                                (舊)組件條碼
+                            </th>
+                            <th>
+                                替換人員
+                            </th>
+                            <th>
+                                替換時間
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var index in Model.KPChanges)
+                        {
+                        <tr>
+                            <td>
+                                @index.StationName
+                            </td>
+                            <td>
+                                @index.ItemNoName
+                            </td>
+                            <td>
+                                @index.PartNoOld
+                            </td>
+                            <td>
+                                @index.CreateUser
+                            </td>
+                            <td>
+                                @index.CreateDate
+                            </td>
+                        </tr>
+                        }
+                    </tbody>
+                </table>
             </div>
             <div class="layui-row">
                 <fieldset class="layui-elem-field layui-field-title">

AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@@ -196,6 +196,12 @@
 
                                     </table>
                                 </fieldset>
+                                <fieldset id="Memo" class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">工程備註</legend>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="text-align: left; color: blue;">@Model.SystemMemo</label>
+                                    </div>
+                                </fieldset>
                                 <fieldset class="layui-elem-field layui-field-title">
                                     <legend style="color: #e18917">KeyParts</legend>
                                 </fieldset>
@@ -325,7 +331,16 @@
             }
             else {
                   $("#inputNo").hide();
-            }
+              }
+
+
+              @if (!string.IsNullOrWhiteSpace(Model.SystemMemo))
+              {
+                   <text>$("#Memo").show(); </text>
+              }
+              else
+              {   <text>$("#Memo").hide();</text> }
+
     });
 
         // Jquery 將兩邊DIV設定同高度

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemChangesController.cs

@@ -68,6 +68,35 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return barcodeItemChange;
         }
 
+        /// <summary>
+        /// 用barcodeID獲取資料 By生產履歷
+        /// </summary>
+        /// <param name="barcodeID">barcodeID</param>
+        /// <returns></returns>
+        [HttpGet("ByBarCodeIDPCS009/{id}")]
+        public async Task<ActionResult<IEnumerable<BarcodeItemChangeDTO>>> GetBarcodeItemChangesByBarCodeIDPCS009(int id)
+        {
+            var q = from q1 in _context.BarcodeItemChanges.Where(w => w.BarcodeID == id)
+                    join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
+                    join q3 in _context.RuleStations on q1.RuleStationID equals q3.RuleStationID
+                    join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
+                    select new BarcodeItemChangeDTO
+                    {
+                        BarcodeID = q1.BarcodeID,
+                        WipID = q1.WipID,
+                        PartNoOld = q1.PartNoOld,
+                        KpItemNo = q1.KpItemNo,
+                        ItemNoName = q2.ItemName,
+                        StationName = q3.StationDesc,
+                        RuleStationID = q1.RuleStationID,
+                        CreateUser = q4.UserName,
+                        CreateDate = q1.CreateDate,
+                        ChangeType = q1.ChangeType
+                    };
+
+            return await q.ToListAsync();
+        }
+
         /// <summary>
         /// 更新條碼资料
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

@@ -242,6 +242,35 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return barcodeItem;
         }
 
+        /// <summary>
+        /// 用barcodeID獲取資料 By生產履歷
+        /// </summary>
+        /// <param name="barcodeID">barcodeID</param>
+        /// <returns></returns>
+        [HttpGet("ByBarCodeIDPCS009")]
+        public async Task<ActionResult<IEnumerable<BarcodeItemDTO>>> GetBarcodeItemByBarCodeIDPCS009(int barcodeID)
+        {
+            var q = from q1 in _context.BarcodeItems.Where(w => w.BarcodeID == barcodeID)
+                    join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
+                    join q3 in _context.RuleStations on q1.RuleStationID equals q3.RuleStationID
+                    join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
+                    select new BarcodeItemDTO
+                    {
+                        BarcodeID = q1.BarcodeID,
+                        WipID = q1.WipID,
+                        PartNo = q1.PartNo,
+                        KpItemNo = q1.KpItemNo,
+                        ItemNoName = q2.ItemName,
+                        StationName = q3.StationDesc,
+                        RuleStationID = q1.RuleStationID,
+                        CreateUser = q4.UserName,
+                        CreateDate = q1.CreateDate,
+                        SysType = q1.SysType
+                    };
+
+            return await q.ToListAsync();
+        }
+
         /// <summary>
         /// 用barcode獲取資料
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipAttsController.cs

@@ -62,6 +62,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return WipAtt.FirstOrDefault();
         }
 
+        /// <summary>
+        /// 查詢工單資料Att By 料號
+        /// </summary>
+        /// <param name="id">料號</param>
+        /// <returns></returns>
+        [HttpGet("ByItemNo/{id}")]
+        public async Task<ActionResult<IEnumerable<WipAtt>>> GetWipAttByItemNo(string id)
+        {
+            IQueryable<WipAtt> q = _context.WipAtts.Where(p => p.ItemNO == id.Trim().ToUpper());
+            return await q.ToListAsync();
+        }
+
         /// <summary>
         /// 新增工單資料Att
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs

@@ -73,7 +73,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         KpNoName = q3.ItemName
                     };
 
-            return await q.ToListAsync();
+            return await q.OrderBy(o => o.KpSeq).ToListAsync();
         }
 
         /// <summary>

AMESCoreStudio.WebApi/DTO/AMES/BarcodeItemChangDTO.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 條碼组件變更資料檔 DTO
+    /// </summary>
+    public class BarcodeItemChangeDTO
+    {
+        /// <summary>
+        /// 内部條碼ID
+        /// </summary>
+        public int BarcodeItemChangeID { get; set; }
+
+        /// <summary>
+        /// 内部條碼ID
+        /// </summary>
+        public int BarcodeID { get; set; }
+
+        /// <summary>
+        /// 组件條碼
+        /// </summary>
+
+        public string PartNoOld { get; set; }
+
+        /// <summary>
+        /// 系统狀態
+        /// </summary>
+
+        public string ChangeType { get; set; }
+
+        /// <summary>
+        /// 组件代碼
+        /// </summary>
+
+        public string ItemNo { get; set; }
+
+        /// <summary>
+        /// 组件代碼Name
+        /// </summary>
+        public string ItemNoName { get; set; }
+
+        /// <summary>
+        /// 流程站别ID
+        /// </summary>
+
+        public int RuleStationID { get; set; }
+
+        /// <summary>
+        /// 流程站名稱
+        /// </summary>
+        public string StationName { get; set; }
+
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+
+        public int WipID { get; set; }
+
+
+        /// <summary>
+        /// 组件料號
+        /// </summary>
+
+        public string KpItemNo { get; set; }
+
+        /// <summary>
+        /// 建立者
+        /// </summary>
+
+        public string CreateUser { get; set; } 
+
+        /// <summary>
+        /// 建立時間
+        /// </summary>
+
+        public DateTime CreateDate { get; set; } 
+
+        /// <summary>
+        /// 修改時間
+        /// </summary>
+
+        public DateTime UpdateDate { get; set; } 
+
+    }
+}

AMESCoreStudio.WebApi/DTO/AMES/BarcodeItemDto.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 條碼组件資料檔 DTO
+    /// </summary>
+
+    public class BarcodeItemDTO
+    {
+   
+        /// <summary>
+        /// 内部條碼ID
+        /// </summary>
+        public int BarcodeID { get; set; }
+
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+        public int WipID { get; set; }
+
+        /// <summary>
+        /// 流程站
+        /// </summary>
+        public string StationName { get; set; }
+
+        /// <summary>
+        /// 流程站ID
+        /// </summary>
+        public int RuleStationID { get; set; }
+
+        /// <summary>
+        /// 组件代碼Name
+        /// </summary>
+
+        public string ItemNoName { get; set; }
+
+        /// <summary>
+        /// 组件條碼
+        /// </summary>
+        public string PartNo { get; set; }
+
+        /// <summary>
+        /// 系统狀態
+        /// </summary>
+        public string SysType { get; set; }
+
+        /// <summary>
+        /// 组件料號
+        /// </summary>
+
+        public string KpItemNo { get; set; }
+
+        /// <summary>
+        /// 建立者Name
+        /// </summary>
+
+        public string CreateUser { get; set; } 
+
+        /// <summary>
+        /// 建立時間
+        /// </summary>
+
+        public DateTime CreateDate { get; set; } 
+
+        /// <summary>
+        /// 修改時間
+        /// </summary>
+        public DateTime UpdateDate { get; set; } 
+
+    }
+}