1.

3 years ago · 277f8ad83f
5 changed files with 108 additions and 48 deletions
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@ -943,16 +943,15 @@ namespace AMESCoreStudio.Web.Controllers
        }

        [HttpPost]
-        public ActionResult FQC009CAsync(string ids , string itemNo)
+        public ActionResult FQC009CAsync(string ids, string itemNo)
        {
            return View();
        }

        [HttpGet]
-        public async Task<IActionResult> FQC009ItemQueryAsync(int groupID = 0, int page = 0, int limit = 10)
+        public async Task<IActionResult> FQC009ItemQueryAsync(int groupID = 0, int page = 0, int limit = 1, string itemID = null)
        {
-            var result = await _fqcApi.GetQcItemQuery(groupID, page, limit);
-
+            var result = await _fqcApi.GetQcItemQuery(groupID, 0, limit);
            if (result.Data.Count() != 0)
            {
                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
--- a/AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC009C.cshtml
@ -1,7 +1,7 @@
@model AMESCoreStudio.WebApi.Models.AMES.QcGroup


-@{ ViewData["Title"] = "FQC009C";
+@{ ViewData["Title"] = "料號檢驗工項新增";
    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }

 <style>
@ -11,30 +11,38 @@
 </style>

 <div class="layui-card">
-    <div class="row">
+    <div class="layui-card-header">
        <div class="layui-form">
-            <div class="text-danger"></div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">料號</label>
-                <div class="layui-input-block">
-                    <input name="itemNo" class="layui-input" autocomplete="off" placeholder="請輸入料號" />
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">料號:</label>
+                    <div class="layui-input-inline">
+                        <input id="itemNo" name="itemNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
+                    </div>
                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <table class="layui-hide" id="tableQuery" name="tableQuery" lay-filter="tableQuery"></table>
-            </div>
-
-            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-            <div class="layui-row" style="text-align:center">
-                <div class="layui-col-md12">
-                    <input type="submit" value="保存" class="layui-btn" />
+                <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-card-body">
+        <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+        <table class="layui-hide" id="tableQuery" name="tableQuery" lay-filter="tableQuery"></table>
+    </div>
 </div>
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm layui-btn" lay-event="add"><i class="layui-icon">&#xe640;</i>保存</button>
+    </div>
+</script>
+
+

@section Scripts {
    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
@ -42,6 +50,9 @@

    <script type="text/javascript">

+        hg.form.onsubmit('querysubmit', function (data) {
+            tableIns.reload(data);
+        });

        layui.use(['form', 'table'], function () {
            //记录当前页数据的临时变量
@ -51,35 +62,68 @@
            table = layui.table;
            form = layui.form;

-            @*table.render({ //其它参数在此省略
+            //方法級渲染
+            var tableIns = table.render({ //其它参数在此省略
                elem: '#tableQuery',
                url: "@Url.Action("FQC009ItemQuery", "FQC")",
                title: '檢驗工項',
                id:'itemID',
                page: false, //开启分页
-                toolbar: Toolbar,
+                toolbar: '#toolbarDemo',
                limits: [20, 50, 100],
                defaultToolbar: ['filter', 'print', 'exports'],
-                cols: tableCols
-                //done: function (res, curr, count) {
-                //    //如果是异步请求数据方式，res即为你接口返回的信息。
-                //    id_lists = res.data;
-                //    //记录当前也选中的chechbox个数(判断全选使用的)
-                //    var len = 0;
-                //    //遍历当前页数据，对比已选中项中的 id
-                //    for (var index = 0; index < id_lists.length; index++) {
-                //        if (layui.data('checked', id_lists[index]['itemID'])) {
-                //            //逐个判断是否选中，如果已经选中就改变选中模式
-                //            var i = id_lists[index]['LAY_TABLE_INDEX'];
-                //            var checkbox = $('.layui-table tr[data-index=' + i + '] input[type="checkbox"]');
-                //            checkbox.prop('checked', true);
-                //            checkbox.next().addClass('layui-form-checked');
-                //            //为了设置全选的
-                //            len++;
-                //        }
-                //    }
-                //}
-            });*@
+                cols: tableCols,
+                done: function (res, curr, count) {
+                    //在快取中找到PM_CODE ,然後設定data表格中的選中狀態
+                    //迴圈所有資料，找出對應關係，設定checkbox選中狀態
+                    for (var i = 0; i < res.data.length; i++) {
+                        if (res.data[i].check) {
+                                //這裡才是真正的有效勾選
+                                res.data[i]["LAY_CHECKED"] = 'true';
+                                //找到對應資料改變勾選樣式，呈現出選中效果
+                                var index = res.data[i]['LAY_TABLE_INDEX'];
+                                $('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
+                                $('.layui-table tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
+                            }
+                    }
+                }
+            });
+
+            //触发事件
+            table.on('toolbar(tableQuery)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                if (obj.event == 'add') {
+                    if (checkStatus && checkStatus.data.length > 0) {
+                        console.log(checkStatus.data.map(function (x) { return x.itemID }).join(','))
+
+                        hg.confirm("確定要綁定有勾選的檢驗工項嗎？", function () {
+                            $.ajax({
+                                url: '/FQC/FQC009C',
+                                data: { 'ids': checkStatus.data.map(function (x) { return x.itemID }).join(','), 'itemNo': 'aaa' },
+                                type: 'POST',
+                                success: function (data) {
+                                    if (data.success) {
+                                        hg.msg('保存成功！');
+                                        //重载表格数据
+                                        table && table.reload();
+                                    }
+                                    else {
+                                        //hg.msg(data.msg);
+                                        hg.msg('保存失败！');
+                                    }
+                                },
+                                error: function () {
+                                    hg.msg("网络请求失败！");
+                                }
+                            });
+
+                        });
+                    } else {
+                        hg.msg('请勾選要綁定的檢驗工項，再執行！');
+                    }
+                }
+            });
+
             /**
             * 复选框的点击事件
             * 主要操作为：
@ -139,7 +183,8 @@
            }
        });

-
+        //监听表单提交事件
+       

        ////监听表单提交事件
        //hg.form.onsubmit('querysubmit', function (data) {
@ -179,7 +224,7 @@
                    hg.confirm("確定要綁定有勾選的檢驗工項嗎？", function () {
                        $.ajax({
                            url: '/FQC/FQC009C',
-                            data: { 'ids': obj.checkstatus.data.map(function (x) { return x.itemID }), 'itemNo':'aaa' },
+                            data: { 'ids': obj.checkstatus.data.map(function (x) { return x.itemID }).join(','), 'itemNo':'aaa' },
                            type: 'POST',
                            success: function (data) {
                                if (data.success) {
@ -205,7 +250,7 @@
        }
        ];
        //基本数据表格
-        var tableQuery = hg.table.datatable('tableQuery', '檢驗工項', '/FQC/FQC009ItemQuery', {}, tableCols, Toolbar, false, 'full-100', ['filter', 'print', 'exports']);
+        //var tableQuery = hg.table.datatable('tableQuery', '檢驗工項', '/FQC/FQC009ItemQuery', {}, tableCols, Toolbar, false, 'full-100', ['filter', 'print', 'exports']);
    </script>


--- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
@ -131,7 +131,7 @@
                                    <fieldset class="layui-elem-field layui-field-title">
                                        <legend style="color: #e18917">刷讀條碼</legend>
                                    </fieldset>
-                                    <div class="layui-form-item">
+                                    <div class="layui-form-item" style="background-color: #acdbe36b">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">刷讀條碼：</label>
                                            <div class="layui-input-inline">
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@ -112,6 +112,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                bool burnIn = false;
                #endregion

+                #region 判斷UserID 
+                if (barCodeCheckDto.userID != 0)
+                {
+                    if (_context.UserInfoes.Where(w => w.UserID == barCodeCheckDto.userID).Count() == 0)
+                    {
+                        resultModel.Success = false;
+                        resultModel.Msg = "找不到UserID【" + barCodeCheckDto.userID + "】資料";
+                        return resultModel;
+                    }
+                }
+
+                #endregion
+
+
                // 抓流程ID
                var q_wipinfo = await wipInfosController.GetWipInfoByWipNo(barCodeCheckDto.wipNo);
                barCodeCheckDto.flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;
--- a/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/QcItemDto.cs
@ -57,5 +57,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
        /// 更新日期
        /// </summary>
        public DateTime? UpdateDate { get; set; } = DateTime.Now;
+
+        public bool check {get;set;}= false;
    }
 }