Yiru增加PTD的作業畫面

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -2230,6 +2230,19 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> FQC012DAsync(string inhouseNo, int seq)
         {
+            var FqcResultMaster = await _fqcApi.GetFqcResultMasterByInhouseNo(inhouseNo, seq);
+            if (FqcResultMaster.Count > 0)
+            {
+                int FQCID = FqcResultMaster.Select(s => s.FqcID).FirstOrDefault();
+                var FqcResultDetail = await _fqcApi.GetFqcResultDetail(FQCID);
+                foreach (var item in FqcResultDetail)
+                {
+                    await _fqcApi.DeleteFqcResultDetail(item.BarcodeNo, inhouseNo, seq, item.BoxNo);
+                }
+
+                await _fqcApi.DeleteFqcResultMaster(FQCID);
+
+            }
             var result = await _fqcApi.DeleteFqcInhouseDetail(inhouseNo, seq);
 
             var resultMaster = await _fqcApi.DeleteFqcInhouseMaster(inhouseNo, seq);

AMESCoreStudio.Web/Controllers/PDSController.cs

@@ -13,6 +13,7 @@ using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.Web.Models;
 using Newtonsoft.Json.Linq;
 using AMESCoreStudio.WebApi.Models.BAS;
+using System.Linq;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -66,6 +67,24 @@ namespace AMESCoreStudio.Web.Controllers
             }
             ViewBag.FlowRuleList = FlowRuleItems;
         }
+        private async Task GetFactoryInfo()
+        {
+            var result = await _pcsApi.GetFactoryInfo();
+
+            var FactoryInfo = new List<SelectListItem>();
+            result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.FactoryID).ToList();
+            for (int i = 0; i < result.Count; i++)
+            {
+                FactoryInfo.Add(new SelectListItem(result[i].FactoryNo + "-" + result[i].FactoryNameCh, result[i].FactoryID.ToString()));
+            }
+
+            if (FactoryInfo.Count == 0)
+            {
+                FactoryInfo.Add(new SelectListItem("N/A", null));
+            }
+
+            ViewBag.FactoryInfoList = FactoryInfo;
+        }
 
         [HttpPost]
         public async Task<JsonResult> GetUnitLineJson(string unit_no)
@@ -97,6 +116,26 @@ namespace AMESCoreStudio.Web.Controllers
             return View();
         }
 
+        public async Task<IActionResult> PDS012()
+        {
+            await GetFactoryInfo();
+
+
+            return View();
+        }
+        public async Task<IActionResult> PDS013()
+        {
+            await GetFactoryInfo();
+
+            return View();
+        }
+        public async Task<IActionResult> PDS014()
+        {
+            await GetFactoryInfo();
+
+            return View();
+        }
+
         [HttpPost]
         public async Task<IActionResult> PDS003SaveAsync(string unitNo,int lineId,int flowId,IFormFile formFile)
         {

AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs

@@ -500,6 +500,14 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpDelete("api/FqcResultDetail")]
         ITask<ResultModel<FqcResultDetail>> DeleteFqcResultDetail(string id, string inhouseNo, int seqID, string boxNo);
+
+        /// <summary>
+        /// 刪除 FQC抽驗資料
+        /// </summary>
+        /// <param name="id">FQCID</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpDelete("api/FqcResultMaster/{id}")]
+        ITask<ResultModel<FqcResultMaster>> DeleteFqcResultMaster(int id);
         #endregion
 
         #region FQC008 FQC查詢

AMESCoreStudio.Web/Views/PDS/PDS012.cshtml

@@ -0,0 +1,333 @@
+@{
+    ViewData["Title"] = "PTD入庫、出貨確認";
+    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-inline">
+                        <label class="layui-form-label">Recode Type:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select id="RecodeType" lay-event="RecodeType" lay-filter="RecodeType" lay-submit asp-items="@ViewBag.FactoryUnit">
+                                <option value="601">601出貨</option>
+                                <option value="101">101外購入庫</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">生產廠區:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select style="width:90px;" lay-filter="unitNo" lay-submit id="unitNo" name="unitNo" asp-items="@ViewBag.FactoryInfoList">
+                                <option value="">全部</option>
+                                <option value="">全部</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易單據:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="DN" name="DN" autocomplete="off" class="layui-input" placeholder="0082009027" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">Customer:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="Customer" name="Customer" autocomplete="off" class="layui-input" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">料號:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="PartNumber" name="PartNumber" autocomplete="off" class="layui-input" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm11">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">備貨日期:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="sdate" name="sdate" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="edate" name="edate" autocomplete="off" class="layui-input" readonly="">
+                            </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" id="querysubmit" lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-row">
+         
+
+            <div class="layui-form-item">
+                <div class="layui-inline" style="margin-right:0px;">
+                    <label class=" layui-inline layui-form-label" style="width:180px;">目前勾選項次 : 0  數量 : 0 PCS</label>
+                </div>
+                <div class="layui-inline layui-col-xs-offset6 layui-col-xs6">
+                    <div class="layui-btn-group" style="float: right;">
+                        <button id="btnSearch" class="layui-btn">確認出貨</button>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+            <div id="tableContainer"></div>
+            <table class="layui-hide" id="query" lay-filter="query"></table>
+        </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#sdate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+            laydate.render({
+                elem: '#edate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+
+
+
+        });
+
+        layui.use('table', function () {
+            var table = layui.table;
+
+            // 填充表格数据
+            var data = [
+                { checkbox: true, ITEM: '01',  DN: '0082009027', LINENO: '0010', Meterial: 'EMX-C246P-A1R', CUSTO: 'UPA-AUGEAN', QTY: '2'},
+                { checkbox: true, ITEM: '02',  DN: '0082009027', LINENO: '0020', Meterial: 'ACC-CPU-9500TER', CUSTO: 'UPA-AUGEAN', QTY: '2' },
+                { checkbox: true, ITEM: '03',  DN: '0082009027', LINENO: '0030', Meterial: 'UZM88F27', CUSTO: 'UPA-AUGEAN', QTY: '4' },
+                { checkbox: true, ITEM: '04',  DN: '0082009027', LINENO: '0010', Meterial: 'EAX-945G-A1-01R-A1R', CUSTO: '', QTY: '40'}
+            ];
+            var selectedCount = 0;
+
+            table.render({
+                elem: '#tableContainer',
+                data: data,
+                cols: [
+                    [
+                        { type: 'checkbox', fixed: 'left' },
+                        { field: 'ITEM', title: '項次' },
+                        { field: 'DN', title: '交易單號' },
+                        { field: 'LINENO', title: 'LineNO' },
+                        { field: 'Meterial', title: '料號' },
+                        { field: 'CUSTO', title: 'Customer' },
+                        { field: 'QTY', title: 'Qty' }
+                       
+                    ]
+                ],
+                done: function () {
+                  
+                    // 监听复选框选中事件
+                    table.on('checkbox(tableFilter)', function (obj) {
+                        if (obj.type === 'all') {
+                            // 全选/全不选
+                            selectedCount = obj.checked ? obj.data.length : 0;
+                        } else {
+                            // 单个复选框
+                            selectedCount += obj.checked ? 1 : -1;
+                        }
+
+                        // 更新选中项数
+                        updateSelectedCount();
+                    });
+                }
+            });
+
+            function updateSelectedCount() {
+                var countElem = $('#selectedCount');
+                countElem.text(selectedCount);
+            }
+        });
+
+        ////搜索
+        $('#querysubmit').click(function () {
+            console.log('#btnSearch');
+            var factoryNo = $("#factoryNo").val();
+            if (factoryNo) {
+                hg.msghide("刷新資料！");
+                tt();
+            }
+            else {
+                alert("請選擇廠別!!!!");
+            }
+            return false;
+
+        });
+
+
+        var tableCols = [[
+            {
+                field: 'exceptionDate',
+                title: '異常日期',
+                width: 100,
+                templet: '<div>{{ layui.util.toDateString(d.exceptionDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'lineID',
+                width: 50,
+                title: '線別',
+                sort: true
+            },
+            {
+                field: 'wipNo',
+                title: '歸屬工單',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'modelNo',
+                title: '歸屬機種',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'time',
+                title: '異常工時(Min)',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'personNameCh',
+                title: '判定描述(中文)',
+                width: 100,
+            },
+            {
+                field: 'decidUserID',
+                title: '判定負責人'
+            },
+            {
+                field: 'dutyDeptID',
+                title: '責任單位',
+                width: 100,
+
+            }
+            //,{
+            //    field: 'right',
+            //    width: 80,
+            //    title: '操作',
+            //    align: 'center',
+            //    fixed: 'right',
+            //    templet: function (d) {
+            //        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>'
+            //    }
+            //}
+        ]];
+        //通过行tool編輯，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.exceptionID) {
+                hg.open('修改異常工時', '/WHS/WHS009U/' + obj.data.exceptionID, 480,480);
+            }
+        }
+        //通过行tool刪除，lay-event="del"
+        function del(obj) {
+            if (obj.data.classID) {
+                hg.confirm("異常工時：" + obj.data.exceptionID + "，確定要刪除嗎？", function () {
+                    $.ajax({
+                        url: '/WHS/WHS009D',
+                        data: { id: obj.data.exceptionID },
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del(); //只删本地資料
+                                hg.msghide("刪除成功！");
+                            }
+                            else {
+                                hg.msg(data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("網路請求失敗！");
+                        }
+                    });
+                });
+            }
+        }
+
+        //基本資料表格
+        //var table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table;
+        //$(function () {
+        //    tt();
+        //});
+        function tt() {
+            //基本資料表格
+            var fNO = "", uNO = "", lID = "", dID = "";
+
+            fNO = $("#factoryNo").val();
+            uNO = $("#unitNo").val();
+            lID = $("#lineID").val();
+            dID = $("#deptID").val();
+
+
+            table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery?'
+                + 'factoryNo=' + fNO + '&unitNo=' + uNO + '&lineID=' + lID + '&deptID=' + dID  + '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val()
+                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        };                                                                              // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/PDS/PDS013.cshtml

@@ -0,0 +1,379 @@
+@{
+    ViewData["Title"] = "PTD備貨";
+    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;
+    }
+    .green-background {
+        background-color: lightgreen;
+    }
+    
+
+  
+</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-inline">
+                        <label class="layui-form-label">Recode Type:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select id="RecodeType" lay-event="RecodeType" lay-filter="RecodeType" lay-submit asp-items="@ViewBag.FactoryInfo">
+                                <option value="601">601出貨</option>
+                                <option value="101">101外購入庫</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">生產廠區:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select style="width:90px;" lay-filter="unitNo" lay-submit id="unitNo" name="unitNo" asp-items="@ViewBag.FactoryInfoList" class="layui-input  green-background">
+                                <option value="">全部</option>
+                                <option value="">全部</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">庫別:</label>
+                        <div class="layui-input-inline" style="width:100px">
+                            <input id="Location" name="Location" autocomplete="off" class="layui-input green-background" placeholder="TWM0" value="@ViewBag.WipNo">
+                        </div>
+                        <div class="layui-input-inline" style="width:100px">
+                            <input id="Locationdesc" name="Locationdesc" autocomplete="off" class="layui-input" placeholder="EV01" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline" style="width:100px">
+                            <input type="checkbox" id="StationTypeNo" lay-skin="primary" title="不分庫" />
+
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易單據:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="DN" name="DN" autocomplete="off" class="layui-input" placeholder="0082009027" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">Line NO:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="Line" name="Line" autocomplete="off" class="layui-input" placeholder="004" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">Location:</label>
+                        <div class="layui-input-inline" style="width:120px">
+                            <input id="Location" name="Location" autocomplete="off" class="layui-input" placeholder="9000" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">Customer:</label>
+                        <div class="layui-input-inline" style="width:120px">
+                            <input id="Customer" name="Customer" autocomplete="off" class="layui-input" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">料號:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="PartNumber" name="PartNumber" autocomplete="off" class="layui-input green-background" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                        <div class="layui-input-inline" style="width:550px">
+                            <input id="PartDesc" name="PartDesc" autocomplete="off" class="layui-input green-background" placeholder="料號說明" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+
+                    <div class="layui-inline" style="margin-right: 100px;">
+                        <label class="layui-form-label">資料群組:</label>
+                        <input type="radio" value="1" title="Box No" checked>
+                        <input type="radio" value="0" title="PCS">
+                    </div>
+
+                    <div class="layui-inline" style="margin-right: 150px;">
+                        <div class="layui-input-inline" style="width:100px">
+                            <input type="checkbox" id="StationTypeNo" lay-skin="primary" title="Begin=End" />
+
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">流水號碼長:</label>
+                        <div class="layui-input-inline" style="width:70px">
+                            <input id="Customer" name="Customer" autocomplete="off" class="layui-input" placeholder="4" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-card-body">
+
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline" >
+                            <div class="layui-input-inline" style="text-align:left;">
+                                <input type="radio" name="select" value="1" title="Scanner" />
+                            </div>
+                            <div class="layui-input-inline" style="margin-left: 0;">
+                                <input class="layui-input" autocomplete="off" />
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" autocomplete="off" />
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">備貨量:</label>
+                            <div class="layui-input-inline" style="width:70px">
+                                <input id="Customer" name="Customer" autocomplete="off" class="layui-input" placeholder="4" value="@ViewBag.WipNo">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <div class="layui-input-inline layui-col-sm4" style="text-align:left;">
+                                <input type="radio" name="select" value="0" title="Data" checked="" />
+                            </div>
+                            <div class="layui-input-inline">
+                                <textarea placeholder="SN-2023190011" class="layui-textarea"></textarea>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">作業備註</label>
+                            <div class="layui-input-block">
+                                <textarea placeholder="作業人員輸入備註" class="layui-textarea"></textarea>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+            <div class="layui-inline" style="margin-right:0px;">
+                <label class=" layui-inline layui-form-label" style="width:130px;">目前刷入數量 : 4 PCS</label>
+            </div>
+        </div>
+        <div id="tableContainer"></div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+        </div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#sdate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+            laydate.render({
+                elem: '#edate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+
+
+
+        });
+
+        // 初始化表格
+        layui.use('table', function () {
+            var table = layui.table;
+
+            // 填充表格数据
+            var data = [
+                { ITEM: '01', DN: '00282009027', LINENO: '0010', Meterial: 'EMX-C246PA1R', SN: 'SN-2023160081', DEL: '刪除'},
+                { ITEM: '02', DN: '00282009027', LINENO: '0010', Meterial: 'EMX-C246PA1R', SN: 'SN-2023160082', DEL: '刪除'},
+                { ITEM: '03', DN: '00282009027', LINENO: '0020', Meterial: 'ACC-CUP-9500TER', SN: 'SN-2023160066', DEL: '刪除'},
+            ];
+
+            table.render({
+                elem: '#tableContainer',
+                data: data,
+                cols: [
+                    [
+                        { field: 'ITEM', title: '項次' },
+                        { field: 'DN', title: 'DN單號' },
+                        { field: 'LINENO', title: 'LineNO' },
+                        { field: 'Meterial', title: '料號' },
+                        { field: 'SN', title: 'SN' },
+                        { field: 'DEL', title: '刪除' }
+                    ]
+                ]
+            });
+        });
+        ////搜索
+        $('#querysubmit').click(function () {
+            console.log('#btnSearch');
+            var factoryNo = $("#factoryNo").val();
+            if (factoryNo) {
+                hg.msghide("刷新資料！");
+                tt();
+            }
+            else {
+                alert("請選擇廠別!!!!");
+            }
+            return false;
+
+        });
+
+
+        var tableCols = [[
+            {
+                field: 'exceptionDate',
+                title: '異常日期',
+                width: 100,
+                templet: '<div>{{ layui.util.toDateString(d.exceptionDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'lineID',
+                width: 50,
+                title: '線別',
+                sort: true
+            },
+            {
+                field: 'wipNo',
+                title: '歸屬工單',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'modelNo',
+                title: '歸屬機種',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'time',
+                title: '異常工時(Min)',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'personNameCh',
+                title: '判定描述(中文)',
+                width: 100,
+            },
+            {
+                field: 'decidUserID',
+                title: '判定負責人'
+            },
+            {
+                field: 'dutyDeptID',
+                title: '責任單位',
+                width: 100,
+
+            }
+            //,{
+            //    field: 'right',
+            //    width: 80,
+            //    title: '操作',
+            //    align: 'center',
+            //    fixed: 'right',
+            //    templet: function (d) {
+            //        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>'
+            //    }
+            //}
+        ]];
+        //通过行tool編輯，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.exceptionID) {
+                hg.open('修改異常工時', '/WHS/WHS009U/' + obj.data.exceptionID, 480,480);
+            }
+        }
+        //通过行tool刪除，lay-event="del"
+        function del(obj) {
+            if (obj.data.classID) {
+                hg.confirm("異常工時：" + obj.data.exceptionID + "，確定要刪除嗎？", function () {
+                    $.ajax({
+                        url: '/WHS/WHS009D',
+                        data: { id: obj.data.exceptionID },
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del(); //只删本地資料
+                                hg.msghide("刪除成功！");
+                            }
+                            else {
+                                hg.msg(data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("網路請求失敗！");
+                        }
+                    });
+                });
+            }
+        }
+
+        //基本資料表格
+        //var table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table;
+        //$(function () {
+        //    tt();
+        //});
+        function tt() {
+            //基本資料表格
+            var fNO = "", uNO = "", lID = "", dID = "";
+
+            fNO = $("#factoryNo").val();
+            uNO = $("#unitNo").val();
+            lID = $("#lineID").val();
+            dID = $("#deptID").val();
+
+
+            table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery?'
+                + 'factoryNo=' + fNO + '&unitNo=' + uNO + '&lineID=' + lID + '&deptID=' + dID  + '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val()
+                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        };                                                                              // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/PDS/PDS014.cshtml

@@ -0,0 +1,299 @@
+@{
+    ViewData["Title"] = "PTD查詢";
+    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-inline">
+                        <label class="layui-form-label">Recode Type:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select id="RecodeType" lay-event="RecodeType" lay-filter="RecodeType" lay-submit asp-items="@ViewBag.FactoryUnit">
+                                <option value="601">601出貨</option>
+                                <option value="101">101外購入庫</option>
+                            </select>
+                        </div>
+                    </div>
+
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">生產廠區:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <select style="width:90px;" lay-filter="unitNo" lay-submit id="unitNo" name="unitNo" asp-items="@ViewBag.FactoryInfoList">
+                                <option value="">全部</option>
+                                <option value="">全部</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易單據:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="DN" name="DN" autocomplete="off" class="layui-input" placeholder="0082009027" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">Customer:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="Customer" name="Customer" autocomplete="off" class="layui-input" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">料號:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="PartNumber" name="PartNumber" autocomplete="off" class="layui-input" placeholder="UPA-AUGEAN" value="@ViewBag.WipNo">
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm11">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">備貨日期:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="sdate" name="sdate" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="edate" name="edate" autocomplete="off" class="layui-input" readonly="">
+                            </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" id="querysubmit" lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="tableContainer"></div>
+        <table class="layui-hide" id="query" lay-filter="query"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#sdate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+            laydate.render({
+                elem: '#edate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
+
+
+
+        });
+
+        // 初始化表格
+        layui.use('table', function () {
+            var table = layui.table;
+
+            // 填充表格数据
+            var data = [
+                { ITEM: '01', TYPE: '601-出貨', DN: '0082009027', LINENO: '0010', Meterial: 'EMX-C246P-A1R', CUSTO: 'UPA-AUGEAN', QTY: '2',   Location: '9000', USER: 'AAA',  date: '2023-05-05',  view: '檢視' },
+                { ITEM: '02', TYPE: '601-出貨', DN: '0082009027', LINENO: '0020', Meterial: 'ACC-CPU-9500TER', CUSTO: 'UPA-AUGEAN', QTY: '2', Location: '9000', USER: 'AAA', date: '2023-05-05', view: '檢視' },
+                { ITEM: '03', TYPE: '601-出貨', DN: '0082009027', LINENO: '0030', Meterial: 'UZM88F27', CUSTO: 'UPA-AUGEAN', QTY: '4', Location: '9000', USER: 'AAA', date: '2023-05-05', view: '檢視' },
+                { ITEM: '04', TYPE: '101-外購入庫', DN: '0082009027', LINENO: '0010', Meterial: 'EAX-945G-A1-01R-A1R', CUSTO: '', QTY: '40', Location: '9000', USER: 'CCC', date: '2023-04-28', view: '檢視' }
+            ];
+
+
+            table.render({
+                elem: '#tableContainer',
+                data: data,
+                cols: [
+                    [
+                        { field: 'ITEM', title: '項次' },
+                        { field: 'TYPE', title: '交易型態' },
+                        { field: 'DN', title: '交易單號' },
+                        { field: 'LINENO', title: 'LineNO' },
+                        { field: 'Meterial', title: '料號' },
+                        { field: 'CUSTO', title: 'Customer' },
+                        { field: 'QTY', title: 'Qty' },
+                        { field: 'Location', title: 'Location' },
+                        { field: 'USER', title: '交易人' },
+                        { field: 'date', title: '交易日' },
+                        { field: 'view', title: '檢示' }
+                    ]
+                ]
+            });
+        });
+
+        ////搜索
+        $('#querysubmit').click(function () {
+            console.log('#btnSearch');
+            var factoryNo = $("#factoryNo").val();
+            if (factoryNo) {
+                hg.msghide("刷新資料！");
+                tt();
+            }
+            else {
+                alert("請選擇廠別!!!!");
+            }
+            return false;
+
+        });
+
+
+        var tableCols = [[
+            {
+                field: 'exceptionDate',
+                title: '異常日期',
+                width: 100,
+                templet: '<div>{{ layui.util.toDateString(d.exceptionDate, "yyyy/MM/dd") }}</div>'
+            },
+            {
+                field: 'lineID',
+                width: 50,
+                title: '線別',
+                sort: true
+            },
+            {
+                field: 'wipNo',
+                title: '歸屬工單',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'modelNo',
+                title: '歸屬機種',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'time',
+                title: '異常工時(Min)',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'personNameCh',
+                title: '判定描述(中文)',
+                width: 100,
+            },
+            {
+                field: 'decidUserID',
+                title: '判定負責人'
+            },
+            {
+                field: 'dutyDeptID',
+                title: '責任單位',
+                width: 100,
+
+            }
+            //,{
+            //    field: 'right',
+            //    width: 80,
+            //    title: '操作',
+            //    align: 'center',
+            //    fixed: 'right',
+            //    templet: function (d) {
+            //        return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>'
+            //    }
+            //}
+        ]];
+        //通过行tool編輯，lay-event="edit"
+        function edit(obj) {
+            if (obj.data.exceptionID) {
+                hg.open('修改異常工時', '/WHS/WHS009U/' + obj.data.exceptionID, 480,480);
+            }
+        }
+        //通过行tool刪除，lay-event="del"
+        function del(obj) {
+            if (obj.data.classID) {
+                hg.confirm("異常工時：" + obj.data.exceptionID + "，確定要刪除嗎？", function () {
+                    $.ajax({
+                        url: '/WHS/WHS009D',
+                        data: { id: obj.data.exceptionID },
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del(); //只删本地資料
+                                hg.msghide("刪除成功！");
+                            }
+                            else {
+                                hg.msg(data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("網路請求失敗！");
+                        }
+                    });
+                });
+            }
+        }
+
+        //基本資料表格
+        //var table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table;
+        //$(function () {
+        //    tt();
+        //});
+        function tt() {
+            //基本資料表格
+            var fNO = "", uNO = "", lID = "", dID = "";
+
+            fNO = $("#factoryNo").val();
+            uNO = $("#unitNo").val();
+            lID = $("#lineID").val();
+            dID = $("#deptID").val();
+
+
+            table = hg.table.datatable('query', '異常工時資料維護', '/WHS/GetExceptionWorktimeByQuery?'
+                + 'factoryNo=' + fNO + '&unitNo=' + uNO + '&lineID=' + lID + '&deptID=' + dID  + '&sdate=' + $("#sdate").val() + '&edate=' + $("#edate").val()
+                , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        };                                                                              // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs

@@ -278,19 +278,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             ResultModel<FqcInhouseDetail> result = new ResultModel<FqcInhouseDetail>();
 
-            var fqcInhouseDetail = await _context.FqcInhouseDetails.Where(p => p.InhouseNo == no && p.SeqID == seq).FirstOrDefaultAsync();
+            var fqcInhouseDetail = await _context.FqcInhouseDetails.Where(p => p.InhouseNo == no && p.SeqID == seq).ToListAsync();
             if (fqcInhouseDetail == null)
             {
 
-                return fqcInhouseDetail;
+                return fqcInhouseDetail.FirstOrDefault();
             }
 
-            _context.FqcInhouseDetails.Remove(fqcInhouseDetail);
+            _context.FqcInhouseDetails.RemoveRange(fqcInhouseDetail);
             await _context.SaveChangesAsync();
 
-            return fqcInhouseDetail;
+            return fqcInhouseDetail.FirstOrDefault();
         }
 
+
         private bool FqcInhouseDetailExists(string id)
         {
             return _context.FqcInhouseDetails.Any(e => e.InhouseNo == id);

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -516,7 +516,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         //YIRU ADD  -----------------------------------------------------------------------------------------------------------------------------------------------
         /// <summary>
-        /// FQC查詢 by Table
+        /// FQC查詢 by TableD
         /// </summary>
         /// <param name="barcodeNo">內部序號</param>
         /// <param name="wipNo">工單號碼</param>

AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs

@@ -92,7 +92,9 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             result.abnormalTime = double.Parse(errTime.ToString("0.00"));
 
             //直通率：GetWipStation4QRS014GroupALL
-            var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, null, null);
+            //2023-07-11 BB.Wang Modify 安勤 Jason反映只要查安勤產線即可
+            //var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, null, null);
+            var d = await new WipStationController(_context).GetWipStation4QRS014GroupALL(null, sDate, eDate, null, "YS00", null);
             if (d.DataTotal > 0)
             {
                 double sum_rate = 100.0;
@@ -225,7 +227,9 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
 
 
             //FQC
-            var f = await new FqcResultMasterController(_context).GetFQCHeaderData4QRS016(null, null, null, sDate, eDate, null);
+            //2023-07-11 BB.Wang Modify 安勤 Jason反映只要查安勤產線即可
+            //var f = await new FqcResultMasterController(_context).GetFQCHeaderData4QRS016(null, null, null, sDate, eDate, null);
+            var f = await new FqcResultMasterController(_context).GetFQCHeaderData4QRS016(null, null, null, sDate, eDate, "1001");
             if (f.DataTotal > 0)
             {
                 int sumFqcCnt = 0, sumFqcPassCnt = 0, sumFqcFailCnt = 0;