diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml
index aa19f1ed..c939e396 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml
@@ -291,9 +291,9 @@
];
//基本数据表格
var table;
- $(function () {
- tt();
- });
+ //$(function () {
+ // tt();
+ //});
function tt() {
//基本数据表格
var form = "";
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml
index 0230b5d1..c2c87fcb 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml
@@ -1,5 +1,5 @@
@{
- ViewData["Title"] = "異常工時類別資料查詢";
+ ViewData["Title"] = "異常工時類別資料維護";
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
@@ -115,6 +115,16 @@
}
}
+ var toolbar = [{
+ text: '新增',
+ layuiicon: '',
+ class: 'layui-btn-normal',
+ handler: function () {
+ hg.open('新增異常工時類別', '/WHS/WHS014C', 640, 320);
+
+ }
+ }
+ ];
//基本数据表格
//var table = hg.table.datatable('test', '工作異常工時類別', '/WHS/GetWorkGroups', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
var table;
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll
index eb521e85..d57cb429 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb
index 498872d6..a37c8f1e 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
index b880ad77..c13fa7ad 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb
index ab58c351..da298964 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
index 44020bd3..443ab62f 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
index b0f71289..6ee32138 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
index 6dcfbab5..725253e6 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
index da8087c2..28a3578f 100644
Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index f6b5958c..c891be8c 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -29,11 +29,30 @@
+
+
+ 獲取用戶編號
+
+
+
+
+
+
+ 獲取用戶編號
+
+
+
+
Swagger:隐藏属性
+
+
+ 條碼變更資料表
+
+
@@ -53,6 +72,13 @@
BarcodeID
+
+
+ 條碼變更資料表 by id
+
+ BarcodeID
+
+
新增條碼變更資料表
@@ -2426,6 +2452,18 @@
+
+
+ 維修進/出條碼查詢
+
+
+
+
+
+
+
+
+
維修資料統計
@@ -2443,6 +2481,18 @@
+
+
+ 維修進/出統計報表
+
+
+
+
+
+
+
+
+
維修資料統計by不良代碼
@@ -3778,6 +3828,14 @@
+
+
+ 判斷同一不良代碼累計預警
+
+ 工單號碼
+ 不良代碼
+
+
@@ -4147,12 +4205,25 @@
+
+
+ 查詢工單KeyParts資料QRS013
+
+
+
+
查詢工單資料 by SelectParameter
+
+
+ 查詢工單資料 未結工單查詢
+
+
+
查詢工單資料Info By WipID
@@ -5648,6 +5719,12 @@
變更前ID
+
+
+ ByFlowID to DTO 取流程別
+
+
+
根據製程單位獲取指定單一資料
@@ -6566,6 +6643,11 @@
條碼變更資料表
+
+
+ 條碼置換ID
+
+
條碼ID
@@ -6586,9 +6668,14 @@
建立時間
-
+
- 修改時間
+ 備註
+
+
+
+
+ 建立者Name
@@ -9471,7 +9558,7 @@
- 異常描述
+ 不良原因描述
@@ -9831,7 +9918,7 @@
- 維修方式
+ 維修方式代碼
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
index 44020bd3..443ab62f 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
index b0f71289..6ee32138 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
index 6dcfbab5..725253e6 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
index da8087c2..28a3578f 100644
Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index f6b5958c..c891be8c 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -29,11 +29,30 @@
+
+
+ 獲取用戶編號
+
+
+
+
+
+
+ 獲取用戶編號
+
+
+
+
Swagger:隐藏属性
+
+
+ 條碼變更資料表
+
+
@@ -53,6 +72,13 @@
BarcodeID
+
+
+ 條碼變更資料表 by id
+
+ BarcodeID
+
+
新增條碼變更資料表
@@ -2426,6 +2452,18 @@
+
+
+ 維修進/出條碼查詢
+
+
+
+
+
+
+
+
+
維修資料統計
@@ -2443,6 +2481,18 @@
+
+
+ 維修進/出統計報表
+
+
+
+
+
+
+
+
+
維修資料統計by不良代碼
@@ -3778,6 +3828,14 @@
+
+
+ 判斷同一不良代碼累計預警
+
+ 工單號碼
+ 不良代碼
+
+
@@ -4147,12 +4205,25 @@
+
+
+ 查詢工單KeyParts資料QRS013
+
+
+
+
查詢工單資料 by SelectParameter
+
+
+ 查詢工單資料 未結工單查詢
+
+
+
查詢工單資料Info By WipID
@@ -5648,6 +5719,12 @@
變更前ID
+
+
+ ByFlowID to DTO 取流程別
+
+
+
根據製程單位獲取指定單一資料
@@ -6566,6 +6643,11 @@
條碼變更資料表
+
+
+ 條碼置換ID
+
+
條碼ID
@@ -6586,9 +6668,14 @@
建立時間
-
+
- 修改時間
+ 備註
+
+
+
+
+ 建立者Name
@@ -9471,7 +9558,7 @@
- 異常描述
+ 不良原因描述
@@ -9831,7 +9918,7 @@
- 維修方式
+ 維修方式代碼