diff --git a/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml index 2fdf22f1..9fea33f3 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS003.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "標準工時資料查詢"; + ViewData["Title"] = "標準工時資料維護"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } diff --git a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml index 648f6a74..9c2e55eb 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS005.cshtml @@ -1,92 +1,51 @@ @{ ViewData["Title"] = "標準工時資料查詢"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; - } - -
+ +
@ViewBag.Title
-
-
-
-
- -
- -
- +
+
+
+ +
+
-
- - + + +
+ +
-
-
-
- -
+
+ +
+ +
-
-
-
- +
+
- +
+
+ +
- @section Scripts{ - - - - - - - + } \ No newline at end of file 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 e27e500d..8a118cf2 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 78a5ccb3..200bd09b 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 ef141b0a..bcba3b6a 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 a47ea724..bcc0a7af 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 a28a454a..6ea58b65 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 905870d2..3f221c8f 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 aa250481..04a66b86 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 4d1ffc87..ac22a45a 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 c512e923..11b2c2e1 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -72,6 +72,13 @@ BarcodeID + + + 條碼變更資料表 by BarcodeNo 查詢新舊條碼 + + BarcodeID + + 條碼變更資料表 by id @@ -443,6 +450,12 @@ 工單ID + + + 條碼漏刷查詢 + + + 條碼狀態維護 @@ -2285,9 +2298,9 @@ - + - ByWipNo + ByBarcodeID @@ -6727,11 +6740,21 @@ 條碼ID - + 舊條碼序號 + + + 新條碼序號 + + + + + 置換類型 生產序號:P 出貨序號:E + + 建立者 diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs index 84863483..f39ed55c 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/StandardWorkTimesController.cs @@ -157,9 +157,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES if (u!="Null") queryResult = queryResult.Where(p => p.UnitNo.Equals(u)); if(i!="Null") - queryResult = queryResult.Where(p => p.LineID.ToString() == l); + queryResult = queryResult.Where(p => p.ItemNo == i); + //queryResult = queryResult.Where(p => p.LineID.ToString() == l); - var standardWorkTime = await q.ToListAsync(); + var standardWorkTime = await q.ToListAsync(); if (standardWorkTime == null) { 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 a28a454a..6ea58b65 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 905870d2..3f221c8f 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 aa250481..04a66b86 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 4d1ffc87..ac22a45a 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 c512e923..11b2c2e1 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -72,6 +72,13 @@ BarcodeID + + + 條碼變更資料表 by BarcodeNo 查詢新舊條碼 + + BarcodeID + + 條碼變更資料表 by id @@ -443,6 +450,12 @@ 工單ID + + + 條碼漏刷查詢 + + + 條碼狀態維護 @@ -2285,9 +2298,9 @@ - + - ByWipNo + ByBarcodeID @@ -6727,11 +6740,21 @@ 條碼ID - + 舊條碼序號 + + + 新條碼序號 + + + + + 置換類型 生產序號:P 出貨序號:E + + 建立者