Merge branch 'master' of http://61.216.68.18:4000/JHSYS/AMES

.gitignore

@@ -1,2 +1,6 @@
 /AMESCoreStudio.WebApi/obj
 /AMESCoreStudio.Web/obj
+/AMESCoreStudio.Web/bin
+/AMESCoreStudio.WebApi/bin
+/AMES功能確認Check List_驗證狀況20230217.xlsx
+/其他專案資料

.vs/VSWorkspaceState.json

@@ -0,0 +1,8 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\AMESCoreStudio.Web"
+  ],
+  "SelectedNode": "\\AMESCoreStudio.Web\\AMESCoreStudio.Web.csproj",
+  "PreviewInSolutionExplorer": false
+}

AMESCoreStudio.CommonTools/bin/Debug/netcoreapp3.1/AMESCoreStudio.CommonTools.deps.json

@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "AMESCoreStudio.CommonTools/1.0.0": {
+        "runtime": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "AMESCoreStudio.CommonTools/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}

AMESCoreStudio.CommonTools/bin/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.deps.json

@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "AMESCoreStudio.CommonTools/1.0.0": {
+        "runtime": {
+          "AMESCoreStudio.CommonTools.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "AMESCoreStudio.CommonTools/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}

AMESCoreStudio.CommonTools/obj/AMESCoreStudio.CommonTools.csproj.nuget.dgspec.json

@@ -0,0 +1,62 @@
+{
+  "format": 1,
+  "restore": {
+    "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj": {}
+  },
+  "projects": {
+    "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj",
+        "projectName": "AMESCoreStudio.CommonTools",
+        "projectPath": "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj",
+        "packagesPath": "C:\\Users\\user\\.nuget\\packages\\",
+        "outputPath": "D:\\安勤\\AMESCoreStudio.CommonTools\\obj\\",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "C:\\Users\\user\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "netcoreapp3.1"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {}
+        },
+        "frameworks": {
+          "netcoreapp3.1": {
+            "targetAlias": "netcoreapp3.1",
+            "projectReferences": {}
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        }
+      },
+      "frameworks": {
+        "netcoreapp3.1": {
+          "targetAlias": "netcoreapp3.1",
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "frameworkReferences": {
+            "Microsoft.NETCore.App": {
+              "privateAssets": "all"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.416\\RuntimeIdentifierGraph.json"
+        }
+      }
+    }
+  }
+}

AMESCoreStudio.CommonTools/obj/AMESCoreStudio.CommonTools.csproj.nuget.g.props

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\user\.nuget\packages\</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.11.4</NuGetToolVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="C:\Users\user\.nuget\packages\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+</Project>

AMESCoreStudio.CommonTools/obj/AMESCoreStudio.CommonTools.csproj.nuget.g.targets

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+</Project>

AMESCoreStudio.CommonTools/obj/Debug/netcoreapp3.1/AMESCoreStudio.CommonTools.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+8b4f04a8bbf8b477205347bfbef2aac778366cf1

AMESCoreStudio.CommonTools/obj/Debug/netcoreapp3.1/AMESCoreStudio.CommonTools.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,3 @@
+is_global = true
+build_property.RootNamespace = AMESCoreStudio.CommonTools
+build_property.ProjectDir = D:\安勤\AMESCoreStudio.CommonTools\

AMESCoreStudio.CommonTools/obj/Debug/netcoreapp3.1/AMESCoreStudio.CommonTools.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+e69bc2ab63adb2e325904f6a1bcf8a27d2b8d0e9

AMESCoreStudio.CommonTools/obj/Debug/netcoreapp3.1/AMESCoreStudio.CommonTools.csproj.FileListAbsolute.txt

@@ -0,0 +1,10 @@
+D:\安勤\AMESCoreStudio.CommonTools\bin\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.deps.json
+D:\安勤\AMESCoreStudio.CommonTools\bin\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.dll
+D:\安勤\AMESCoreStudio.CommonTools\bin\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.pdb
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.csproj.AssemblyReference.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.GeneratedMSBuildEditorConfig.editorconfig
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.AssemblyInfoInputs.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.AssemblyInfo.cs
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.csproj.CoreCompileInputs.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.dll
+D:\安勤\AMESCoreStudio.CommonTools\obj\Debug\netcoreapp3.1\AMESCoreStudio.CommonTools.pdb

其他專案資料/AMES_AP 1.9/AMES_AP/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs → AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs

@@ -1,4 +1,4 @@
 // <autogenerated />
 using System;
 using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")]

AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.AssemblyInfo.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     這段程式碼是由工具產生的。
+//     執行階段版本:4.0.30319.42000
+//
+//     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+//     變更將會遺失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("AMESCoreStudio.CommonTools")]
+[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyProductAttribute("AMESCoreStudio.CommonTools")]
+[assembly: System.Reflection.AssemblyTitleAttribute("AMESCoreStudio.CommonTools")]
+[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
+
+// 由 MSBuild WriteCodeFragment 類別產生。
+

AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+1a5eac9a851db69d7708ea8cb4c6cc80a90ac2f0

AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.GeneratedMSBuildEditorConfig.editorconfig

@@ -0,0 +1,3 @@
+is_global = true
+build_property.RootNamespace = AMESCoreStudio.CommonTools
+build_property.ProjectDir = D:\安勤\AMESCoreStudio.CommonTools\

AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+7b7947e8b0de0b0edd009ca5c06400baeffd4fe6

AMESCoreStudio.CommonTools/obj/Release/netcoreapp3.1/AMESCoreStudio.CommonTools.csproj.FileListAbsolute.txt

@@ -0,0 +1,10 @@
+D:\安勤\AMESCoreStudio.CommonTools\bin\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.deps.json
+D:\安勤\AMESCoreStudio.CommonTools\bin\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.dll
+D:\安勤\AMESCoreStudio.CommonTools\bin\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.pdb
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.csproj.AssemblyReference.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.GeneratedMSBuildEditorConfig.editorconfig
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.AssemblyInfoInputs.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.AssemblyInfo.cs
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.csproj.CoreCompileInputs.cache
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.dll
+D:\安勤\AMESCoreStudio.CommonTools\obj\Release\netcoreapp3.1\AMESCoreStudio.CommonTools.pdb

AMESCoreStudio.CommonTools/obj/project.assets.json

@@ -0,0 +1,67 @@
+{
+  "version": 3,
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {}
+  },
+  "libraries": {},
+  "projectFileDependencyGroups": {
+    ".NETCoreApp,Version=v3.1": []
+  },
+  "packageFolders": {
+    "C:\\Users\\user\\.nuget\\packages\\": {}
+  },
+  "project": {
+    "version": "1.0.0",
+    "restore": {
+      "projectUniqueName": "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj",
+      "projectName": "AMESCoreStudio.CommonTools",
+      "projectPath": "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj",
+      "packagesPath": "C:\\Users\\user\\.nuget\\packages\\",
+      "outputPath": "D:\\安勤\\AMESCoreStudio.CommonTools\\obj\\",
+      "projectStyle": "PackageReference",
+      "configFilePaths": [
+        "C:\\Users\\user\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+      ],
+      "originalTargetFrameworks": [
+        "netcoreapp3.1"
+      ],
+      "sources": {
+        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+        "https://api.nuget.org/v3/index.json": {}
+      },
+      "frameworks": {
+        "netcoreapp3.1": {
+          "targetAlias": "netcoreapp3.1",
+          "projectReferences": {}
+        }
+      },
+      "warningProperties": {
+        "warnAsError": [
+          "NU1605"
+        ]
+      }
+    },
+    "frameworks": {
+      "netcoreapp3.1": {
+        "targetAlias": "netcoreapp3.1",
+        "imports": [
+          "net461",
+          "net462",
+          "net47",
+          "net471",
+          "net472",
+          "net48"
+        ],
+        "assetTargetFallback": true,
+        "warn": true,
+        "frameworkReferences": {
+          "Microsoft.NETCore.App": {
+            "privateAssets": "all"
+          }
+        },
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.416\\RuntimeIdentifierGraph.json"
+      }
+    }
+  }
+}

AMESCoreStudio.CommonTools/obj/project.nuget.cache

@@ -0,0 +1,8 @@
+{
+  "version": 2,
+  "dgSpecHash": "nixE2583+o2Lb6Ol8XqrOCPqnwJXWrJ+bfZDDbKg9h01hAdu6Y8HnzRmocn5u6NW76OvleIWm7oOkX7gvAA7MA==",
+  "success": true,
+  "projectFilePath": "D:\\安勤\\AMESCoreStudio.CommonTools\\AMESCoreStudio.CommonTools.csproj",
+  "expectedPackageFiles": [],
+  "logs": []
+}

AMESCoreStudio.Web/AMESCoreStudio.Web.csproj.user

@@ -12,5 +12,6 @@
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <ShowAllFiles>true</ShowAllFiles>
     <WebStackScaffolding_EnablerDialogWidth>650.4</WebStackScaffolding_EnablerDialogWidth>
+    <NameOfLastUsedPublishProfile>D:\安勤\AMESCoreStudio.Web\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -109,7 +109,7 @@ namespace AMESCoreStudio.Web.Controllers
                 // 安勤統一執行WIP_SYSTEM
                 if (ViewBag.WipSpecial == "Y")
                 {
-                    Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
+                    //Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
                 }
                 else
                 {
@@ -117,7 +117,7 @@ namespace AMESCoreStudio.Web.Controllers
                     if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
                     {
 
-                        Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
+                        //Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
                     }
                     // 板卡
                     else
@@ -143,7 +143,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         /// <summary>
-        /// 工單工程 儲存判斷
+        /// 工單工程 儲存判斷 改工程確認判斷
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
@@ -151,51 +151,25 @@ namespace AMESCoreStudio.Web.Controllers
         {
             string Msg = string.Empty;
 
-            // 當工單-工程資訊有填寫任何一個欄位，就要把必填欄位都填寫
+            if (string.IsNullOrWhiteSpace(model.Engineer))
-            if (!string.IsNullOrWhiteSpace(model.Engineer) ||
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Engineer)).Name + "，";
-                !string.IsNullOrWhiteSpace(model.BiMemo) ||
-                //!string.IsNullOrWhiteSpace(model.BiTime) ||
-                //string.IsNullOrWhiteSpace(model.BiRatio.ToString()) ||
-                !string.IsNullOrWhiteSpace(model.Checksum) ||
-                !string.IsNullOrWhiteSpace(model.Bios) ||
-                !string.IsNullOrWhiteSpace(model.BiosVer) ||
-                !string.IsNullOrWhiteSpace(model.Cpu) ||
-                !string.IsNullOrWhiteSpace(model.Ram) ||
-                !string.IsNullOrWhiteSpace(model.Fw) ||
-                !string.IsNullOrWhiteSpace(model.Fw1) ||
-                !string.IsNullOrWhiteSpace(model.Fw2) ||
-                !string.IsNullOrWhiteSpace(model.Ec) ||
-                !string.IsNullOrWhiteSpace(model.OsVer) ||
-                !string.IsNullOrWhiteSpace(model.Jumper) ||
-                !string.IsNullOrWhiteSpace(model.BabMemo) ||
-                !string.IsNullOrWhiteSpace(model.TestMemo) ||
-                !string.IsNullOrWhiteSpace(model.PackingMemo))
-            {
 
-                // 判斷預設值是否更改過，如果有就判斷必填欄位
+            // 1  N/A , 4 備註說明
-                if (string.IsNullOrWhiteSpace(model.Engineer) ||
+            if (string.IsNullOrWhiteSpace(model.Bios) && model.BiosType != 1 && model.BiosType != 4)
-                    string.IsNullOrWhiteSpace(model.BiRatio.ToString()) ||
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Bios)).Name + "，";
-                    string.IsNullOrWhiteSpace(model.Bios) ||
-                    string.IsNullOrWhiteSpace(model.Ec) ||
-                    string.IsNullOrWhiteSpace(model.Fw))
-                {
-                    if (string.IsNullOrWhiteSpace(model.Engineer))
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Engineer)).Name + "，";
 
-                    // 1  N/A , 4 備註說明
+            if (string.IsNullOrWhiteSpace(model.Ec) && model.ECType != 1 && model.ECType != 4)
-                    if (string.IsNullOrWhiteSpace(model.Bios) && model.BiosType != 1 && model.BiosType != 4)
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Ec)).Name + "，";
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Bios)).Name + "，";
 
-                    if (string.IsNullOrWhiteSpace(model.Ec) && model.ECType != 1 && model.ECType != 4)
+            if (string.IsNullOrWhiteSpace(model.Fw) && model.FWType != 1 && model.FWType != 4)
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Ec)).Name + "，";
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Fw)).Name + "，";
 
-                    if (string.IsNullOrWhiteSpace(model.Fw) && model.FWType != 1 && model.FWType != 4)
+            if (string.IsNullOrWhiteSpace(model.BiRatio.ToString()))
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.Fw)).Name + "，";
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.BiRatio)).Name + "，";
+
+            if (string.IsNullOrWhiteSpace(model.BiTime))
+                Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.BiTime)).Name + "，";
 
-                    if (string.IsNullOrWhiteSpace(model.BiRatio.ToString()))
-                        Msg += model.GetAttributeFrom<DisplayAttribute>(nameof(model.BiRatio)).Name + "，";
-                }
-            }
             return Msg;
         }
 
@@ -2781,6 +2755,12 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                 }
 
+                // 工程確認才要判斷 工程資訊是否必填完整
+                if (action == "工程確認")
+                {
+                    Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
+                }
+
                 if (!string.IsNullOrWhiteSpace(Msg))
                 {
                     if (Msg.StartsWith("，"))
@@ -3129,6 +3109,12 @@ namespace AMESCoreStudio.Web.Controllers
                     Msg += "，修改工單數量不能小於已投入數量";
                 }
 
+                // 工程確認才要判斷 工程資訊是否必填完整
+                if (action == "工程確認")
+                {
+                    Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
+                }
+
                 if (!string.IsNullOrWhiteSpace(Msg))
                 {
                     if (Msg.StartsWith("，"))

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -14,6 +14,8 @@ using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.WebApi.Models.BAS;
 using System;
 using System.Data;
+using AMESCoreStudio.Web.ViewModels;
+using AspNetCore.Reporting;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -26,9 +28,10 @@ namespace AMESCoreStudio.Web.Controllers
         public readonly IPCS _pcsApi;
         public readonly ISYS _sysApi;
         public readonly IKCS _kcsApi;
+        public readonly IQRS _qrsApi;
         private readonly IWebHostEnvironment _env;
 
-        public QRSController(ILogger<QRSController> logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, ISYS sysApi, IKCS kcsApi, IWebHostEnvironment env)
+        public QRSController(ILogger<QRSController> logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, ISYS sysApi, IKCS kcsApi, IWebHostEnvironment env, IQRS qrsApi)
         {
             _logger = logger;
             _repApi = repApi;
@@ -37,6 +40,7 @@ namespace AMESCoreStudio.Web.Controllers
             _pcsApi = pcsApi;
             _sysApi = sysApi;
             _kcsApi = kcsApi;
+            _qrsApi = qrsApi;
             _env = env;
         }
 
@@ -10640,6 +10644,102 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+        #region QRS022 儲存裝置掃毒暨異常處理查詢
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> QRS022()
+        {
+            return View();
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> QRS022Query(string wipNO, string itemNO, string DateStart, string DateEnd)
+        {   
+            var result = await  _pcsApi.GetAntiVirusResult(wipNO, itemNO, DateStart, DateEnd);
+
+            var query = new QRS022ViewModel();
+
+            foreach (var data in result.Data)
+            {
+                JObject jo = JObject.Parse(data.ToString());
+
+                query.AntiVirus.Add(new AntiVirus
+                {
+                    wip = jo["wip"].ToString(),
+                    models = jo["models"].ToString(),
+                    station = jo["station"].ToString(),
+                    prg_Name = jo["prg_Name"].ToString(),
+                    disk_Number = jo["disk_Number"].ToString(),
+                    virusname = jo["virusname"].ToString(),
+                    scan_Status = jo["scan_Status"].ToString(),
+                    user_Name = jo["user_Name"].ToString(),
+                    time = jo["time"].ToString(),
+                    result = jo["result"].ToString()
+                });
+
+            }
+
+            if (result.DataTotal > 0 )
+            {
+                return Json(new Table() { code = 0, msg = "", data = query.AntiVirus, count = result.DataTotal });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+        #region QRS023  電動起子扭力紀錄表
+        /// <summary>
+        /// QRS023
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IActionResult> QRS023()
+
+        {
+            return View();
+        }
+
+        public async Task<IActionResult> QRS023QueryAsync(string wipNo, string sapNo, string dateStr, string dateEnd, int page = 0, int limit = 10)
+        {
+
+            var result = await _qrsApi.GetEstorquebyQueryAll(wipNo: wipNo, sapNo: sapNo, sDate: dateStr, eDate: dateEnd, page: page, limit: limit);
+
+            return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+        }
+
+        public async Task<IActionResult> QRS023_Excel(string wipNo, string sapNo, string dateStr, string dateEnd)
+        {
+            string mimeType = "";
+            int extension = 1;
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            var localReport = GetReprot(wipNo, sapNo, dateStr, dateEnd);
+            var result = localReport.Result.Execute(RenderType.ExcelOpenXml, extension, param, mimeType);
+            //return File(result.MainStream, "application/msexcel", "Export.xls");
+            return File(result.MainStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "ZTorque_" + System.DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".xlsx");
+            //return File(result.MainStream, "application/msexcel", "Export.xls");
+        }
+
+        /// <summary>
+        /// 產生FQC報表
+        /// </summary>
+        /// <param name="inhouseNo">FQC單號</param>
+        /// <param name="seqID">FQC單號_編號</param>
+        /// <returns></returns>
+        private async Task<LocalReport> GetReprot(string wipNo, string sapNo, string dateStr, string dateEnd)
+        {
+            var path = $"{this._env.WebRootPath}\\Reports\\QRS023View.rdlc";
+            LocalReport localReport = new LocalReport(path);
+
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+            System.Text.Encoding.GetEncoding(1252);
+            var resultQuery = _qrsApi.GetEstorquebyQueryAll(wipNo, sapNo, dateStr, dateEnd).InvokeAsync().Result;
+
+            localReport.AddDataSource("DataSet3", resultQuery.Data);
+
+
+            return localReport;
+        }
+        #endregion
+
+        #endregion
         /// <summary>
         /// 登入UserID
         /// </summary>

AMESCoreStudio.Web/Controllers/RPTController.cs

@@ -87,7 +87,7 @@ namespace AMESCoreStudio.Web.Controllers
             var eDate = new DateTime(Data.Year, Data.Month, DateTime.DaysInMonth(Data.Year, Data.Month)).ToString("yyyy/MM/dd");
 
             var werkNo = string.Empty;
-            var werksNoArrsy = new List<string> { "YS31", "YS32", "YS33", "YS34" };
+            var werksNoArrsy = new List<string> { "YS31", "YS37", "YS28", "YS03" };
             if (werksNoArrsy.Count >= werksNoSeq + 1)
             {
                 werkNo = werksNoArrsy[werksNoSeq];

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1838,6 +1838,17 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
+        #region QRS022 查詢儲存裝置掃毒暨異常處理
+
+        /// <summary>
+        /// 根据工單號碼or機種料號查詢儲存裝置掃毒暨異常處理
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/AntiVirusResult/GetAntiVirusResult")]
+        ITask<ResultModel<dynamic>> GetAntiVirusResult(string WIP, string Model, string STime, string ETime);
+
+        #endregion
+
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetZDNDetail4PTD001")]
         ITask<ResultModel<dynamic>> GetZDNDetail4PTD001(string dnNo, string lineNo);
 

AMESCoreStudio.Web/HttpApis/AMES/IQRS.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using WebApiClient;
+using WebApiClient.Attributes;
+using AMESCoreStudio.WebApi;
+using Microsoft.AspNetCore.Mvc;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.CommonTools.Result;
+
+namespace AMESCoreStudio.Web
+{
+    [JsonReturn]
+    public interface IQRS:IHttpApi
+    {
+        #region QRS023 電動起子扭力紀錄表
+
+        /// <summary>
+        /// 獲取電動起子扭力紀錄表
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/ESTorque/ESTorqueByQuery")]
+        ITask<ResultModel<Estorque>> GetEstorquebyQueryAll(string wipNo,string sapNo,string sDate, string eDate, int page = 0, int limit = 10);
+        #endregion
+
+
+
+
+    }
+}

AMESCoreStudio.Web/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\netcoreapp3.1\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>

AMESCoreStudio.Web/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_PublishTargetUrl>D:\安勤\AMESCoreStudio.Web\bin\Release\netcoreapp3.1\publish\</_PublishTargetUrl>
+    <History>True|2023-10-29T03:59:57.8150243Z;True|2023-10-27T22:55:30.4920487+08:00;True|2023-10-27T22:52:40.5208616+08:00;True|2023-10-27T22:45:46.4902926+08:00;True|2023-10-27T22:43:32.5073372+08:00;True|2023-10-27T22:34:44.4298588+08:00;True|2023-10-27T22:28:57.2100227+08:00;True|2023-10-27T22:28:09.4474976+08:00;True|2023-10-27T21:59:01.2046664+08:00;True|2023-10-17T21:16:33.9226829+08:00;True|2023-10-17T20:01:42.6733888+08:00;True|2023-10-17T19:58:16.6221251+08:00;True|2023-10-16T23:35:14.2896401+08:00;False|2023-10-16T23:34:45.1241034+08:00;True|2023-10-16T22:53:55.7871835+08:00;True|2023-10-16T22:46:56.2940397+08:00;True|2023-10-16T22:34:53.1592091+08:00;True|2023-10-16T22:32:29.6090292+08:00;True|2023-10-16T22:06:46.6554573+08:00;True|2023-10-16T21:58:05.8005033+08:00;True|2023-10-16T21:55:30.5044073+08:00;False|2023-10-16T21:53:42.0996096+08:00;True|2023-10-16T21:19:35.4894524+08:00;True|2023-10-16T21:15:44.9085339+08:00;True|2023-10-16T21:11:02.0659155+08:00;True|2023-10-16T21:04:06.9114035+08:00;True|2023-10-16T19:10:49.2492978+08:00;True|2023-10-16T02:41:52.4773153+08:00;True|2023-10-16T02:24:37.3790258+08:00;True|2023-10-16T02:07:27.6665756+08:00;True|2023-10-16T02:05:19.8365205+08:00;True|2023-10-16T02:02:13.9593582+08:00;True|2023-10-16T01:49:13.8259798+08:00;True|2023-10-16T00:45:51.8210510+08:00;True|2023-10-16T00:07:34.3977458+08:00;True|2023-10-16T00:05:59.1767445+08:00;True|2023-10-15T23:56:57.0511770+08:00;True|2023-10-15T23:47:43.2409910+08:00;True|2023-10-15T23:44:39.6107115+08:00;True|2023-10-15T23:41:12.5926491+08:00;True|2023-10-15T23:34:07.7786189+08:00;True|2023-10-15T23:28:03.4533016+08:00;True|2023-10-15T23:02:27.2331519+08:00;True|2023-10-15T22:38:32.6740851+08:00;True|2023-10-15T21:15:44.9336150+08:00;True|2023-10-15T20:54:43.0092560+08:00;True|2023-10-15T19:48:04.7130940+08:00;True|2023-10-15T19:34:57.5003705+08:00;True|2023-10-15T18:14:03.6099630+08:00;True|2023-10-14T23:19:16.6904174+08:00;True|2023-10-06T14:08:48.3817285+08:00;</History>
+  </PropertyGroup>
+</Project>

AMESCoreStudio.Web/ViewModels/QRS/QRS022ViewModel.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.DTO.AMES;
+
+namespace AMESCoreStudio.Web.ViewModels.QRS
+{
+    public class QRS022ViewModel
+    {
+        public QRS022ViewModel()
+        {
+            AntiVirus = new List<AntiVirus>();
+        }
+
+        public List<AntiVirus> AntiVirus { get; set; }
+
+
+    }
+
+
+    public class AntiVirus
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string wip { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string models { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string station { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string prg_Name { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string disk_Number { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string virusname { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string scan_Status { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string user_Name { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string time { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string result { get; set; }
+
+    }
+
+}

AMESCoreStudio.Web/Views/QRS/QRS022.cshtml

@@ -0,0 +1,223 @@
+@{
+    ViewData["Title"] = "儲存裝置掃毒暨異常處理查詢";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-field-title {
+        margin: auto;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+</style>
+
+
+<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">
+        <div class="layui-form">
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <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="請輸入工單號碼">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">機種料號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="itemNO" name="itemNO" autocomplete="off" class="layui-input" placeholder="請輸入機種料號">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm5">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">完成時間區間:</label>
+                            <div class="layui-input-inline" style="width:120px">
+                                <input id="DateStart" name="DateStart" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:120px">
+                                <input id="DateEnd" name="DateEnd" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm1">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        QQ4-060 Rev.A8
+        <table class="layui-hide" id="test" lay-filter="test"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.config({
+            base: '../lib/layui_ext/',
+        }).extend({
+            excel: 'excel',
+        });
+    </script>
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#DateStart'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+
+            laydate.render({
+                elem: '#DateEnd'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+        });
+        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("QRS022Query", "QRS")',
+                        dataType: 'json',
+                        success(res) {
+                            var data = res.data;
+                            data = excel.filterExportData(data, [
+                                'wip',
+                                'models',
+                                'station',
+                                'prg_Name',
+                                'disk_Number',
+                                'virusname',
+                                'scan_Status',
+                                'user_Name',
+                                'time',
+                                'result'
+                            ]);
+
+                            data.unshift({
+                                wip: "工單號碼", models: "機種料號", station: "來源", prg_Name: "檔案名稱", disk_Number: "裝置", virusname: "掃毒軟體",
+                                scan_Status: "掃毒結果", user_Name: "人員", time: "完成時間", result: "原因分析處理"
+                            });
+
+                            var timestart = Date.now();
+                            excel.downloadExcel(data, '儲存裝置掃毒查詢' + formatJSONDate(Date.now().toString()), 'xlsx');
+                            var timeend = Date.now();
+
+                            var spent = (timeend - timestart) / 1000;
+                            layer.alert('導出全部數據耗時 ' + spent + ' s');
+                        }
+                        , error() {
+                            layer.alert('導出全部數據失敗');
+                        }
+                    });
+                });
+            });
+
+            //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            hg.msghide("重新載入資料..");
+            table && table.reload(data);
+        });
+
+            var tableCols = [[
+                {
+                    field: 'wip',
+                    width: 200,
+                    title: '工單號碼'
+                },
+                {
+                    field: 'models',
+                    width: 220,
+                    title: '機種料號'
+                },
+                {
+                    field: 'station',
+                    width: 80,
+                    title: '來源'
+                },
+                {
+                    field: 'prg_Name',
+                    minWidth: 200,
+                    title: '檔案名稱'
+                },
+                {
+                    field: 'disk_Number',
+                    minWidth: 100,
+                    title: '裝置'
+                },
+                {
+                    field: 'virusname',
+                    minWidth: 100,
+                    title: '掃毒軟體'
+                },
+                {
+                    field: 'scan_Status',
+                    minWidth: 100,
+                    title: '掃毒結果'
+                },
+                {
+                    field: 'user_Name',
+                    minWidth: 100,
+                    title: '人員'
+                },
+                {
+                    field: 'time',
+                    title: '完成時間',
+                    width: 180,
+                    /*templet: '<div>{{ layui.util.toDateString(d.Time, "yyyy-MM-dd HH:mm") }}</div>'*/
+                },
+                {
+                    field: 'result',
+                    minWidth: 100,
+                    title: '原因分析處理'
+                }]
+            ];
+            var table = hg.table.datatable('test', '儲存裝置掃毒暨異常處理查詢', '/QRS/QRS022Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.Web/Views/QRS/QRS023.cshtml

@@ -0,0 +1,181 @@
+@{
+    ViewData["Title"] = "電動起子扭力紀錄表";
+    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> 電動起子扭力紀錄表</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form">
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工單號碼:</label>
+                            <div class="layui-input-inline" style="width:140px">
+                                <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">SAP編號</label>
+                            <div class="layui-input-inline" style="width:140px">
+                                <input id="sapNo" name="sapNo" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-form-item">
+                    <div class="layui-col-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">日期:</label>
+                            <div class="layui-input-inline" style="width:90px">
+                                <input id="dateStr" name="dateStr" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                            <div class="layui-form-mid">～</div>
+                            <div class="layui-input-inline" style="width:90px">
+                                <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input" readonly="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm1">
+                        <div class="layui-inline layui-show-xs-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-inline">
+                <button type="button" id="btnExcel" class="layui-btn layui-btn-normal layui-btn-sm"><i class="fa fa-file-excel-o"></i>導出Excel</button>
+            </div>
+            <div class="layui-col-sm4">
+            </div>
+            <div class="layui-form">
+                <div class="layui-col-sm">
+                    <div class="layui-inline">
+                        <div class="layui-row" style="margin-top: 30px;">
+                            <div class="layui-row">
+                                QO4-109 Rev.A4
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="test" lay-filter="test"></table>
+        </div>
+
+            <table class="layui-hide" id="query" lay-filter="query"></table>
+        </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            form = layui.form;
+            laydate = layui.laydate;
+            laydate.render({
+                elem: '#dateStr'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+
+            laydate.render({
+                elem: '#dateEnd'
+                , trigger: 'click'
+                , format: 'yyyy/MM/dd'
+                , theme: 'grid'
+            });
+
+ 
+        });
+
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            hg.msghide("重新載入資料..");
+
+            table && table.reload(data);
+        });
+
+        var tableCols = [[
+            {
+                field: 'createDate',
+                title: '日期',
+                width:150,
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy-MM-dd") }}</div>'
+            },
+            {
+                field: 'wipNo',
+                width: 150,
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'sapNo',
+                title: 'SAP編號',
+                width: 150
+            },
+            {
+                field: 'setupValue',
+                title: '設定值',
+                width: 150,
+                sort: true
+            },
+            {
+                field: 'torqueValue',
+                title: '受校器讀值',
+                width: 150,
+                sort: true
+            },
+            {
+                field: 'userName',
+                width: 150,
+                title: '自校人員'
+            },
+            {
+                field: 'route',
+                title: '站別',
+                width: 150,
+                sort: true
+            },
+            {
+                field: 'factorityNo',
+                title: '廠別',
+                width: 150,
+                sort: true
+            }
+        ]];
+        wipNo = $("#wipNo").val();
+        sapNo = $("#sapNo").val();
+        sdate1 = $("#dateStr").val();
+        edate1 = $("#dateEnd").val();
+        var table = hg.table.datatable('query', '電動起子扭力紀錄表', '/QRS/QRS023Query', { wipNo: wipNo, sapNo: sapNo, dateStr: sdate1, dateEnd: edate1}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+
+
+        $('#btnExcel').click(function () {
+            wipNo = $("#wipNo").val();
+            sapNo = $("#sapNo").val();
+            sdate1 = $("#dateStr").val();
+            edate1 = $("#dateEnd").val();
+            window.open('/QRS/QRS023_Excel?wipNo=' + wipNo + '&sapNo=' + sapNo + '&dateStr='+sdate1 + '&dateEnd=' + edate1);
+        });
+
+
+
+    </script>
+
+
+}

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json

@@ -1,8 +0,0 @@
-{
-  "runtimeOptions": {
-    "additionalProbingPaths": [
-      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\USER\\.nuget\\packages"
-    ]
-  }
-}

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.json

@@ -1,13 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "netcoreapp3.1",
-    "framework": {
-      "name": "Microsoft.AspNetCore.App",
-      "version": "3.1.0"
-    },
-    "configProperties": {
-      "System.GC.Server": true,
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
-    }
-  }
-}

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json

@@ -1,8 +0,0 @@
-{
-  "runtimeOptions": {
-    "additionalProbingPaths": [
-      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\USER\\.nuget\\packages"
-    ]
-  }
-}

AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.json

@@ -1,13 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "netcoreapp3.1",
-    "framework": {
-      "name": "Microsoft.AspNetCore.App",
-      "version": "3.1.0"
-    },
-    "configProperties": {
-      "System.GC.Server": true,
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
-    }
-  }
-}