From 5496e456875cff3af888ca81cc776aa0a3461dfb Mon Sep 17 00:00:00 2001
From: "vick_wang419@hotmail.com.tw" <vick_wang419@hotmail.com.tw>
Date: Fri, 13 Oct 2023 10:24:15 +0800
Subject: [PATCH] =?UTF-8?q?PTD=E8=A6=8F=E6=A0=BC=E6=9B=B8-2023=E7=B3=BB?=
 =?UTF-8?q?=E7=B5=B1=E9=9C=80=E6=B1=82(2023-09-25)-=20DN=20=E5=96=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=A9=A2=E5=87=BA=E8=B2=A8=E6=B8=85=E5=96=AE=20?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=E6=98=8E=E7=B4=B0=E6=AC=84=E4=BD=8D=E5=90=8D?=
 =?UTF-8?q?=E7=A8=B1=E3=80=81BugFix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PTDController.cs              |  6 +++---
 .../Controllers/AMES/WipInfosController.cs    | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PTDController.cs b/AMESCoreStudio.Web/Controllers/PTDController.cs
index 217e1610..46edfcc8 100644
--- a/AMESCoreStudio.Web/Controllers/PTDController.cs
+++ b/AMESCoreStudio.Web/Controllers/PTDController.cs
@@ -123,13 +123,13 @@ namespace AMESCoreStudio.Web.Controllers
                                         kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;MOID</td>";
                                         break;
                                     case 2:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ProductID</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;Material(料號)</td>";
                                         break;
                                     case 3:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ShipmentSN</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;出貨料號</td>";
                                         break;
                                     case 4:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ProductSN</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;生產序號</td>";
                                         break;
                                     case 5:
                                         strStartDate = "<td width = '120' style = 'text-align:left'>&nbsp;StartDate</td>";
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 833963cb..b7c1c154 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -2744,15 +2744,18 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                 }
             }
 
-            //整理欄位
-            dtBarcode.Columns.Remove("WIP_ID");
-            dtBarcode.Columns.Remove("BARCODE_ID");
-
-            dtBarcode.Columns["WipNo"].ColumnName = "MOID";
-            dtBarcode.Columns["ItemNO"].ColumnName = "Material(料號)";
-            dtBarcode.Columns["ExtraBarcodeNo"].ColumnName = "出貨料號";
-            dtBarcode.Columns["BarcodeNo"].ColumnName = "生產序號";
-            dtBarcode.AcceptChanges();
+            if (dtBarcode.Rows.Count > 0)
+            {
+                //整理欄位
+                dtBarcode.Columns.Remove("WIP_ID");
+                dtBarcode.Columns.Remove("BARCODE_ID");
+
+                //dtBarcode.Columns["WipNo"].ColumnName = "MOID";
+                //dtBarcode.Columns["ItemNO"].ColumnName = "Material(料號)";
+                //dtBarcode.Columns["ExtraBarcodeNo"].ColumnName = "出貨料號";
+                //dtBarcode.Columns["BarcodeNo"].ColumnName = "生產序號";
+                dtBarcode.AcceptChanges();
+            }     
 
             List <dynamic> list = new List<dynamic>();
             foreach (DataRow row in dtBarcode.Rows)