diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml index f9b0c216..71a1c6a1 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml @@ -42,7 +42,7 @@
- +
@@ -50,7 +50,7 @@
- +
@@ -154,7 +154,7 @@ field: 'createDate', title: '入庫時間', sort: true, - emplet: '
{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}
' + templet: '
{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}
' }, { field: 'serialNo', @@ -164,8 +164,15 @@ { field: 'statusName', title: '檢驗狀態', - sort: true - } + sort: true, + templet:'#statusName' + }, + { + field: 'endTime', + title: '抽驗結束時間', + sort: true, + templet: '
{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}
' + }, //, //{ // field: 'right', @@ -178,7 +185,7 @@ // } //} ]]; - + //通过行tool编辑，lay-event="show" function show(obj) { layui.use('layer', function () { @@ -197,4 +204,15 @@ var table = hg.table.datatable('query', 'FQC查詢', '/FQC/FQC008Query', {}, tableCols, '', true, 'full-100', ['filter', 'print', 'exports']); // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); -} + + + } +} \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml index 3d99b132..a1253de5 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml @@ -361,603 +361,609 @@
- - - - - - - - - - - - @foreach (var index in Model.ruleStations) - { - - - - - - - - } - -
- 生產單位 - - 流程名稱 - - 站別描述 - - 站別順序 - - 站別類型 -
- @index.UnitNoName - - @index.FlowRuleName - - @index.StationDesc - - @index.Sequence - - @index.StationType -
- - - - @* 板卡-工程資訊sheet *@ -
-
- -
- -
- - -
- -
+ +
+
+ + + + + + + + + + + + @foreach (var index in Model.ruleStations) + { + + + + + + + + } + +
+ 生產單位 + + 流程名稱 + + 站別描述 + + 站別順序 + + 站別類型 +
+ @index.UnitNoName + + @index.FlowRuleName + + @index.StationDesc + + @index.Sequence + + @index.StationType +
+
-
-
- -
- -
-
-
-
- -
- + @* 板卡-工程資訊sheet *@ +
+
+
+ +
+
-
-
-
- -
- -
+ +
+
+
-
- +
+
+
- +
+
-
-
- -
- - - - - @* - - *@ -
-
+
+ +
+
+
-
- +
+
+
- +
+
-
-
- -
- - @**@ -
-
- -
- -
-
- -
+
+ +
+
+
-
- +
+
+
- + + + + + @* + + *@
+
-
-
- -
-
- -
- -
+
+ +
+ +
+
+ +
+
+ +
+ + @**@
-
- +
+
- - +
+
+
-
- -
- -
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+ +
+
- -
- +
+
- + +
+
-
-
- -
- -
+
+ +
+ +
+
+ +
+
+ +
+
+
-
- +
+ +
+ +
+
+ +
+
+
- +
+
-
-
- -
- -
-
+
+ +
+
+
-
- -
- +
+
+ +
+
+
-
-
-
- -
- - -
+
+ +
+ +
+
+ +
+
+
+ +
+ +
-
- -
- - -
+
+
+ +
+ +
-
- -
- - -
+
+
+ +
+ +
+
-
- -
- -
+
+ +
+
+
-
-
- -
- - -
+
+
+ +
+ +
+
-
- -
- -
+
+ +
+
+
-
-
- -
- - -
+
+
+ +
+ +
+
-
- -
- -
+
+ +
+
+
- @* 系統-工程資訊sheet *@ -
-
-
- -
- -
+ @* 系統-工程資訊sheet *@ +
+
+
+ +
+ +
- -
- -
+ +
+
+
-
-
- -
- -
-
- -
+
+
+ +
+ +
+
+
+
-
- -
- -
+
+ +
+
+
-
-
-
- -
- -
-
-
- -
- -
+
+
+
+ +
+
-
- -
- -
+
+
+ +
+
- -
- +
+
+ +
+
+ +
+ +
+
-
-
- -
- -
+
+
+ +
+ +
- -
- -
+ +
+
+
-
-
- -
- -
- -
- -
- -
- -
+
+
+ +
+ +
+ +
+ +
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
-
- -
- -
+
+
+ +
+
+
-
- -
- -
+
+ +
+
+
- @* 治具組合sheet *@ -
- - @{ int j = 0;} - + @* 治具組合sheet *@ +
+
+ @{ int j = 0;} + + + + + + + + + @foreach (var index in Model.WipOutfits) + { - - - + + + - - - @foreach (var index in Model.WipOutfits) - { - - +
+ 設備編碼 + + 設備名稱 + + 生產單位 +
- 設備編碼 - - 設備名稱 - - 生產單位 - + + @index.OutfitNo + + @index.PartNo + + @index.UnitNoName +
+ j++; + } +
+
- @index.OutfitNo - - - @index.PartNo - - - @index.UnitNoName - - - j++; - } - - + @* SOP文件 sheet *@ +
+
+ + @{ int l = 0;} + + + + + + + + + + @foreach (var index in Model.WipSops) + { + + + + + + + l++; + } + +
SOP文件敘述檔案路徑SOP類型生產單位
+ + @index.SOPName + + @index.SOPPath + + @index.SOPTypeName + + @index.UnitNoName +
+
+ + @* 標籤選項sheet *@ +
+
+ + +
+ +
+ +
+ +
+
張
+
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
- @* SOP文件 sheet *@ -
-
+ @* 上傳資料sheet *@ +
+
- @{ int l = 0;} - + - - - @foreach (var index in Model.WipSops) + @foreach (var index in Model.wipInfoBlobs) { - - - l++; }
SOP文件敘述檔案名稱 檔案路徑SOP類型生產單位
- @index.SOPName - - @index.SOPPath + @index.ImageName - @index.SOPTypeName - - @index.UnitNoName + @index.Filepath
- - @* 標籤選項sheet *@ -
-
- - -
- -
- -
- -
-
張
-
- -
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
- -
- -
- -
-
-
- - @* 上傳資料sheet *@ -
-
- - - - - - - - - @foreach (var index in Model.wipInfoBlobs) - { - - - - - } - -
檔案名稱檔案路徑
- - @index.ImageName - - @index.Filepath -
-
-
-
+ +
@section Scripts { diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml index ee3790b1..e9542f44 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml @@ -393,6 +393,12 @@
+
+ +
+ +
+
@@ -1097,7 +1103,7 @@ $("#board").show(); } - if ($('#wipAtt_ItemNO').val() != "" && $('#wipInfo_PlanQTY').val() != "") { + if ($('#wipMAC_StartNO').val() != "" && $('#wipMAC_EndNO').val() != "") { $("#GetMAC").hide(); } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs index 5fd7f469..092538a5 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs @@ -97,6 +97,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { IQueryable q = from q1 in _context.FqcInhouseMasters join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID } + join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo select new FqcInhouseMasterDto { InhouseNo = q1.InhouseNo, @@ -107,7 +108,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES SerialNo = q2.SerialNo, StatusName = q1.Status, ProTypeName = q1.ProType, - CreateDate = q1.CreateDate + CreateDate = q1.CreateDate, + EndTime = q3.EndTime }; //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成", //IQueryable q1 = _context.FqcInhouseDetails; @@ -157,8 +159,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q = q.Skip((page - 1) * limit).Take(limit); } result.Data = await q.ToListAsync(); + + // 判斷結束時間 + result.Data = result.Data.Select(s => { s.EndTime = s.StatusName == "A" ? null : s.EndTime; return s; }) + .ToList(); + + // 修改狀態名稱 result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; }) .ToList(); + return result; } @@ -267,9 +276,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES public async Task> PostFqcInhouseMaster(FqcInhouseMaster fqcInhouseMaster) { ResultModel result = new ResultModel(); - _context.FqcInhouseMasters.Add(fqcInhouseMaster); + try { + _context.FqcInhouseMasters.Add(fqcInhouseMaster); await _context.SaveChangesAsync(); result.Success = true; result.Msg = "OK"; diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs index 2bf9c8f5..360be4e7 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs @@ -72,6 +72,14 @@ namespace AMESCoreStudio.WebApi.DTO.AMES public string ProTypeName { get; set; } + /// + /// 結束抽驗時間 + /// + [DataMember] + [Display(Name = "結束抽驗時間")] + + public DateTime? EndTime { get; set; } + /// /// 建立UserID /// diff --git a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs index a8c32228..fe96db47 100644 --- a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs +++ b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs @@ -310,9 +310,9 @@ namespace AMESCoreStudio.WebApi.Enum public enum EnumWipBoardPCBProcessingType { /// - /// 噴印字樣 (給備註填寫欄位) + /// 噴印字樣 /// - [Display(Name = "噴印字樣 (給備註填寫欄位)")] + [Display(Name = "噴印字樣")] A = 1, ///