1. 修正視窗大小

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -31,7 +31,7 @@ namespace AMESCoreStudio.Web.Controllers
         public readonly IFQC _fqcApi;
         private readonly IWebHostEnvironment _env;
         public readonly IPCS _pcsApi;
-        public FQCController(ILogger<PCSController> logger, IFQC fqcApi, IWebHostEnvironment env , IPCS pcsApi)
+        public FQCController(ILogger<PCSController> logger, IFQC fqcApi, IWebHostEnvironment env, IPCS pcsApi)
         {
             _logger = logger;
             _fqcApi = fqcApi;
@@ -1009,7 +1009,8 @@ namespace AMESCoreStudio.Web.Controllers
             result = await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(fqcResultMaster));
             if (result.Success)
             {
-                var result_FQC = await _fqcApi.PassingByFQC(model.InhouseNo, model.SeqID, GetLogInUserID());
+                if (model.QaResult == "P")
+                    await _fqcApi.PassingByFQC(model.InhouseNo, model.SeqID, GetLogInUserID());
 
                 var _msg = "新增成功！";
                 return RedirectToAction("WindowReload", "Home", new { msg = _msg });
@@ -1193,12 +1194,12 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         public async Task<IActionResult> FQC008QueryAsync(string barcodeNo, string wipNo
-          , string boxNo, string inhouseNo, string date_str, string date_end ,string factoryID
+          , string boxNo, string inhouseNo, string date_str, string date_end, string factoryID
           , string status, int page = 0, int limit = 10)
         {
             IResultModel<FqcInhouseMasterDto> result = await _fqcApi.GetFqcInhouseMasterQuery(barcodeNo: barcodeNo, wipNo: wipNo
             , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end
-            , status: status, page: page, limit: limit , factoryID: factoryID);
+            , status: status, page: page, limit: limit, factoryID: factoryID);
 
             await GetFactoryInfo();
             if (result.Data.Count() != 0)

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -417,7 +417,7 @@
         function detail(obj) {
             let InhouseNo = $("#hInhouseNo").val().trim();
             let SeqID = $("#hSeqID").val().trim();
-            hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID+ '&boxNo=' + obj, '700', '400');
+            hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID+ '&boxNo=' + obj, '900', '500');
         }
 
         //UserName

AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml

@@ -2,14 +2,12 @@
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
-<div class="layui-card">
     <div class="layui-card-body">
         <input id="inhouseNo" name="inhouseNo" value="@ViewBag.inhouseNo" type="hidden" />
         <input id="seqID" name="seqID" value="@ViewBag.seqID" type="hidden" />
         <input id="boxNo" name="boxNo" value="@ViewBag.boxNo" type="hidden" />
         <table class="layui-hide" id="test" lay-filter="test"></table>
     </div>
-</div>
 
 @section Scripts{
     <script type="text/javascript">
@@ -21,17 +19,18 @@
             {
                 field: 'boxNo',
                 title: '箱號',
-                width: 200,
+                width: 170,
                 sort: true
             },
             {
                 field: 'barcodeNo',
-                width: 200,
+                width: 170,
-                title: '內部條碼'
+                title: '內部條碼',
+                sort: true
             },
             {
                 field: 'extraBarcodeNo',
-                width: 200,
+                width: 170,
                 title: '外部條碼'
             },
             {
@@ -55,6 +54,6 @@
 
     //基本数据表格
     //var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V/', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
-        var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V?inhouseNo=@ViewBag.inhouseNo&seqID=@ViewBag.seqID&boxNo=@ViewBag.boxNo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V?inhouseNo=@ViewBag.inhouseNo&seqID=@ViewBag.seqID&boxNo=@ViewBag.boxNo', {}, tableCols, {}, false, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }