From a4c768f855d55256cefb2c3afaeab64bbd4fe785 Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Wed, 27 Apr 2022 01:42:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E5=B7=A5=E5=96=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B7=9A=E5=88=A5=E9=A1=AF=E7=A4=BA=E9=8C=AF?=
 =?UTF-8?q?=E8=AA=A4=202.=20=E7=94=9F=E7=94=A2=E6=AD=B7=E7=A8=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              | 12 +++++++++-
 .../ViewModels/PCS/PCS009RViewModel.cs        |  2 +-
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml    |  5 +++-
 AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml   | 20 +++++++++++++---
 .../AMES/BarcodeStationController.cs          | 23 +++++++++++--------
 .../Controllers/AMES/WipKpsController.cs      |  4 +++-
 AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs    |  6 +++++
 .../Models/AMES/BarcodeStation.cs             |  7 ++++++
 8 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 29ea8b62..ed02b258 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -2679,7 +2679,7 @@ namespace AMESCoreStudio.Web.Controllers
                     Station = barcodestation.GetRuleStation.StationDesc,
                     RuleStation = barcodestation.RuleStatus,
                     SysType = barcodestation.Systype,
-                    User = barcodestation.CreateUserID.ToString(),
+                    User = barcodestation.UserName,
                     InputDate = barcodestation.CreateDate.ToString()
                 });
             }
@@ -2696,6 +2696,16 @@ namespace AMESCoreStudio.Web.Controllers
                     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++;
+            }
+
 
             // 治具清單
             var barcodeoutfits = await _pcsApi.GetBarcodeOutfitByBarcodeNo(model.BarCodeNo);
diff --git a/AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs
index c0ce5eeb..c9faca86 100644
--- a/AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs
+++ b/AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs
@@ -184,7 +184,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
     public class BarCodeKP
     {
         /// <summary>
-        /// 編號
+        /// 編號名稱
         /// </summary>
         public string No { get; set; }
 
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index cc92133e..429a5ad1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -1265,11 +1265,14 @@
                     success: function (result)
                     {
                         console.info(result.data);
+                        var value = $("#wipInfo_LineID").val();
                         $("#wipInfo_LineID").empty();//清空下拉框的值
                         $.each(result.data, function (index, item) {
                             $("#wipInfo_LineID").append($("<option>").text(item.text).val(item.value))
+                   
                         });
-                        $("#wipInfo_LineID option:eq(1)").attr("selected", 'selected'); //默认选择第一个选项
+                        //$("#wipInfo_LineID option:eq(1)").attr("selected", 'selected'); //默认选择第一个选项
+                        $("#wipInfo_LineID option[value=" + value+"]").prop("selected", true);
                         layui.form.render("select");//重新渲染 固定写法
                     },
                     error: function (result)
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
index 7597ffac..4bf85148 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
@@ -198,9 +198,17 @@
                                 <td>
                                     @index.Station
                                 </td>
-                                <td>
-                                    @index.RuleStation
-                                </td>
+                                @if (index.RuleStation == "F")
+                                {
+                                    <td><span style="color:red">@index.RuleStation</span></td>
+                                }
+                                else
+                                {
+                                    <td>
+                                        @index.RuleStation
+                                    </td>
+                                }
+
                                 <td>
                                     @index.SysType
                                 </td>
@@ -225,6 +233,9 @@
                             <th>
                                 站別名稱
                             </th>
+                            <th>
+                                組件名稱
+                            </th>
                             <th>
                                 組件條碼
                             </th>
@@ -243,6 +254,9 @@
                                 <td>
                                     @index.Station
                                 </td>
+                                <td>
+                                    @index.No
+                                </td>
                                 <td>
                                     @index.KPPartNo
                                 </td>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
index b85301aa..35cc115b 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
@@ -81,15 +81,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("BarCodeID/{barcodeID}")]
         public async Task<ActionResult<IEnumerable<BarcodeStation>>> GetBarcodeStationByBarCodeID(int barcodeID)
         {
-            IQueryable<BarcodeStation> q = _context.BarcodeStation.Where(w => w.BarcodeID == barcodeID);
-            var barcodeStation = await q.ToListAsync();
-
-            if (barcodeStation == null)
-            {
-                return NotFound();
-            }
-
-            return barcodeStation;
+            var q = from q1 in _context.BarcodeStation.Where(w => w.BarcodeID == barcodeID)
+                    join q2 in _context.UserInfoes on q1.CreateUserID equals q2.UserID
+                    select new BarcodeStation
+                    {
+                        BarcodeID = q1.BarcodeID,
+                        WipID = q1.WipID,
+                        RuleStationID = q1.RuleStationID,
+                        RuleStatus = q1.RuleStatus,
+                        Systype = q1.Systype,
+                        CreateDate = q1.CreateDate,
+                        GetRuleStation = q1.GetRuleStation,
+                        UserName = q2.UserName
+                    };
+            return await q.ToListAsync();
         }
 
         /// <summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs
index 951e896b..f727e8c6 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs
@@ -57,6 +57,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             var q = from q1 in _context.WipKps.Where(w => w.WipNo.Contains(id))
                     join q2 in _context.FactoryUnits on q1.UnitNo equals q2.UnitNo
+                    join q3 in _context.Items on q1.KpNo equals q3.ItemNo
                     select new WipKpDto
                     {
                         WipKpID = q1.WipKpID,
@@ -68,7 +69,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         Length = q1.Length,
                         Title = q1.Title,
                         UnitNo = q1.UnitNo,
-                        UnitNoName = q2.UnitName
+                        UnitNoName = q2.UnitName,
+                        KpNoName = q3.ItemName
                     };
 
             return await q.ToListAsync();
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
index 5a7eea10..3e1f12ef 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/WipKpDto.cs
@@ -39,6 +39,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string KpNo { get; set; }
 
+        /// <summary>
+        /// KP料號NO項目名稱
+        /// </summary>
+
+        public string KpNoName { get; set; }
+
         /// <summary>
         /// 順序
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
index 4026c187..37b57185 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
 using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.Models.SYS;
 
 #nullable disable
 
@@ -119,5 +120,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [ForeignKey("RuleStationID")]
         [DataMember]
         public virtual RuleStation GetRuleStation { get; set; }
+
+        /// <summary>
+        /// 建立者姓名
+        /// </summary>
+        [DataMember]
+        public virtual string UserName { get; set; }
     }
 }