diff --git a/AMESCoreStudio.Web/Controllers/PTDController.cs b/AMESCoreStudio.Web/Controllers/PTDController.cs
index a28905a6..69efa219 100644
--- a/AMESCoreStudio.Web/Controllers/PTDController.cs
+++ b/AMESCoreStudio.Web/Controllers/PTDController.cs
@@ -271,6 +271,7 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 SelectListItem.Add(new SelectListItem(RecordType.ID.ToString() + "-" + RecordType.TypeName, RecordType.ID.ToString()));
             }
+            ViewBag.RecordTypeInfo = RecordTypes;
             ViewBag.RecordType = SelectListItem;
             ViewBag.Location = "9000";
             ViewBag.RecordDate = System.DateTime.Now.ToString("yyyy/MM/dd");
diff --git a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
index 0fa8050c..a5482409 100644
--- a/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
+++ b/AMESCoreStudio.Web/Views/PTD/PTD002.cshtml
@@ -212,10 +212,36 @@
     </script>
     <script type="text/javascript">
         //控項event
+        $('#recordNumber').on('keypress', function (event) {
+            if (event.keyCode == 13) {
+                var recordNumber = document.getElementById('recordNumber').value;
+                var recordType = document.getElementById('recordType').value;
+                var recordTypeInfo = @Html.Raw(Json.Serialize(ViewBag.RecordTypeInfo));
+                var filteredInfo = recordTypeInfo.find(function (info) {
+                    return info.id === recordType;
+                });
+                console.log(filteredInfo);
+                //check recordNumber
+                if (recordNumber.length !== filteredInfo.length) {
+                    layer.msg('請確認recordNumber碼長!', { icon: 2 });
+                    $("#recordNumber").val('');
+                    return;
+                }
+                // Check if recordNumber starts with prefixCode
+                var prefixCode = filteredInfo.prefixCode;
+                if (!recordNumber.startsWith(prefixCode)) {
+                    layer.msg('recordNumber開頭必須是:' + prefixCode, { icon: 2 });
+                    $("#recordNumber").val('');
+                    return;
+                }
+                var lineNo = document.getElementById('lineNo');
+                lineNo.focus();
+            }
+        });
         $('#lineNo').on('keypress', function (event) {
 
             if (event.keyCode == 13) {
-                     // 获取 recordNumber 和 lineNo 的值
+                // 获取 recordNumber 和 lineNo 的值
                 var recordNumber = document.getElementById('recordNumber').value;
                 var lineNo = document.getElementById('lineNo').value;
 
@@ -326,6 +352,8 @@
             var rbu = document.getElementById('RBU').value;
             var rmaNo = document.getElementById('RMANo').value;
             var recordDate = document.getElementById('recordDate').value;
+            var location = document.getElementById('Location').value;
+            var customer = document.getElementById('Customer').value;
 
             var tableData = layui.table.cache['query'];
 
@@ -335,6 +363,8 @@
                 rbu: rbu,
                 rmaNo: rmaNo,
                 recordDate: recordDate,
+                location: location,
+                customer: customer,
 
                 tableData: tableData
             };
@@ -347,10 +377,38 @@
                 data: { data: JSON.stringify(postData) },
                 type: 'POST',
                 success: function (result) {
+                    console.log("扣帳結果:");
                     console.log(result);
+                    if (result.data.success) {
+                        $.each(result.data.data, function (index, value) {
+                            // 找到要删除的行的索引
+                            var rowIndex = tableData.findIndex(function (row) {
+                                return row.sn === value;
+                            });
+
+                            // 从表格数据中删除该行
+                            if (rowIndex !== -1) {
+                                tableData.splice(rowIndex, 1);
+
+                                // 重新加载表格数据
+                                layui.table.reload('query', {
+                                    data: tableData,
+                                    page: false,
+                                    limit: 2000
+                                });
+
+                                calculateRowCount(tableData);
+                            } else {
+                                layer.msg('未找到要刪除的數據', { icon: 2 });
+                            }
+                        });
+                        layer.msg('扣帳成功!', { icon: 1 });
+                    } else {
+                        layer.msg('扣帳失敗，原因:' + result.data.msg, { icon: 2 });
+                    }  
                 },
                 error: function (error) {
-                    console.log(error);
+                    layer.msg('扣帳失敗!原因:' + error.msg, { icon: 2 });
                 }
             });
          });
@@ -393,7 +451,7 @@
             console.log(table);
             if (isSNAlreadyExist(tableId, rowData.sn)) {
                 // Handle the case where SN already exists
-                layer.msg('SN already exists in the table', { icon: 2 });
+                layer.msg('SN 已存在!', { icon: 2 });
                 return; // Do not add the row
             }
             // Add the new row data to the table
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index d5cfaa41..c929388d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -12,8 +12,8 @@ using System.Data.Common;
 using System.Data;
 using System.Dynamic;
 using Microsoft.Extensions.Configuration;
-using Microsoft.EntityFrameworkCore.SqlServer;
 using System.IO;
+using System.Collections.ObjectModel;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -2952,14 +2952,29 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
         #region "PTD002 PTD002 一段式入出庫作業"
         [Route("[action]")]
         [HttpPost]
-        public async Task<ResultModel<RecordTypeInfo>> PostPTD002Commit(RecordTypeInfo RecordTypeInfo)
+        public async Task<ResultModel<dynamic>> PostPTD002Commit(PTD002CommitDataModel Data)
         {
-            ResultModel<RecordTypeInfo> result = new ResultModel<RecordTypeInfo>();
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            List<string> SNList = new List<string>();
+            Collection<string> colSQL = new Collection<string>();
             try
             {
-                string strSQL = $@"INSERT INTO SFIS_PTD.dbo.RecordTypeInfo (ID, RBU, TypeName, TypeDesc, Source, PrefixCode, Length)
-                                    VALUES ({RecordTypeInfo.ID},'{RecordTypeInfo.RBU}', '{RecordTypeInfo.TypeName}', '{RecordTypeInfo.TypeDesc}', 
-                                            '{RecordTypeInfo.Source}', '{RecordTypeInfo.PrefixCode}', {RecordTypeInfo.Length})";
+                string strSQL = "";
+                string strRecordType = Data.RecordType;
+                string strRmaNo = Data.RmaNo;
+                string strRbu = Data.Rbu;
+                string strWorkCenter = Data.WorkCenter;
+                string strRecordDate = Data.RecordDate;
+                string strLocation = Data.Location;
+                string strCustomer = Data.Customer;
+                string strCreateDate = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss");
+                //若選擇 DOA 出貨(601DB)、DOA 還貨(657)，需加填 RMANo
+                if (strRecordType == "601DB" || strRecordType == "657")
+                {
+                    if (string.IsNullOrEmpty(strRmaNo))
+                        throw  new Exception("RMANo 不得為空!");
+                }
+
                 //安勤連線
                 PTDContext _ptd_context = new PTDContext();
                 DbConnection connPTD = _ptd_context.Database.GetDbConnection();
@@ -2968,18 +2983,104 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                     await connPTD.OpenAsync();
                 }
 
+                foreach (SNDataModel SNData in Data.TableData)
+                {
+                    string strLatest;
+                    //確認此出貨序號是否有ZHistoryKeyDefine
+                    strSQL = $@"select Seed FROM [SFIS_PTD].[dbo].[ZHistoryKeyDefine] where serialnumber ='{SNData.Sn}'";
+                    using (var cmd = connPTD.CreateCommand())
+                    {
+                        cmd.CommandText = strSQL;
+                        using (var reader = await cmd.ExecuteReaderAsync())
+                        {
+                            if (reader.Read())
+                            {
+                                int seed = Convert.ToInt32(reader["Seed"]);
+                                int nIdx = seed + 1;
+                                strLatest = SNData.Sn + nIdx.ToString().PadLeft(4, '0');//組成HistoryID
+                                //HistoryKeyDefine
+                                strSQL = @$"UPDATE [SFIS_PTD].[dbo].[ZHistoryKeyDefine]
+                                                SET [Seed] = {nIdx} where [SerialNumber]='{SNData.Sn}'";
+                                Console.WriteLine(strSQL);
+                                colSQL.Add(strSQL);
+                                //ZSNInfo
+                                strSQL = @$"Update SFIS_PTD..ZSNInfo SET LatestHistoryID='{strLatest}',RecordTypeID='{strRecordType}', 
+                                                                         CurrentProductID='{SNData.Material}'
+                                                    where SerialNumber='{SNData.Sn}'";
+                                Console.WriteLine(strSQL);
+                                colSQL.Add(strSQL);
+                            }
+                            else
+                            {
+                                strLatest = SNData.Sn + 1.ToString().PadLeft(4, '0');//組成HistoryID
+                                //ZHistoryKeyDefine
+                                strSQL = @$"INSERT INTO [SFIS_PTD].[dbo].[ZHistoryKeyDefine] ([SerialNumber],[Seed])
+                                            VALUES ('{SNData.Sn}',1)";
+                                Console.WriteLine(strSQL);
+                                colSQL.Add(strSQL);
+                                //ZSNInfo
+                                strSQL = @$"INSERT INTO [SFIS_PTD].[dbo].[ZSNInfo] ([SerialNumber],[CurrentProductID],[OriginalProductID],
+                                                                                    [LocationID],[LatestHistoryID],[RecordTypeID],
+                                                                                    [OwnerPlantID],[OwnerCompanyID],[CreatePlantID],[CreateCompanyID],
+                                                                                    [ModifyDate]) VALUES 
+                                                                                   ('{SNData.Sn}','{SNData.Material}','{SNData.Material}',
+                                                                                    '{strLocation}','{strLatest}','{strRecordType}',
+                                                                                    '{strWorkCenter}','{strRbu}','{strWorkCenter}','{strRbu}',
+                                                                                    '{strCreateDate}')";
+                                Console.WriteLine(strSQL);
+                                colSQL.Add(strSQL);
+                            }
+                            //ZProductTrans
+                            strSQL = $@"INSERT INTO [SFIS_PTD].[dbo].[ZProductTrans] 
+                                                    ([HistoryID],[SerialNumber],[RecordTypeID],[RecordNumber],[RCLineNO],[RecordDate],
+                                                     [ProductID],[IsChangeID],[LocationID],[EmplID],[IsDelete],
+                                                     [OwnerPlantID],[OwnerCompanyID],[CreatePlantID],[CreateCompanyID],
+                                                     [CreatorID],[CreateDate],[ModifierID],[ModifyDate],
+                                                     [chkflag],[IsBranchCoReceived]) VALUES 
+                                                    ('{strLatest}','{SNData.Sn}','{strRecordType}','{SNData.DnNo}','{SNData.LineNo}','{strRecordDate}',
+                                                     '{SNData.Material}',0,'{strLocation}','{strCustomer}',0,
+                                                     '{strWorkCenter}','{strRbu}','{strWorkCenter}','{strRbu}',
+                                                     'WH00','{strCreateDate}','WH00','{strCreateDate}',0,0)";
+                            Console.WriteLine(strSQL);
+                            colSQL.Add(strSQL);
+                            SNList.Add(SNData.Sn);
+                        }
+                    }
+                }
+
                 using (var cmd = connPTD.CreateCommand())
                 {
-                    cmd.CommandText = strSQL;
-                    cmd.ExecuteNonQuery();
+                    using (var transaction = connPTD.BeginTransaction())
+                    {
+                        try
+                        {
+                            foreach (string query in colSQL)
+                            {
+                                cmd.CommandText = query;
+                                cmd.Transaction = transaction;
+                                cmd.ExecuteNonQuery();
+                            }
+
+                            // Commit the transaction
+                            transaction.Commit();
+                        }
+                        catch (Exception ex)
+                        {
+                            // Rollback the transaction in case of an exception
+                            transaction.Rollback();
+                            throw ex; // Rethrow the exception after rollback
+                        }
+                    }
                 }
+
                 result.Success = true;
                 result.Msg = "OK";
+                result.Data = SNList;
             }
             catch (Exception ex)
             {
                 result.Success = false;
-                result.Msg = ex.InnerException.Message;
+                result.Msg = ex.Message;
             }
             return result;
 
@@ -3447,10 +3548,6 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                 throw e;
             }
         }
-
-
         #endregion
-
-
     }
 }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
index b976e69c..13540583 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
@@ -61,6 +61,28 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public string RecordDate { get; set; }
 
     }
+
+    public class PTD002CommitDataModel
+    {
+        public string RecordType { get; set; }
+        public string WorkCenter { get; set; }
+        public string Rbu { get; set; }
+        public string RmaNo { get; set; }
+        public string RecordDate { get; set; }
+        public string Location { get; set; }
+        public string Customer { get; set; }
+        public List<SNDataModel> TableData { get; set; }
+    }
+
+    public class SNDataModel
+    {
+        public int ItemNo { get; set; }
+        public string DnNo { get; set; }
+        public string LineNo { get; set; }
+        public string Material { get; set; }
+        public string Sn { get; set; }
+    }
+
     public class RecordTypeInfo
     {
         public int Mode { get; set; } = 0;