diff --git a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
index b82fdd10..69d89ca4 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
@@ -449,7 +449,38 @@
                 }
             });
          });
+        $('#StockQty').on('keypress', function (event) {
+            if (event.keyCode == 13 && document.getElementById('pcs').checked && !document.getElementById('PCSUnit').checked) {
+                var frontSN = document.getElementById('frontSN');
+                var StockQty = document.getElementById('StockQty');
+                var dnNo = document.getElementById('recordNumber');
+                var lineNo = document.getElementById('lineNo');
+                var material = document.getElementById('PartNumber');
+                var table = layui.table;
+                var rowAmount = table.cache['query'].length;
+
+                var prefixCode = frontSN.value.slice(0, -5);
+                var currentSN = parseInt(frontSN.value.slice(-5));
 
+                for (var i = 1; i <= parseInt(StockQty.value); i++) {
+                    rowAmount++;
+                    var newRowData = {
+                        itemNo: rowAmount,
+                        dnNo: dnNo.value,
+                        lineNo: lineNo.value,
+                        material: material.value,
+                        sn: prefixCode + currentSN.toString().padStart(5, "0")
+                    };
+                    // Add the new row data to the table
+                    hg.table.addRow('query', newRowData);
+                    currentSN++;
+                }
+
+                frontSN.focus();
+                frontSN.select();
+
+            }
+        });
         function getItemDesc(itemNo) {
             $.ajax({
                 url: "/BAS/GetMaterialItemByItemNO",
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 559df11b..d6306da1 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -4726,9 +4726,27 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
                     if (Data.type == 0) //還原
                     {
-                        strSQL = $"Select HistoryID,RecordTypeID,ModifyDate from [SFIS_PTD].[dbo].[ZProductTrans] " +
-                                $"where [SerialNumber] = '{SNData.sn}' " +
-                                $"Order by HistoryID desc offset 1 row fetch next 1 rows only ";
+                        //SQL Server 2012後才能使用
+                        //strSQL = $"Select HistoryID,RecordTypeID,ModifyDate from [SFIS_PTD].[dbo].[ZProductTrans] " +
+                        //        $"where [SerialNumber] = '{SNData.sn}' " +
+                        //        $"Order by HistoryID desc offset 1 row fetch next 1 rows only ";
+
+                        strSQL = $@"WITH RankedResults AS (
+                                        SELECT 
+                                            HistoryID, 
+                                            RecordTypeID, 
+                                            ModifyDate,
+                                            ROW_NUMBER() OVER (ORDER BY HistoryID DESC) AS RowNum
+                                        FROM [SFIS_PTD].[dbo].[ZProductTrans]
+                                        WHERE [SerialNumber] = '{SNData.sn}'
+                                    )
+                                    SELECT
+                                        HistoryID,
+                                        RecordTypeID,
+                                        ModifyDate
+                                    FROM RankedResults
+                                    WHERE RowNum = 2";
+
                         using (var cmd = connPTD.CreateCommand())
                         {
                             cmd.CommandText = strSQL;