1.新增iRepair查询2

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -1600,11 +1600,122 @@ namespace AMESCoreStudio.Web.Controllers
             return View();
         }
 
-        public async Task<IActionResult> QRS018AAsync(string wipNO)
+        public IActionResult QRS018A(string wipNO)
         {
             ViewData["Title"] = "查詢條件 - 工單號碼 : " + wipNO;
 
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS013(wipNO, null, 0, 10);
+            ViewBag.WIP_NO = wipNO;
+
+            return View();
+        }
+
+        public async Task<IActionResult> QRS018B(string wipNO, string stationID, string ngNO)
+        {
+            var station = await _basApi.GetStations(int.Parse(stationID));
+
+            ViewData["Title"] = "查詢條件 - 工單號碼 : " + wipNO + " , 站別 : " + station[0].StationName + " , 不良代碼 : " + ngNO;
+
+            ViewBag.WIP_NO = wipNO;
+            ViewBag.STATION_ID = stationID;
+            ViewBag.NG_NO = ngNO;
+
+            return View();
+        }
+
+        public async Task<IActionResult> QRS018C(string wipNO, string stationID, string repairNO)
+        {
+            var station = await _basApi.GetStations(int.Parse(stationID));
+
+            ViewData["Title"] = "查詢條件 - 工單號碼 : " + wipNO + " , 站別 : " + station[0].StationName + " , 維修代碼 : " + repairNO;
+
+            ViewBag.WIP_NO = wipNO;
+            ViewBag.STATION_ID = stationID;
+            ViewBag.REPAIR_NO = repairNO;
+
+            return View();
+        }
+
+        public async Task<IActionResult> QRS018D(string wipNO,string stationID,string partNO)
+        {
+            var station = await _basApi.GetStations(int.Parse(stationID));
+
+            ViewData["Title"] = "查詢條件 - 工單號碼 : " + wipNO + " , 站別 : " + station[0].StationName + " , 維修料號 : " + partNO;
+
+            ViewBag.WIP_NO = wipNO;
+            ViewBag.STATION_ID = stationID;
+            ViewBag.PART_NO = partNO;
+
+            return View();
+        }
+
+
+        public async Task<IActionResult> GetErrorCode4QRS018Async(string id)
+        {
+            IResultModel<dynamic> result = await _repApi.GetErrorCode4QRS018(id);
+
+            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 });
+        }
+
+        public async Task<IActionResult> GetErrorCodeList4QRS018Async(string id)
+        {
+            string[] param = id.Split('_');
+
+            IResultModel<dynamic> result = await _repApi.GetErrorCodeList4QRS018(param[0], int.Parse(param[1]), param[2]);
+
+            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 });
+        }
+
+        public async Task<IActionResult> GetRepairCode4QRS018Async(string id)
+        {
+            IResultModel<dynamic> result = await _repApi.GetRepairCode4QRS018(id);
+
+            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 });
+        }
+
+        public async Task<IActionResult> GetRepairCodeList4QRS018Async(string id)
+        {
+            string[] param = id.Split('_');
+            IResultModel<dynamic> result = await _repApi.GetRepairCodeList4QRS018(param[0], int.Parse(param[1]), param[2]);
+
+            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 });
+        }
+
+        public async Task<IActionResult> GetRepairPartNo4QRS018Async(string id)
+        {
+            IResultModel<dynamic> result = await _repApi.GetRepairPartNo4QRS018(id);
+
+            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 });
+        }
+
+        public async Task<IActionResult> GetRepairPartNoList4QRS018Async(string id)
+        {
+            string[] param = id.Split('_');
+            IResultModel<dynamic> result = await _repApi.GetRepairPartNoList4QRS018(param[0], int.Parse(param[1]), param[2]);
 
             if (result.DataTotal > 0)
             {

AMESCoreStudio.Web/HttpApis/AMES/IREP.cs

@@ -149,6 +149,47 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairResponsibleUnit4REP012")]
         ITask<ResultModel<dynamic>> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo);
 
+        /// <summary>
+        /// 查詢統計不良代碼by工單號碼
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetErrorCode4QRS018")]
+        ITask<ResultModel<dynamic>> GetErrorCode4QRS018(string wipNo);
+
+        /// <summary>
+        /// 查詢統計維修代碼by工單號碼
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairCode4QRS018")]
+        ITask<ResultModel<dynamic>> GetRepairCode4QRS018(string wipNo);
+
+        /// <summary>
+        /// 查詢統計維修料號by工單號碼
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairPartNo4QRS018")]
+        ITask<ResultModel<dynamic>> GetRepairPartNo4QRS018(string wipNo);
+
+        /// <summary>
+        /// 根據工單+站別+不良代碼查詢不良條碼明細
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetErrorCodeList4QRS018")]
+        ITask<ResultModel<dynamic>> GetErrorCodeList4QRS018(string wipNo, int stationID, string ngNo);
+
+        /// <summary>
+        /// 根據工單+站別+維修代碼查詢維修條碼明細
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairCodeList4QRS018")]
+        ITask<ResultModel<dynamic>> GetRepairCodeList4QRS018(string wipNo, int stationID, string repairNo);
+
+        /// <summary>
+        /// 根據工單+站別+料號查詢維修條碼明細
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairPartNoList4QRS018")]
+        ITask<ResultModel<dynamic>> GetRepairPartNoList4QRS018(string wipNo, int stationID, string partNo);
 
         /// <summary>
         /// 根據COMPONENT_ID獲取指定維修過程資料

AMESCoreStudio.Web/Views/QRS/QRS018.cshtml

@@ -0,0 +1,145 @@
+@{
+    ViewData["Title"] = "iRepair查詢2";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<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 class="layui-form-item layui-layout-left">
+                <div class="layui-inline">
+                    <label class="layui-form-label">工單號碼:</label>
+                    <div class="layui-input-inline" style="width:150px">
+                        <input id="wipNO" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                        <input id="factoryNo" type="hidden" name="factoryNo" value="@ViewBag.UserFactory" />
+                    </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" onclick="result()">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.config({
+            base: '../lib/layui_ext/',
+        }).extend({
+            excel: 'excel',
+        });
+    </script>
+
+    <script type="text/javascript">
+
+        function formatJSONDate(jsonDate) {
+            if (jsonDate == null) {
+                return "";
+            }
+            else {
+                var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
+                var myDate = new Date(date);
+                var yy = myDate.getFullYear();
+                var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
+                var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
+                var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
+                var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
+                var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
+                //mm + "/" + dd + " " +
+                //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
+                var output = yy + mm + dd + h + m + s;
+                // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
+                return output;
+            }
+        }
+
+        layui.use(['jquery', 'excel', 'layer'], function () {
+            var $ = layui.jquery;
+            var layer = layui.layer;
+            var excel = layui.excel;
+
+            $('#btnExport').on('click', function () {
+
+                $.ajax({
+                    url: '@Url.Action("QRS013A", "QRS")',
+                    data: { "wipNO": $("#wipNO").val() },
+                    dataType: 'json',
+                    success(res) {
+                        var data = res.data;
+
+                        var keys = [];
+                        var cols1 = [];
+                        var cols2 = [];
+                        var cols = {};
+                        var i = 0;
+                        var cols_title = "";
+                        for (var item in data[0])
+                        {
+                            //alert(item);
+                            //alert(data[0][item]);
+                            keys.push(item);
+
+                            cols1[i] = item;
+                            cols_title = cols_title + item.toString() + ",";
+                            //cols2[i] = item.toString() + ":\"" + item.toString() + "\"";
+                            //cols2[i] = item + ":" + item.toString();
+                            i = i + 1;
+                            cols2.push(item);
+                        }
+                        
+                        var cols_header = cols_title.substring(0, cols_title.length - 1);
+
+
+                        //data.unshift({ wipno: "wipno" });
+                        
+                        //data = excel.filterExportData(data, cols2);
+                        //data.unshift({ keys });
+                        //data.unshift(cols1);
+                        data.unshift({ wipno: "WipNo", barcodeno: "BarcodeNo", extrabarcodeno: "ExtraBarcodeNo", modelno: "ModelNo", itemno: "ItemNo" });
+
+                        var timestart = Date.now();
+                        excel.downloadExcel(data, '組件明細' + formatJSONDate(Date.now().toString()), 'xlsx');                        
+
+                        //excel.exportExcel(data, '組件明細' + formatJSONDate(Date.now().toString()) + '.xlsx', 'xlsx');
+
+                        var timeend = Date.now();
+
+                        var spent = (timeend - timestart) / 1000;
+                        layer.alert('導出數據耗時 ' + spent + ' s');
+                    }
+                    , error() {
+                        layer.alert('導出數據失敗');
+                    }
+                });
+            });
+        });
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+        });
+
+        function result()
+        {
+            var wipNO = $("#wipNO").val();
+
+            var query = "?wipNO=" + wipNO;
+            hg.open('iRepair查詢2', '/QRS/QRS018A' + query, '', '', true);
+
+        };
+
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            table && table.reload(data);
+        });
+
+    </script>
+}

AMESCoreStudio.Web/Views/QRS/QRS018A.cshtml

@@ -0,0 +1,221 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<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">
+        <input id="wip_no" name="wip_no" value="@ViewBag.WIP_NO" type="hidden" />
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color: red;width:100px;">不良代碼統計資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data1" lay-filter="data1"></table>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color:red;width:100px;">維修代碼統計資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data2" lay-filter="data2"></table>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color:red;width:100px;">維修料號統計資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data3" lay-filter="data3" style="​height: 'full-110'​"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts{
+<script type="text/javascript">
+    //监听表单提交事件
+    hg.form.onsubmit('querysubmit', function (data) {
+        table && table.reload(data);
+        
+        });
+
+    var tableCols1 = [[
+        {
+            field: 'statioN_ID',
+            width: 120,
+            title: '站別編號'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 160,
+            title: '站別',
+            sort: true
+        },
+        {
+            field: 'nG_NO',
+            width: 120,
+            title: '不良代碼'
+        },
+        {
+            field: 'nG_REASON_DESC',
+            title: '不良描述',
+            sort: true
+        },
+        {
+            field: 'nG_QTY',
+            minWidth: 120,
+            title: '數量'
+        },
+        {
+            field: 'rate',
+            title: '百分比%',
+            width: 120,
+            sort: true
+        },
+        {
+            field: 'center',
+            width: 120,
+            title: '操作',
+            templet: function (d) {
+                return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="view1">明細</a>'
+            }
+        }]
+    ];
+
+    function view1(obj) {
+        var wipNO = wip_no.value;
+        var stationID = obj.data.statioN_ID;
+        var ngNO = obj.data.nG_NO;
+        var param = "?wipNO=" + wipNO + "&stationID=" + stationID + "&ngNO=" + ngNO;
+
+        if (obj.data.nG_NO) {
+            hg.open('不良代碼明細', '/QRS/QRS018B' + param, 1024, 640);
+        }
+    }
+
+    //基本数据表格
+    var table = hg.table.datatable('data1', '不良代碼統計資料', '/QRS/GetErrorCode4QRS018/' + wip_no.value, {}, tableCols1, toolbar, false, '360', ['filter', 'print', 'exports']);
+
+    var tableCols2 = [[
+        {
+            field: 'statioN_ID',
+            width: 120,
+            title: '站別編號'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 160,
+            title: '站別',
+            sort: true
+        },
+        {
+            field: 'repaiR_NO',
+            width: 120,
+            title: '維修代碼'
+        },
+        {
+            field: 'rmA_REASON_DESC',
+            title: '維修描述',
+            sort: true
+        },
+        {
+            field: 'rmA_QTY',
+            minWidth: 120,
+            title: '數量'
+        },
+        {
+            field: 'rate',
+            title: '百分比%',
+            width: 120,
+            sort: true
+        },
+        {
+            field: 'center',
+            width: 120,
+            title: '操作',
+            templet: function (d) {
+                return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="view2">明細</a>'
+            }
+        }]
+    ];
+
+    function view2(obj) {
+
+        var wipNO = wip_no.value;
+        var stationID = obj.data.statioN_ID;
+        var repairNO = obj.data.repaiR_NO;
+        var param = "?wipNO=" + wipNO + "&stationID=" + stationID + "&repairNO=" + repairNO;
+
+        if (obj.data.repaiR_NO) {
+            hg.open('維修代碼明細', '/QRS/QRS018C' + param, 1024, 640);
+        }
+    }
+
+    //基本数据表格
+    var table = hg.table.datatable('data2', '維修代碼統計資料', '/QRS/GetRepairCode4QRS018/' + wip_no.value, {}, tableCols2, toolbar, false, '360', ['filter', 'print', 'exports']);
+
+    var tableCols3 = [[
+        {
+            field: 'statioN_ID',
+            width: 120,
+            title: '站別編號'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 160,
+            title: '站別名稱'
+        },
+        {
+            field: 'parT_NO',
+            title: '維修料號'
+        },
+        {
+            field: 'parT_QTY',
+            minWidth: 120,
+            title: '數量'
+        },
+        {
+            field: 'rate',
+            title: '百分比%',
+            width: 120,
+            sort: true
+        },
+        {
+            field: 'center',
+            width: 120,
+            title: '操作',
+            templet: function (d) {
+                return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-form" lay-event="view3">明細</a>'
+            }
+        }]
+    ];
+
+    function view3(obj) {
+        var wipNO = wip_no.value;
+        var stationID = obj.data.statioN_ID;
+        var partNO = obj.data.parT_NO;
+        var param = "?wipNO=" + wipNO + "&stationID=" + stationID + "&partNO=" + partNO;
+
+        if (obj.data.parT_NO) {
+            hg.open('維修料號明細', '/QRS/QRS018D' + param, 1024, 640);
+        }
+    }
+
+    //基本数据表格
+    var table = hg.table.datatable('data3', '維修料號統計資料', '/QRS/GetRepairPartNo4QRS018/' + wip_no.value, {}, tableCols3, toolbar, false, '360', ['filter', 'print', 'exports']);
+</script>
+}

AMESCoreStudio.Web/Views/QRS/QRS018B.cshtml

@@ -0,0 +1,87 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<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">
+        <input id="wipNO" name="wipNO" value="@ViewBag.WIP_NO" type="hidden" />
+        <input id="stationID" name="stationID" value="@ViewBag.STATION_ID" type="hidden" />
+        <input id="ngNO" name="ngNO" value="@ViewBag.NG_NO" type="hidden" />
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color: red;width:100px;">不良代碼明細資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data" lay-filter="data"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts{
+<script type="text/javascript">
+    //监听表单提交事件
+    hg.form.onsubmit('querysubmit', function (data) {
+        table && table.reload(data);
+        
+        });
+
+    var tableCols = [[
+        {
+            field: 'barcodE_NO',
+            width: 150,
+            title: '條碼'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 80,
+            title: '站別',
+            sort: true
+        },
+        {
+            field: 'nG_NO',
+            width: 80,
+            title: '不良代碼'
+        },
+        {
+            field: 'nG_REASON_DESC',
+            title: '不良描述',
+            width: 180,
+            sort: true
+        },
+        {
+            field: 'locatioN_NO',
+            title: '零件位置',
+            width: 120
+        },
+        {
+            field: 'replY_REASON',
+            title: '回復原因'
+        },
+        {
+            field: 'useR_NAME',
+            width: 80,
+            title: '測試人員'
+        },
+        {
+            field: 'createDate',
+            title: '不良時間',
+            width: 160,
+            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+        }]
+    ];
+
+    //基本数据表格
+    var table = hg.table.datatable('data', '不良代碼明細資料', '/QRS/GetErrorCodeList4QRS018/' + wipNO.value + '_' + stationID.value + '_' + ngNO.value, {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);
+
+</script>
+}

AMESCoreStudio.Web/Views/QRS/QRS018C.cshtml

@@ -0,0 +1,88 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<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">
+        <input id="wipNO" name="wipNO" value="@ViewBag.WIP_NO" type="hidden" />
+        <input id="stationID" name="stationID" value="@ViewBag.STATION_ID" type="hidden" />
+        <input id="repairNO" name="repairNO" value="@ViewBag.REPAIR_NO" type="hidden" />
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color: red;width:100px;">維修代碼明細資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data" lay-filter="data"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts{
+<script type="text/javascript">
+    //监听表单提交事件
+    hg.form.onsubmit('querysubmit', function (data) {
+        table && table.reload(data);
+        
+        });
+
+    var tableCols = [[
+        {
+            field: 'barcodE_NO',
+            width: 150,
+            title: '條碼'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 80,
+            title: '站別',
+            sort: true
+        },
+        {
+            field: 'repaiR_NO',
+            width: 80,
+            title: '維修代碼'
+        },
+        {
+            field: 'repaiR_DESC',
+            title: '維修描述',
+            width: 180,
+            sort: true
+        },
+        {
+            field: 'parT_NO',
+            title: '維修料號',
+            width: 120
+        },
+        {
+            field: 'useR_NAME',
+            width: 80,
+            title: '維修人員'
+        },
+        {
+            field: 'createDate',
+            title: '維修日期',
+            width: 160,
+            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+        },
+        {
+            field: 'memo',
+            title: '備註',
+            sort: true
+        }]
+    ];
+
+    //基本数据表格
+    var table = hg.table.datatable('data', '維修代碼明細資料', '/QRS/GetRepairCodeList4QRS018/' + wipNO.value + '_' + stationID.value + '_' + repairNO.value, {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);
+
+</script>
+}

AMESCoreStudio.Web/Views/QRS/QRS018D.cshtml

@@ -0,0 +1,88 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<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">
+        <input id="wipNO" name="wipNO" value="@ViewBag.WIP_NO" type="hidden" />
+        <input id="stationID" name="stationID" value="@ViewBag.STATION_ID" type="hidden" />
+        <input id="partNO" name="partNO" value="@ViewBag.PART_NO" type="hidden" />
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label" style="color: red;width:100px;">維修料號明細資料</label>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline" style="width:100%">
+                <table class="layui-hide" id="data" lay-filter="data"></table>
+            </div>
+        </div>
+    </div>
+</div>
+
+@section Scripts{
+<script type="text/javascript">
+    //监听表单提交事件
+    hg.form.onsubmit('querysubmit', function (data) {
+        table && table.reload(data);
+        
+        });
+
+    var tableCols = [[
+        {
+            field: 'barcodE_NO',
+            width: 150,
+            title: '條碼'
+        },
+        {
+            field: 'statioN_NAME',
+            width: 80,
+            title: '站別',
+            sort: true
+        },
+        {
+            field: 'repaiR_NO',
+            width: 80,
+            title: '維修代碼'
+        },
+        {
+            field: 'repaiR_DESC',
+            title: '維修描述',
+            width: 180,
+            sort: true
+        },
+        {
+            field: 'parT_NO',
+            title: '維修料號',
+            width: 120
+        },
+        {
+            field: 'useR_NAME',
+            width: 80,
+            title: '維修人員'
+        },
+        {
+            field: 'createDate',
+            title: '維修日期',
+            width: 160,
+            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+        },
+        {
+            field: 'memo',
+            title: '備註',
+            sort: true
+        }]
+    ];
+
+    //基本数据表格
+    var table = hg.table.datatable('data', '維修料號明細資料', '/QRS/GetRepairPartNoList4QRS018/' + wipNO.value + '_' + stationID.value + '_' + partNO.value, {}, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);
+
+</script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

@@ -12,6 +12,9 @@ using AMESCoreStudio.CommonTools.Result;
 using Microsoft.Extensions.Configuration;
 using System.Net;
 using System.Net.Mail;
+using System.Data.Common;
+using System.Data;
+using System.Dynamic;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -521,6 +524,498 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <returns></returns>
+        public static DataTable DataReaderToDataTable(DbDataReader reader)
+        {
+            try
+            {
+                DataTable dt = new DataTable();
+                int fieldCount = reader.FieldCount;
+                for (int fieldIndex = 0; fieldIndex < fieldCount; ++fieldIndex)
+                {
+                    dt.Columns.Add(reader.GetName(fieldIndex), reader.GetFieldType(fieldIndex));
+                }
+
+                dt.BeginLoadData();
+
+                object[] rowValues = new object[fieldCount];
+                while (reader.Read())
+                {
+                    reader.GetValues(rowValues);
+                    dt.LoadDataRow(rowValues, true);
+                }
+                reader.Close();
+                dt.EndLoadData();
+
+                return dt;
+
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("DataReader Convert DataTable Error!", ex);
+            }
+        }
+
+        /// <summary>
+        /// 根據工單統計不良代碼
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetErrorCode4QRS018(string wipNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+
+            /*
+            var q = from a in _context.NgInfos
+                    join b in _context.NgComponents on a.NgID equals b.NgID
+                    join c in _context.Stationses on a.StationId equals c.StationID
+                    join d in _context.WipInfos on a.WipId equals d.WipID
+                    join e in _context.NGReasons on b.NgNo equals e.NGReasonNo
+                    select new
+                    {
+                        a.WipId,
+                        d.WipNO,
+                        a.StationId,
+                        c.StationName,
+                        b.NgNo,
+                        e.NGReasonDesc,
+                        a.BarcodeID,
+                        a.CreateDate
+                    };
+
+            if (wipNo != null)
+            {
+                if (wipNo != "")
+                {
+                    q = q.Where(w => w.WipNO == wipNo);
+                }
+            }
+
+            q = q.OrderBy(w => w.CreateDate).Distinct();
+
+            var g = q.GroupBy(x => new { x.WipId, x.WipNO, x.StationId, x.StationName, x.NgNo, x.NGReasonDesc }).Select(x => new
+            {
+                WipID = x.Key.WipId,
+                WipNO = x.Key.WipNO,
+                StationId = x.Key.StationId,
+                StationName = x.Key.StationName,
+                NgNo = x.Key.NgNo,
+                NGReasonDesc = x.Key.NGReasonDesc,
+                NgQty = x.Count()
+            });
+
+            //紀錄筆數
+            result.DataTotal = g.Count();
+
+            result.Data = await g.ToListAsync();
+            */
+            string sql = string.Format(@"select x.*,y.total_qty,round(x.ng_qty * 100 / y.total_qty,2) as rate from (
+select a.wip_id,e.wip_no,b.ng_no,d.ng_reason_desc,a.station_id,c.station_name,count(distinct a.barcode_id) as ng_qty
+from jhames.ng_info a,jhames.ng_component b, jhames.stations c, jhames.ng_reason d, jhames.wip_info e
+where a.ng_id = b.ng_id and b.ng_no = d.ng_reason_no and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+group by a.wip_id,e.wip_no,b.ng_no,d.ng_reason_desc,a.station_id,c.station_name) x,
+(
+select wip_id, sum(ng_qty) as total_qty from(
+ select a.wip_id, e.wip_no, b.ng_no, d.ng_reason_desc, a.station_id, c.station_name, count(distinct a.barcode_id) as ng_qty
+ from jhames.ng_info a, jhames.ng_component b, jhames.stations c, jhames.ng_reason d, jhames.wip_info e
+ where a.ng_id = b.ng_id and b.ng_no = d.ng_reason_no and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+ group by a.wip_id, e.wip_no, b.ng_no, d.ng_reason_desc, a.station_id, c.station_name)
+group by wip_id) y
+where x.wip_id = y.wip_id", wipNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
+        /// <summary>
+        /// 根據工單統計維修代碼
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetRepairCode4QRS018(string wipNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            string sql = string.Format(@"select x.*,y.total_qty,round(x.rma_qty * 100 / y.total_qty,2) as rate from (
+select a.wip_id,e.wip_no,b.repair_no,d.rma_reason_desc,a.station_id,c.station_name,count(distinct a.barcode_id) as rma_qty
+from jhames.ng_info a,jhames.ng_repair b,jhames.stations c,jhames.rma_reason d,jhames.wip_info e
+where a.ng_id = b.ng_id and b.repair_no = d.rma_reason_no and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+group by a.wip_id,e.wip_no,b.repair_no,d.rma_reason_desc,a.station_id,c.station_name) x,
+(
+select wip_id,sum(rma_qty) as total_qty from (
+select a.wip_id,e.wip_no,b.repair_no,d.rma_reason_desc,a.station_id,c.station_name,count(distinct a.barcode_id) as rma_qty
+from jhames.ng_info a,jhames.ng_repair b,jhames.stations c,jhames.rma_reason d,jhames.wip_info e
+where a.ng_id = b.ng_id and b.repair_no = d.rma_reason_no and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+group by a.wip_id,e.wip_no,b.repair_no,d.rma_reason_desc,a.station_id,c.station_name)
+group by wip_id) y
+where x.wip_id = y.wip_id", wipNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
+        /// <summary>
+        /// 根據工單統計維修料號
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetRepairPartNo4QRS018(string wipNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            string sql = string.Format(@"select x.*, y.total_qty, round(x.part_qty * 100 / y.total_qty, 2) as rate from(
+select a.wip_id, e.wip_no, b.part_no, a.station_id, c.station_name, count(distinct a.barcode_id) as part_qty
+from jhames.ng_info a, jhames.ng_repair b, jhames.stations c, jhames.wip_info e
+where a.ng_id = b.ng_id and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+group by a.wip_id, e.wip_no, b.part_no, a.station_id, c.station_name) x,
+(
+select wip_id, sum(part_qty) as total_qty from(
+select a.wip_id, e.wip_no, b.part_no, a.station_id, c.station_name, count(distinct a.barcode_id) as part_qty
+from jhames.ng_info a, jhames.ng_repair b, jhames.stations c, jhames.wip_info e
+where a.ng_id = b.ng_id and a.station_id = c.station_id and a.wip_id = e.wip_id and e.wip_no = '{0}'
+group by a.wip_id, e.wip_no, b.part_no, a.station_id, c.station_name)
+group by wip_id) y
+where x.wip_id = y.wip_id", wipNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
+        /// <summary>
+        /// 根據工單+站別+b不良代碼查詢不良條碼明細
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <param name="stationID"></param>
+        /// <param name="ngNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetErrorCodeList4QRS018(string wipNo, int stationID, string ngNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            string sql = string.Format(@"select c.barcode_no,e.station_name,b.ng_no,g.ng_reason_desc,b.location_no,b.reply_reason,f.user_name,a.create_date
+from jhames.ng_info a,jhames.ng_component b,jhames.barcode_info c,jhames.wip_info d,jhames.stations e,jhsys.user_info f,jhames.ng_reason g
+where a.ng_id = b.ng_id and a.barcode_id = c.barcode_id and c.wip_id = d.wip_id and a.station_id = e.station_id and b.create_userid = f.user_id(+)
+and b.ng_no = g.ng_reason_no and d.wip_no = '{0}' and a.station_id={1} and b.ng_no='{2}'", wipNo, stationID, ngNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
+        /// <summary>
+        /// 根據工單+站別+維修代碼查詢維修條碼明細
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <param name="stationID"></param>
+        /// <param name="repairNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetRepairCodeList4QRS018(string wipNo, int stationID, string repairNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            string sql = string.Format(@"select distinct c.barcode_no,e.station_name,b.repair_no,g.rma_reason_desc,b.part_no,f.user_name,a.create_date,b.memo 
+from jhames.ng_info a,jhames.ng_repair b,jhames.barcode_info c,jhames.wip_info d,jhames.stations e,jhsys.user_info f,jhames.rma_reason g
+where a.ng_id = b.ng_id and a.barcode_id = c.barcode_id and c.wip_id = d.wip_id and a.station_id = e.station_id and b.create_userid = f.user_id(+)
+and b.repair_no = g.rma_reason_no and d.wip_no = '{0}' and a.station_id={1} and b.repair_no='{2}'", wipNo, stationID, repairNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
+        /// <summary>
+        /// 根據工單+站別+料號查詢維修條碼明細
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <param name="stationID"></param>
+        /// <param name="partNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetRepairPartNoList4QRS018(string wipNo,int stationID,string partNo)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            string sql = string.Format(@"select c.barcode_no,e.station_name,b.repair_no,b.repair_desc,b.part_no,f.user_name,a.create_date,b.memo 
+from jhames.ng_info a,jhames.ng_repair b,jhames.barcode_info c,jhames.wip_info d,jhames.stations e,jhsys.user_info f
+where a.ng_id = b.ng_id and a.barcode_id = c.barcode_id and c.wip_id = d.wip_id and a.station_id = e.station_id and b.create_userid = f.user_id(+)
+and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID, partNo);
+
+            DbConnection conn = _context.Database.GetDbConnection();
+            if (conn.State != System.Data.ConnectionState.Open)
+            {
+                await conn.OpenAsync();
+            }
+
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.CommandText = sql;
+
+                using (var reader = await cmd.ExecuteReaderAsync())
+                {
+                    if (reader.HasRows)
+                    {
+                        List<dynamic> list = new List<dynamic>();
+                        DataTable table = new DataTable();
+
+                        table = DataReaderToDataTable(reader);
+
+                        foreach (DataRow row in table.Rows)
+                        {
+                            dynamic dyn = new ExpandoObject();
+                            list.Add(dyn);
+                            foreach (DataColumn column in table.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;
+        }
+
         /// <summary>
         /// 維修資料統計by不良代碼
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -527,7 +527,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                                                                         for (int m = 0; m < esun_table.Rows.Count; m++)
                                                                         {
                                                                             mac = esun_table.Rows[m]["part_barcode"].ToString().Trim();
-                                                                            dtBarcode.Rows[k]["KP_MB" + k.ToString() + "_MAC" + (k + 1).ToString()] = mac;
+                                                                            dtBarcode.Rows[k]["KP_MB" + k.ToString() + "_MAC" + (m + 1).ToString()] = mac;
                                                                             dtBarcode.AcceptChanges();
                                                                         }
                                                                     }