PTD 需求項目更新(還原作業、一段式)

AMESCoreStudio.Web/Controllers/PTDController.cs

@@ -131,7 +131,7 @@ namespace AMESCoreStudio.Web.Controllers
                                         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;出貨料號</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;生產序號</td>";
@@ -559,5 +559,30 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
+        #region "PTD008 還原作業"
+        public async Task<IActionResult> PTD008()
+        {
+            return View();
+        }
+        public async Task<IActionResult> PTD008QueryAsync(string recordNumber, string lineNo, string materialNo, string shippingSN)
+        {
+            if (string.IsNullOrEmpty(recordNumber) || string.IsNullOrEmpty(lineNo) || string.IsNullOrEmpty(materialNo))
+                return Json(new Table() { count = 0, data = null });
+
+            var result = await _pcsApi.GetData4PTD008(recordNumber, lineNo, materialNo, shippingSN);
+            if (result.DataTotal > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+            return Json(new Table() { count = 0, data = null, msg = result.Msg });
+        }
+        [HttpPost]
+        public async Task<JsonResult> PTD008_Commit(string data)
+        {
+            var result = await _pcsApi.PostPTD008Commit(data);
+            //将数据Json化并传到前台视图
+            return Json(new { data = result });
+        }
+        #endregion
     }
 }

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -2019,5 +2019,12 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpPost("api/WipInfos/PostPTD007Commit")]
         ITask<ResultModel<dynamic>> PostPTD007Commit([FromBody, RawJsonContent] string model);
         #endregion
+
+        #region "PTD008 還原作業"
+        [WebApiClient.Attributes.HttpGet("api/WipInfos/GetData4PTD008")]
+        ITask<ResultModel<dynamic>> GetData4PTD008(string recordNumber, string lineNo, string materialNo, string shippingSN);
+        [WebApiClient.Attributes.HttpPost("api/WipInfos/PostPTD008Commit")]
+        ITask<ResultModel<dynamic>> PostPTD008Commit([FromBody, RawJsonContent] string model);
+        #endregion
     }
 }

AMESCoreStudio.Web/Views/PTD/PTD002.cshtml

@@ -277,14 +277,32 @@
             if (event.keyCode == 13) {
                 var endSN = document.getElementById('endSN');
                 var frontSN = document.getElementById('frontSN');
+                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;
                 
-                endSN.focus();
-                endSN.select();
 
                 if (document.getElementById('PCSUnit').checked) {
-                    endSN.value = frontSN.value;
+                    rowAmount++;
-                }
+                    var newRowData = {
+                        itemNo: rowAmount,
+                        dnNo: dnNo.value,
+                        lineNo: lineNo.value,
+                        material: material.value,
+                        sn: frontSN.value
+                    };
+                    // Add the new row data to the table
+                    hg.table.addRow('query', newRowData);
 
+                    frontSN.focus();
+                    frontSN.select();
+                }
+                else {
+                    endSN.focus();
+                    endSN.select();
+                }
             }
         });
         $('#endSN').on('keypress', function (event) {
@@ -403,6 +421,12 @@
                             }
                         });
                         layer.msg('扣帳成功!', { icon: 1 });
+
+                        //清空SN資訊
+                        $("#endSN").val('');
+                        $("#frontSN").val('');
+                        $("#SNData").val('');
+
                     } else {
                         layer.msg('扣帳失敗，原因:' + result.data.msg, { icon: 2 });
                     }  
@@ -567,7 +591,7 @@
             }
         ]];
         //基本数据表格
-        var table = hg.table.datatable('query', '扣帳資訊', '', {}, tableCols, toolbar, false, 'full-100');
+        var table = hg.table.datatable('query', '扣帳資訊', '', {}, tableCols, "", false, 'full-100');
 
     </script>
 }

AMESCoreStudio.Web/Views/PTD/PTD008.cshtml

@@ -0,0 +1,238 @@
+@{
+    ViewData["Title"] = "還原作業";
+    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-form">
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-md9">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">交易單據:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="recordNumber" name="RecordNumber" autocomplete="off" class="layui-input" value="@ViewBag.RecordNumber">
+                            </div>
+                            <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" value="@ViewBag.LineNo">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">料號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="materialNo" name="MaterialNo" autocomplete="off" class="layui-input" value="@ViewBag.MaterialNo">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">Shipping SN:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="shippingSN" name="ShippingSN" autocomplete="off" class="layui-input" value="@ViewBag.ShippingSN">
+                            </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">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-inline" style="flex: 1; width: 100%; text-align: right;">
+                    <label id="rowCount" class="layui-inline layui-form-label" style="width: 130px; text-align: left; color: red;">數量 : 0 pcs</label>
+                    <div class="layui-input-block">
+                        <input type="submit" id="commit" value="還原作業" class="layui-btn" />
+                        <input type="submit" id="del" value="刪除" class="layui-btn" />
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+</div>
+
+
+@section Scripts{
+   
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'table'], function () {
+            var table = layui.table;
+           $('#commit').on('click', function () {
+                var tableData = table.cache['query'];
+
+                for (let i = 0; i < tableData.length; i++) {
+                    (function (index) {  // 使用閉包或函數參數傳遞 index
+                        var postData = {
+                            type: 0,
+                            tableData: [tableData[index]]
+                        };
+
+                        $.ajax({
+                            url: '@Url.Action("PTD008_Commit", "PTD")',
+                            dataType: 'json',
+                            data: { data: JSON.stringify(postData) },
+                            type: 'POST',
+                            success: function (result) {
+                                if (result.data.success) {
+
+                                    console.log(tableData[index]);
+                                    // 更新當前元素的 'result' 屬性
+                                    tableData[index].result = 'OK';
+                                    console.log(tableData[index]);
+
+                                    // 使用更新後的數據重新加載表格
+                                    layui.table.reload('query', {
+                                        data: tableData,
+                                        page: false,
+                                        limit: 2000
+                                    });
+                                } else {
+                                    layer.msg('還原失敗，原因:' + result.data.msg, { icon: 2 });
+                                }
+                            },
+                            error: function (error) {
+                                layer.msg('還原失敗!原因:' + error.msg, { icon: 2 });
+                            }
+                        });
+                    })(i);  // 將 i 值傳遞進來
+                }
+            });
+
+           $('#del').on('click', function () {
+                var tableData = table.cache['query'];
+
+                for (var i = 0; i < tableData.length; i++) {
+                    var postData = {
+                        type: 1,
+                        tableData: [tableData[i]]
+                    };
+
+                    $.ajax({
+                        url: '@Url.Action("PTD008_Commit", "PTD")',
+                        dataType: 'json',
+                        data: { data: JSON.stringify(postData) },
+                        type: 'POST',
+                        success: function (result) {
+                            if (result.data.success) {
+                                // 更新該筆資料的result欄位值
+                                tableData[i].result = 'OK';
+
+                                // 重新加载表格数据
+                                layui.table.reload('query', {
+                                    data: tableData,
+                                    page: false,
+                                    limit: 2000
+                                });
+                            } else {
+                                layer.msg('還原失敗，原因:' + result.data.msg, { icon: 2 });
+                            }
+                        },
+                        error: function (error) {
+                            layer.msg('還原失敗!原因:' + error.msg, { icon: 2 });
+                        }
+                    });
+                }
+             });
+
+        });
+
+
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            hg.msghide("載入資料..");
+            table && table.reload(data);
+            $("#rowCount").html("數量 : " + getTableRowCount() + " pcs");
+        });
+
+        function getTableRowCount() {
+            var tableData = layui.table.cache['query'];
+            return tableData.length;
+        }
+
+        var tableCols = [[
+            {
+                field: 'recordNumber',
+                width: 160,
+                title: '交易單據',
+                sort: true
+            },
+            {
+                field: 'lineNo',
+                width: 120,
+                title: 'LineNo',
+                sort: true
+            },
+            {
+                field: 'productID',
+                title: 'Material(料號)',
+                width: 160,
+                sort: true
+            },
+            {
+                field: 'sn',
+                width: 160,
+                title: 'SN',
+                sort: true
+            },
+            {
+                field: 'recordTypeID',
+                width: 100,
+                title: '狀態',
+                sort: true
+            },
+            {
+                field: 'result',
+                width: 100,
+                title: '執行結果'
+            }
+        ]];
+
+        //基本数据表格
+        var table = hg.table.datatable('query', '還原作業', '/PTD/PTD008Query', {}, tableCols, "", false, 'full-100');
+
+    </script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -3976,5 +3976,170 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
 
         }
         #endregion
+
+        #region "PTD008 還原作業"
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetData4PTD008( string recordNumber, string lineNo, string materialNo, string shippingSN)
+        {
+            try
+            {
+                ResultModel<dynamic> result = new ResultModel<dynamic>();
+                //安勤連線
+                PTDContext _ptd_context = new PTDContext();
+                DbConnection connPTD = _ptd_context.Database.GetDbConnection();
+                if (connPTD.State != ConnectionState.Open)
+                {
+                    await connPTD.OpenAsync();
+                }
+                string strSQL = $@"SELECT RecordTypeID,RecordNumber,RCLineNO 'LineNo',
+                                          SerialNumber 'SN',ProductID 
+                                   FROM  SFIS_PTD.dbo.ZProductTrans where RecordNumber ='{recordNumber}' And RCLineNO ='{lineNo}'
+                                                                   And ProductID = '{materialNo}'";
+                if (shippingSN != null && shippingSN != "")
+                {
+                    strSQL += $" And SerialNumber = '{shippingSN}'";
+                }
+
+                DataTable dtZProductTrans = new DataTable();
+                using (var cmd = connPTD.CreateCommand())
+                {
+                    cmd.CommandText = strSQL;
+
+                    using (var reader = await cmd.ExecuteReaderAsync())
+                    {
+                        if (reader.HasRows)
+                        {
+                            dtZProductTrans = DataReaderToDataTable(reader);
+                        }
+                    }
+                }
+
+                List<dynamic> list = new List<dynamic>();
+                foreach (DataRow row in dtZProductTrans.Rows)
+                {
+                    dynamic dyn = new ExpandoObject();
+                    list.Add(dyn);
+                    foreach (DataColumn column in dtZProductTrans.Columns)
+                    {
+                        var dic = (IDictionary<string, object>)dyn;
+                        dic[column.ColumnName] = row[column];
+                    }
+                }
+
+                result.DataTotal = list.Count();
+                result.Data = list;
+
+                if (result == null)
+                {
+                    result.Msg = "查無資料";
+                    result.Success = false;
+                    return result;
+                }
+
+                result.Success = true;
+                result.Msg = "OK";
+                return result;
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }
+        }
+        [Route("[action]")]
+        [HttpPost]
+        public async Task<ResultModel<dynamic>> PostPTD008Commit(PTD008CommitDataModel Data)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            Collection<string> colSQL = new Collection<string>();
+            try
+            {
+                string strSQL = "";
+                string strCreateDate = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss");
+
+                //安勤連線
+                PTDContext _ptd_context = new PTDContext();
+                DbConnection connPTD = _ptd_context.Database.GetDbConnection();
+                if (connPTD.State != ConnectionState.Open)
+                {
+                    await connPTD.OpenAsync();
+                }
+
+                foreach (PTD008TableDataModel SNData in Data.tableData)
+                {
+
+                    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 ";
+                        using (var cmd = connPTD.CreateCommand())
+                        {
+                            cmd.CommandText = strSQL;
+                            using (var reader = await cmd.ExecuteReaderAsync())
+                            {
+                                if (reader.Read())
+                                {
+                                    strSQL = $"Update [SFIS_PTD].[dbo].[ZSNInfo] set RecordTypeID ='{reader["RecordTypeID"]}',ModifyDate ='{reader["ModifyDate"]}',LatestHistoryID ='{reader["HistoryID"]}' " +
+                                                     $"where SerialNumber ='{SNData.sn}'";
+                                    colSQL.Add(strSQL);
+                                }
+                                else
+                                {
+                                    strSQL = $"Delete [SFIS_PTD].[dbo].[ZSNInfo] where SerialNumber ='{SNData.sn}'";
+                                    colSQL.Add(strSQL);
+                                }
+                            }
+                        }
+                    }
+                    else if (SNData.recordTypeID != "292"
+                          && SNData.recordTypeID != "101") //狀態為 292 樣品入庫、101 樣品入庫 才能刪除
+                    {
+                        throw new Exception(SNData.recordTypeID + "狀態不能刪除!");
+                    }
+
+                    strSQL = $"Delete [SFIS_PTD].[dbo].[ZProductTrans] " +
+                             $"where [SerialNumber] = '{SNData.sn}' " +
+                             $"and RecordNumber = '{SNData.recordNumber}' and RCLineNO ='{SNData.lineNo}' " +
+                             $"and ProductID ='{SNData.productID}'";
+                    colSQL.Add(strSQL);
+                }
+
+                using (var cmd = connPTD.CreateCommand())
+                {
+                    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";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.Message;
+            }
+            return result;
+        }
+        #endregion
     }
 }

AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs

@@ -117,6 +117,25 @@ namespace AMESCoreStudio.WebApi.Models.AMES
     }
 
 
+    #endregion
+
+    #region "PTD008 還原作業"
+
+    public class PTD008CommitDataModel
+    {
+        public int type { get; set; }
+        public List<PTD008TableDataModel> tableData { get; set; }
+    }
+    public class PTD008TableDataModel
+    {
+        public string recordNumber { get; set; }
+        public string lineNo { get; set; }
+        public string productID { get; set; }
+        public string sn { get; set; }
+        public string recordTypeID { get; set; }
+        public string result { get; set; }
+    }
+
     #endregion
 
     #region "PTD006 備貨作業"