diff --git a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj.user b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj.user
index 171078ef..c5405f56 100644
--- a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj.user
+++ b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj.user
@@ -7,7 +7,7 @@
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
-    <WebStackScaffolding_LayoutPageFile>~/Views/PTD/PTD001.cshtml</WebStackScaffolding_LayoutPageFile>
+    <WebStackScaffolding_LayoutPageFile>~/Views/PTD/PTD001A_O.cshtml</WebStackScaffolding_LayoutPageFile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <ShowAllFiles>true</ShowAllFiles>
diff --git a/AMESCoreStudio.Web/Controllers/PTDController.cs b/AMESCoreStudio.Web/Controllers/PTDController.cs
index 4cbb4770..217e1610 100644
--- a/AMESCoreStudio.Web/Controllers/PTDController.cs
+++ b/AMESCoreStudio.Web/Controllers/PTDController.cs
@@ -20,14 +20,20 @@ namespace AMESCoreStudio.Web.Controllers
             _kcsApi = kcsApi;
         }
 
-        public async Task<IActionResult> PTD001Async(string dnNo, string lineNo)
+        public async Task<IActionResult> PTD001()
+        {        
+            return View();
+        }
+
+
+        public async Task<IActionResult> PTD001AAsync(string dnNo, string lineNo)
         {
-            ViewData["Title"] = "DN單查詢出貨清單";
+            ViewData["Title"] = "查詢條件 - 出貨DN單: " + dnNo + " Line No:" + lineNo;
 
             if (dnNo == null || lineNo == null)
                 return View();
 
-            string kpDataList = "<font size='3'><tr></tr><tr><td>";
+            string kpDataList = "<font size='3'><tr></tr><td><hr></td><tr><td>";
             string dataList = "";
             try
             {
@@ -35,8 +41,8 @@ namespace AMESCoreStudio.Web.Controllers
                 IResultModel<dynamic> DNDetail = await _pcsApi.GetZDNDetail4PTD001(dnNo,lineNo);
                 if (DNDetail.DataTotal > 0)
                 {
-                    dataList = "<table id = 'list' border = '1' width='100%' cellspacing='2px' cellpadding='10px'>";
-                    dataList += "<tr><td><table border = '1' width='100%' cellspacing='2px' cellpadding='10px'>";
+                    dataList = "<table id = 'list' border = '0' width='100%' cellspacing='2px' cellpadding='10px'>";
+                    dataList += "<tr><td><table border = '1' bgcolor='#f5b8f0' width='100%' cellspacing='2px' cellpadding='10px'>";
                     foreach (var item in DNDetail.Data)
                     {
                         JObject jo = JObject.Parse(item.ToString());
@@ -46,7 +52,7 @@ namespace AMESCoreStudio.Web.Controllers
                             switch (i)
                             {
                                 case 0:
-                                    dataList += "<tr><td width = '150' style = 'text-align:left'>&nbsp;DN NO</td>";
+                                    dataList += "<tr height='30'><td width = '150' style = 'text-align:left'>&nbsp;DN NO</td>";
                                     dataList += "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
                                     break;
                                 case 1:
@@ -111,22 +117,22 @@ namespace AMESCoreStudio.Web.Controllers
                                 switch (i)
                                 {
                                     case 0:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;DNNo</td>";
                                         break;
                                     case 1:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        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;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ProductID</td>";
                                         break;
                                     case 3:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ShipmentSN</td>";
                                         break;
                                     case 4:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;ProductSN</td>";
                                         break;
                                     case 5:
-                                        strStartDate = "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        strStartDate = "<td width = '120' style = 'text-align:left'>&nbsp;StartDate</td>";
                                         break;
                                     default:
                                         string kp_name = jp[i].Name.Replace("kP_", "");
diff --git a/AMESCoreStudio.Web/Views/PTD/PTD001.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD001.cshtml
index 1849298c..02d54d99 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD001.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD001.cshtml
@@ -32,96 +32,39 @@
             <div class="layui-form-item">
                 <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
             </div>
-        </div>
-    </div>
-    <div class="layui-card-body">
-        <div class="layui-form">
-            <div class="layui-row">
-                <div class="layui-form-item">
-                    <div class="layui-col-sm3">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">出貨DN單:</label>
-                            <div class="layui-input-inline" style="width:150px">
-                                <input id="dnNo" name="dnNo" autocomplete="off" class="layui-input" placeholder="請輸入DN單">
-                            </div>
-                        </div>
+            <div class="layui-form-item  layui-layout-left">
+                <div class="layui-inline">
+                    <label class="layui-form-label">出貨DN單:</label>
+                    <div class="layui-input-inline" style="width:150px">
+                        <input id="dnNo" name="dnNo" autocomplete="off" class="layui-input" placeholder="請輸入DN單">
                     </div>
-                    <div class="layui-col-sm3">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">Line No:</label>
-                            <div class="layui-input-inline" style="width:150px">
-                                <input id="lineNo" name="lineNo" autocomplete="off" class="layui-input" placeholder="請輸入Line No">
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-col-sm1">
-                        <div class="layui-inline layui-show-xs-block">
-                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit" onclick="result()">
-                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
-                            </button>
-                        </div>
+                </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">Line No:</label>
+                    <div class="layui-input-inline" style="width:150px">
+                        <input id="lineNo" name="lineNo" autocomplete="off" class="layui-input" placeholder="請輸入Line No">
                     </div>
                 </div>
+                <div class="layui-inline layui-show-xs-block">
+                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit" onclick="result()">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
             </div>
         </div>
-        <div class="layui-card-body">
-            <button type="button" onclick="tableToExcel('list','組件明細')" class="layui-btn layui-btn-normal layui-btn-sm"><i class="fa fa-file-excel-o"></i>導出Excel</button>
-            <br />
-            <br />
-            @Html.Raw(ViewData["list"])
-        </div>
+    </div>
+    <div class="layui-card-body">
     </div>
 </div>
 
 <script type="text/javascript">
 
-    function formatJSONDate(jsonDate) {
-        if (jsonDate == null) {
-            return "";
-        }
-        else {
-            var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
-            var myDate = new Date(date);
-            var yy = myDate.getFullYear();
-            var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
-            var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
-            var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
-            var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
-            var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
-            //mm + "/" + dd + " " +
-            //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
-            var output = yy + mm + dd + h + m + s;
-            // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
-            return output;
-        }
-    }
-
-    function base64(content) {
-        return window.btoa(unescape(encodeURIComponent(content)));
-    }
-
-    function tableToExcel(tableID, fileName) {
-        var table = document.getElementById(tableID);
-        var excelContent = table.innerHTML;
-        var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
-        excelFile += "<head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head>";
-        excelFile += "<body><table>";
-        excelFile += excelContent;
-        excelFile += "</table></body>";
-        excelFile += "</html>";
-        var link = "data:application/vnd.ms-excel;base64," + base64(excelFile);
-        var a = document.createElement("a");
-        a.download = fileName + formatJSONDate(Date.now().toString()) + ".xls";
-        a.href = link;
-        a.click();
-    }
-
     function result() {
         var dnNo = $("#dnNo").val();
         var lineNo = $("#lineNo").val();
 
         var query = "?dnNo=" + dnNo + "&lineNo=" + lineNo;
-        hg.open('DN單查詢出貨清單', '/PTD/PTD001' + query, '', '', true);
+        hg.open('DN單查詢出貨清單', '/PTD/PTD001A' + query, '', '', true);
 
     };
 
diff --git a/AMESCoreStudio.Web/Views/PTD/PTD001A.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD001A.cshtml
new file mode 100644
index 00000000..cf9b36b7
--- /dev/null
+++ b/AMESCoreStudio.Web/Views/PTD/PTD001A.cshtml
@@ -0,0 +1,98 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+</style>
+
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-card-body">
+            <button type="button" onclick="tableToExcel('list','出貨清單')" class="layui-btn layui-btn-normal layui-btn-sm"><i class="fa fa-file-excel-o"></i>導出Excel</button>
+            <br />
+            <br />
+            @Html.Raw(ViewData["list"])
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+
+    function formatJSONDate(jsonDate) {
+        if (jsonDate == null) {
+            return "";
+        }
+        else {
+            var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
+            var myDate = new Date(date);
+            var yy = myDate.getFullYear();
+            var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
+            var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
+            var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
+            var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
+            var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
+            //mm + "/" + dd + " " +
+            //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
+            var output = yy + mm + dd + h + m + s;
+            // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
+            return output;
+        }
+    }
+
+    function base64(content) {
+        return window.btoa(unescape(encodeURIComponent(content)));
+    }
+
+    function tableToExcel(tableID, fileName) {
+        var table = document.getElementById(tableID);
+        var excelContent = table.innerHTML;
+        var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
+        excelFile += "<head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head>";
+        excelFile += "<body><table>";
+        excelFile += excelContent;
+        excelFile += "</table></body>";
+        excelFile += "</html>";
+        var link = "data:application/vnd.ms-excel;base64," + base64(excelFile);
+        var a = document.createElement("a");
+        a.download = fileName + formatJSONDate(Date.now().toString()) + ".xls";
+        a.href = link;
+        a.click();
+    }
+
+    function result() {
+        var dnNo = $("#dnNo").val();
+        var lineNo = $("#lineNo").val();
+
+        var query = "?dnNo=" + dnNo + "&lineNo=" + lineNo;
+        hg.open('DN單查詢出貨清單', '/PTD/PTD001' + query, '', '', true);
+
+    };
+
+</script>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 9314b7c6..833963cb 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -2521,7 +2521,8 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
             {
                 await connPTD.OpenAsync();
             }
-            string strSQL = $@"select DNNO,DNLineNO,ProductID,ShipQty,ShipCustomerID,SoldCustomerID,ExpectShipDate,CurrentShipDate
+            string strSQL = $@"select DNNO,DNLineNO,ProductID,ShipQty,ShipCustomerID,SoldCustomerID,ExpectShipDate ,
+                                    CurrentShipDate
                                  from SFIS_PTD.dbo.ZDNDetail where DNNO ='{dnNo}' and DNLineNO ='{lineNo}'";
             DataTable dtZDNDetail = new DataTable();
             using (var cmd = connPTD.CreateCommand())
@@ -2611,7 +2612,7 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
             foreach (DataRow dr in dtZProductTrans.Rows)
             {
                 string wip_sql = $@"SELECT '{dnNo}' as DN單號,WI.WIP_NO as WipNo,WA.ITEM_NO as ItemNO, BI.EXTRA_BARCODE_NO as ExtraBarcodeNo, BI.BARCODE_NO as BarcodeNo, BI.WIP_ID,
-                                    BI.BARCODE_ID,(select min(create_date) from jhames.wip_station where wip_id = BI.WIP_ID) StartDate
+                                    BI.BARCODE_ID,TO_CHAR((select min(create_date) from jhames.wip_station where wip_id = BI.WIP_ID),'YYYY-MM-DD HH24:MI:SS') StartDate
                                     FROM jhames.BARCODE_INFO BI, jhames.WIP_INFO WI, jhames.WIP_ATT WA
                                     WHERE BI.WIP_ID = WI.WIP_ID
                                     AND WI.WIP_NO = WA.WIP_NO