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 + "| MOID | ";
break;
case 2:
- kpDataList = kpDataList + " ProductID | ";
+ kpDataList = kpDataList + " Material(料號) | ";
break;
case 3:
- kpDataList = kpDataList + " ShipmentSN | ";
+ kpDataList = kpDataList + " 出貨料號 | ";
break;
case 4:
- kpDataList = kpDataList + " ProductSN | ";
+ kpDataList = kpDataList + " 生產序號 | ";
break;
case 5:
strStartDate = " StartDate | ";
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 list = new List();
foreach (DataRow row in dtBarcode.Rows)