diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index ef2c5074..47252255 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -1095,7 +1095,7 @@ namespace AMESCoreStudio.Web.Controllers - var result = await _whsApi.GetExceptionWorktimeOlineByQuery(factoryNo, unitNo, lineID, deptID, sdate, edate); + var result = await _whsApi.GetExceptionWorktimeByQuery(factoryNo, unitNo, lineID, deptID, sdate, edate); if (result.Count > 0) 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 8a118cf2..eac8f697 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 200bd09b..5b542416 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.deps.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json index 1c4f4063..19ed2a0a 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json @@ -32,11 +32,15 @@ "AMESCoreStudio.Web/1.0.0": { "dependencies": { "AMESCoreStudio.WebApi": "1.0.0", + "AspNetCore.Reporting": "2.1.0", "ClosedXML": "0.95.4", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20", "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation": "3.1.3", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5", + "System.CodeDom": "6.0.0", + "System.Data.SqlClient": "4.8.3", + "System.Text.Encoding.CodePages": "6.0.0", "WebApiClient.JIT": "1.1.4", "Microsoft.AspNetCore.Antiforgery": "3.1.0.0", "Microsoft.AspNetCore.Authentication.Abstractions": "3.1.0.0", @@ -231,7 +235,7 @@ "System.Numerics": "4.0.0.0", "System.Numerics.Vectors": "4.1.6.0", "System.ObjectModel.Reference": "4.1.2.0", - "System.Reflection.DispatchProxy": "4.0.6.0", + "System.Reflection.DispatchProxy.Reference": "4.0.6.0", "System.Reflection.Reference": "4.2.2.0", "System.Reflection.Emit.Reference": "4.1.2.0", "System.Reflection.Emit.ILGeneration.Reference": "4.1.1.0", @@ -243,7 +247,6 @@ "System.Resources.Reader": "4.1.2.0", "System.Resources.ResourceManager.Reference": "4.1.2.0", "System.Resources.Writer": "4.1.2.0", - "System.Runtime.CompilerServices.Unsafe.Reference": "4.0.6.0", "System.Runtime.CompilerServices.VisualC": "4.1.2.0", "System.Runtime.Reference": "4.2.2.0", "System.Runtime.Extensions.Reference": "4.2.2.0", @@ -275,7 +278,6 @@ "System.Security.SecureString.Reference": "4.1.2.0", "System.ServiceModel.Web": "4.0.0.0", "System.ServiceProcess": "4.0.0.0", - "System.Text.Encoding.CodePages.Reference": "4.1.3.0", "System.Text.Encoding.Reference": "4.1.2.0", "System.Text.Encoding.Extensions.Reference": "4.1.2.0", "System.Text.Encodings.Web.Reference": "4.0.5.0", @@ -323,6 +325,41 @@ "AMESCoreStudio.Web.dll": {} } }, + "AspNetCore.Reporting/2.1.0": { + "dependencies": { + "AspNetCore.ReportingServices": "2.1.0", + "Newtonsoft.Json": "12.0.2", + "System.CodeDom": "6.0.0", + "System.Data.SqlClient": "4.8.3", + "System.ServiceModel.Http": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/AspNetCore.Reporting.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.0" + } + }, + "compile": { + "lib/netstandard2.0/AspNetCore.Reporting.dll": {} + } + }, + "AspNetCore.ReportingServices/2.1.0": { + "dependencies": { + "Newtonsoft.Json": "12.0.2", + "System.CodeDom": "6.0.0", + "System.Data.SqlClient": "4.8.3", + "System.IO.Compression": "4.3.0" + }, + "runtime": { + "lib/netstandard2.0/AspNetCore.ReportingServices.dll": { + "assemblyVersion": "2.1.0.0", + "fileVersion": "2.1.0.0" + } + }, + "compile": { + "lib/netstandard2.0/AspNetCore.ReportingServices.dll": {} + } + }, "Castle.Core/4.4.1": { "dependencies": { "NETStandard.Library": "1.6.1", @@ -485,8 +522,8 @@ "System.Collections.Immutable": "5.0.0", "System.Memory": "4.5.3", "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encoding.CodePages": "6.0.0", "System.Threading.Tasks.Extensions": "4.5.3" }, "runtime": { @@ -734,8 +771,8 @@ "System.Configuration.ConfigurationManager": "4.7.0", "System.Runtime.Caching": "4.5.0", "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.5.1", - "runtime.native.System.Data.SqlClient.sni": "4.4.0" + "System.Text.Encoding.CodePages": "6.0.0", + "runtime.native.System.Data.SqlClient.sni": "4.7.0" }, "runtime": { "lib/netcoreapp2.1/Microsoft.Data.SqlClient.dll": { @@ -1377,7 +1414,7 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, - "runtime.native.System.Data.SqlClient.sni/4.4.0": { + "runtime.native.System.Data.SqlClient.sni/4.7.0": { "dependencies": { "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni": "4.4.0", "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": "4.4.0", @@ -1511,6 +1548,17 @@ "System.Threading": "4.3.0" } }, + "System.CodeDom/6.0.0": { + "runtime": { + "lib/netstandard2.0/System.CodeDom.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + }, + "compile": { + "lib/netstandard2.0/System.CodeDom.dll": {} + } + }, "System.Collections/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "3.1.0", @@ -1750,6 +1798,36 @@ "System.Text.Encoding": "4.3.0" } }, + "System.Data.SqlClient/4.8.3": { + "dependencies": { + "Microsoft.Win32.Registry": "4.7.0", + "System.Security.Principal.Windows": "4.7.0", + "runtime.native.System.Data.SqlClient.sni": "4.7.0" + }, + "runtime": { + "lib/netcoreapp2.1/System.Data.SqlClient.dll": { + "assemblyVersion": "4.6.1.3", + "fileVersion": "4.700.21.41603" + } + }, + "runtimeTargets": { + "runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": { + "rid": "unix", + "assetType": "runtime", + "assemblyVersion": "4.6.1.3", + "fileVersion": "4.700.21.41603" + }, + "runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "4.6.1.3", + "fileVersion": "4.700.21.41603" + } + }, + "compile": { + "ref/netcoreapp2.1/System.Data.SqlClient.dll": {} + } + }, "System.Diagnostics.Debug/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "3.1.0", @@ -2164,6 +2242,27 @@ "System.Xml.XmlSerializer": "4.3.0" } }, + "System.Private.ServiceModel/4.5.3": { + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0", + "System.Reflection.DispatchProxy": "4.5.0", + "System.Security.Principal.Windows": "4.7.0" + }, + "runtimeTargets": { + "runtimes/unix/lib/netstandard2.0/System.Private.ServiceModel.dll": { + "rid": "unix", + "assetType": "runtime", + "assemblyVersion": "4.5.0.3", + "fileVersion": "4.6.26720.1" + }, + "runtimes/win/lib/netstandard2.0/System.Private.ServiceModel.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "4.5.0.3", + "fileVersion": "4.6.26720.1" + } + } + }, "System.Reflection/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "3.1.0", @@ -2173,6 +2272,7 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.DispatchProxy/4.5.0": {}, "System.Reflection.Emit/4.3.0": { "dependencies": { "System.IO": "4.3.0", @@ -2260,7 +2360,17 @@ } } }, - "System.Runtime.CompilerServices.Unsafe/4.5.2": {}, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "runtime": { + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + }, + "compile": { + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll": {} + } + }, "System.Runtime.Extensions/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "3.1.0", @@ -2476,6 +2586,40 @@ "System.Threading": "4.3.0" } }, + "System.ServiceModel.Http/4.5.3": { + "dependencies": { + "System.Private.ServiceModel": "4.5.3", + "System.ServiceModel.Primitives": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/System.ServiceModel.Http.dll": { + "assemblyVersion": "4.5.0.3", + "fileVersion": "4.6.26720.1" + } + }, + "compile": { + "ref/netstandard2.0/System.ServiceModel.Http.dll": {} + } + }, + "System.ServiceModel.Primitives/4.5.3": { + "dependencies": { + "System.Private.ServiceModel": "4.5.3" + }, + "runtime": { + "lib/netstandard2.0/System.ServiceModel.Primitives.dll": { + "assemblyVersion": "4.5.0.3", + "fileVersion": "4.6.26720.1" + }, + "lib/netstandard2.0/System.ServiceModel.dll": { + "assemblyVersion": "4.0.0.0", + "fileVersion": "4.6.26720.1" + } + }, + "compile": { + "ref/netstandard2.0/System.ServiceModel.Primitives.dll": {}, + "ref/netstandard2.0/System.ServiceModel.dll": {} + } + }, "System.Text.Encoding/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "3.1.0", @@ -2483,10 +2627,26 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.CodePages/4.5.1": { + "System.Text.Encoding.CodePages/6.0.0": { "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "runtime": { + "lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + }, + "runtimeTargets": { + "runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + }, + "compile": { + "lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll": {} } }, "System.Text.Encoding.Extensions/4.3.0": { @@ -3812,7 +3972,7 @@ }, "compileOnly": true }, - "System.Reflection.DispatchProxy/4.0.6.0": { + "System.Reflection.DispatchProxy.Reference/4.0.6.0": { "compile": { "System.Reflection.DispatchProxy.dll": {} }, @@ -3884,12 +4044,6 @@ }, "compileOnly": true }, - "System.Runtime.CompilerServices.Unsafe.Reference/4.0.6.0": { - "compile": { - "System.Runtime.CompilerServices.Unsafe.dll": {} - }, - "compileOnly": true - }, "System.Runtime.CompilerServices.VisualC/4.1.2.0": { "compile": { "System.Runtime.CompilerServices.VisualC.dll": {} @@ -4076,12 +4230,6 @@ }, "compileOnly": true }, - "System.Text.Encoding.CodePages.Reference/4.1.3.0": { - "compile": { - "System.Text.Encoding.CodePages.dll": {} - }, - "compileOnly": true - }, "System.Text.Encoding.Reference/4.1.2.0": { "compile": { "System.Text.Encoding.dll": {} @@ -4276,6 +4424,20 @@ "serviceable": false, "sha512": "" }, + "AspNetCore.Reporting/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-57lh6Wsmdq/Jt4xJoxu1WSG+QFoKYTaheTXVASBx+6pqRcjCvzIk4JNj5LGomWO2G1SwHQdSxCZHNOdimcARLg==", + "path": "aspnetcore.reporting/2.1.0", + "hashPath": "aspnetcore.reporting.2.1.0.nupkg.sha512" + }, + "AspNetCore.ReportingServices/2.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-tnqFe8Vxr4sJCEyO4XbUDqnDM+QOE8lDqpcmKM4ayhoNv1973XwztizPyQQMT9/gey26+AoT56BTdAyWC3CuMQ==", + "path": "aspnetcore.reportingservices/2.1.0", + "hashPath": "aspnetcore.reportingservices.2.1.0.nupkg.sha512" + }, "Castle.Core/4.4.1": { "type": "package", "serviceable": true, @@ -4773,12 +4935,12 @@ "path": "runtime.native.system/4.3.0", "hashPath": "runtime.native.system.4.3.0.nupkg.sha512" }, - "runtime.native.System.Data.SqlClient.sni/4.4.0": { + "runtime.native.System.Data.SqlClient.sni/4.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-A8v6PGmk+UGbfWo5Ixup0lPM4swuSwOiayJExZwKIOjTlFFQIsu3QnDXECosBEyrWSPryxBVrdqtJyhK3BaupQ==", - "path": "runtime.native.system.data.sqlclient.sni/4.4.0", - "hashPath": "runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512" + "sha512": "sha512-9kyFSIdN3T0qjDQ2R0HRXYIhS3l5psBzQi6qqhdLz+SzFyEy4sVxNOke+yyYv8Cu8rPER12c3RDjLT8wF3WBYQ==", + "path": "runtime.native.system.data.sqlclient.sni/4.7.0", + "hashPath": "runtime.native.system.data.sqlclient.sni.4.7.0.nupkg.sha512" }, "runtime.native.System.IO.Compression/4.3.0": { "type": "package", @@ -4927,6 +5089,13 @@ "path": "system.buffers/4.3.0", "hashPath": "system.buffers.4.3.0.nupkg.sha512" }, + "System.CodeDom/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA==", + "path": "system.codedom/6.0.0", + "hashPath": "system.codedom.6.0.0.nupkg.sha512" + }, "System.Collections/4.3.0": { "type": "package", "serviceable": true, @@ -5046,6 +5215,13 @@ "path": "system.console/4.3.0", "hashPath": "system.console.4.3.0.nupkg.sha512" }, + "System.Data.SqlClient/4.8.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-yERfVLXAY0QbylAgaGLByYN0hFxX28aeEQ0hUgJO+Ntn1AfmWl5HHUoYJA0Yl9HhIUUJHVaS/Sw/RLZr5aaC+A==", + "path": "system.data.sqlclient/4.8.3", + "hashPath": "system.data.sqlclient.4.8.3.nupkg.sha512" + }, "System.Diagnostics.Debug/4.3.0": { "type": "package", "serviceable": true, @@ -5256,6 +5432,13 @@ "path": "system.private.datacontractserialization/4.3.0", "hashPath": "system.private.datacontractserialization.4.3.0.nupkg.sha512" }, + "System.Private.ServiceModel/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ancrQgJagx+yC4SZbuE+eShiEAUIF0E1d21TRSoy1C/rTwafAVcBr/fKibkq5TQzyy9uNil2tx2/iaUxsy0S9g==", + "path": "system.private.servicemodel/4.5.3", + "hashPath": "system.private.servicemodel.4.5.3.nupkg.sha512" + }, "System.Reflection/4.3.0": { "type": "package", "serviceable": true, @@ -5263,6 +5446,13 @@ "path": "system.reflection/4.3.0", "hashPath": "system.reflection.4.3.0.nupkg.sha512" }, + "System.Reflection.DispatchProxy/4.5.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-+UW1hq11TNSeb+16rIk8hRQ02o339NFyzMc4ma/FqmxBzM30l1c2IherBB4ld1MNcenS48fz8tbt50OW4rVULA==", + "path": "system.reflection.dispatchproxy/4.5.0", + "hashPath": "system.reflection.dispatchproxy.4.5.0.nupkg.sha512" + }, "System.Reflection.Emit/4.3.0": { "type": "package", "serviceable": true, @@ -5333,12 +5523,12 @@ "path": "system.runtime.caching/4.5.0", "hashPath": "system.runtime.caching.4.5.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.5.2": { + "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==", - "path": "system.runtime.compilerservices.unsafe/4.5.2", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512" + "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" }, "System.Runtime.Extensions/4.3.0": { "type": "package", @@ -5480,6 +5670,20 @@ "path": "system.security.securestring/4.3.0", "hashPath": "system.security.securestring.4.3.0.nupkg.sha512" }, + "System.ServiceModel.Http/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zxR4z6G/FFK/uAUbo7+3IJOqm0w4/lyfHSQDf+hhUHRTc7XSeReGS5iKQq95gyl1ighHEuayqOiB7iacrB6ZUg==", + "path": "system.servicemodel.http/4.5.3", + "hashPath": "system.servicemodel.http.4.5.3.nupkg.sha512" + }, + "System.ServiceModel.Primitives/4.5.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Wc9Hgg4Cmqi416zvEgq2sW1YYCGuhwWzspDclJWlFZqY6EGhFUPZU+kVpl5z9kAgrSOQP7/Uiik+PtSQtmq+5A==", + "path": "system.servicemodel.primitives/4.5.3", + "hashPath": "system.servicemodel.primitives.4.5.3.nupkg.sha512" + }, "System.Text.Encoding/4.3.0": { "type": "package", "serviceable": true, @@ -5487,12 +5691,12 @@ "path": "system.text.encoding/4.3.0", "hashPath": "system.text.encoding.4.3.0.nupkg.sha512" }, - "System.Text.Encoding.CodePages/4.5.1": { + "System.Text.Encoding.CodePages/6.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", - "path": "system.text.encoding.codepages/4.5.1", - "hashPath": "system.text.encoding.codepages.4.5.1.nupkg.sha512" + "sha512": "sha512-ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", + "path": "system.text.encoding.codepages/6.0.0", + "hashPath": "system.text.encoding.codepages.6.0.0.nupkg.sha512" }, "System.Text.Encoding.Extensions/4.3.0": { "type": "package", @@ -6567,7 +6771,7 @@ "serviceable": false, "sha512": "" }, - "System.Reflection.DispatchProxy/4.0.6.0": { + "System.Reflection.DispatchProxy.Reference/4.0.6.0": { "type": "referenceassembly", "serviceable": false, "sha512": "" @@ -6627,11 +6831,6 @@ "serviceable": false, "sha512": "" }, - "System.Runtime.CompilerServices.Unsafe.Reference/4.0.6.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, "System.Runtime.CompilerServices.VisualC/4.1.2.0": { "type": "referenceassembly", "serviceable": false, @@ -6787,11 +6986,6 @@ "serviceable": false, "sha512": "" }, - "System.Text.Encoding.CodePages.Reference/4.1.3.0": { - "type": "referenceassembly", - "serviceable": false, - "sha512": "" - }, "System.Text.Encoding.Reference/4.1.2.0": { "type": "referenceassembly", "serviceable": false, diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index bcba3b6a..f67219c9 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 bcc0a7af..5c143999 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 6ea58b65..eb3660c4 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 3f221c8f..eb8adea4 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 04a66b86..fd75dc4d 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 ac22a45a..aa905739 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 11b2c2e1..fcee73c2 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -172,6 +172,13 @@ 包裝箱號 + + + 用工單ID找條碼资料 + + 工單ID + + 更新條碼资料 @@ -1119,6 +1126,12 @@ 序號 + + + FQC細項資料 + + + 新增檢驗單明細資料檔 @@ -3587,6 +3600,61 @@ + + + 外包機種資料維護 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 修改外包機種資料 + + + + + + + + + + + + + + + + + + + 工作群組維護 @@ -3983,18 +4051,27 @@ - 新增工單條碼區間設定檔 + 新增工單出貨條碼區間設定檔 - 更新工單條碼區間設定檔 + 更新工單出貨條碼區間設定檔 + + + 刪除工單出貨條碼區間 + + 工單號碼 + 起始區間 + 結束區間 + + @@ -4213,6 +4290,12 @@ + + + 查詢工單資料PDS003 + + + 查詢工單資料QRS011 @@ -4588,6 +4671,18 @@ 工單各站數量資料檔 + + + + + + + + + 獲取全部工單各站數量資料 + + + 基本查詢 @@ -4967,6 +5062,15 @@ + + + FQC抽驗過站 + + 入庫單號 + 順序 + UserID + + 判斷過站完成新增or更新 Table @@ -5819,6 +5923,13 @@ + + + ByWipNo 確認是否有FQC站別 + + 工單號碼 + 0:沒有設FQC Or rulestationID + 更新流程站別資料 @@ -11440,6 +11551,61 @@ 更新日期 + + + 外包機種資料 + + + + + 入庫單號 + + + + + 入庫料號 + + + + + 組件日期 + + + + + 組件序號 + + + + + 組件SN + + + + + 組件MB + + + + + 組件MAC + + + + + 組件Panel + + + + + 建立者 + + + + + 建立日期 + + 標準工時资料表 @@ -15218,6 +15384,96 @@ 解鎖日期 + + + QC編號 + + + + + 檢驗廠所 + + + + + 抽驗日期 + + + + + 工單料號 + + + + + 料號_品名 + + + + + 工單號碼 + + + + + + + + + + + + + + + VIP? + + + + + + + + + + + + + + + 抽驗標準 + + + + + 廠商代號 + + + + + 產線 + + + + + + + + + + + + + + + 成品99 + + + + + 特採單 + + 入庫單資料檔 Dto @@ -15558,6 +15814,11 @@ 不良備註 + + + 抽驗人員 + + 檢驗項目維護資料檔 DTO @@ -16100,6 +16361,11 @@ 料號 + + + 工單類型 + + 工單KP資訊資料檔 DTO @@ -16410,6 +16676,11 @@ 檢驗日 + + + 工單類型 + + 工單製程對應SOP資料檔 DTO @@ -18011,6 +18282,11 @@ 工時收集資料檔 + + + 外包機種資料 + + diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Runtime.CompilerServices.Unsafe.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index d7a8f23c..00000000 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Runtime.CompilerServices.Unsafe.dll and /dev/null differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Text.Encoding.CodePages.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Text.Encoding.CodePages.dll deleted file mode 100644 index b00edb18..00000000 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/refs/System.Text.Encoding.CodePages.dll and /dev/null differ 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 6ea58b65..eb3660c4 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 3f221c8f..eb8adea4 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 04a66b86..fd75dc4d 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 ac22a45a..aa905739 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 11b2c2e1..fcee73c2 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -172,6 +172,13 @@ 包裝箱號 + + + 用工單ID找條碼资料 + + 工單ID + + 更新條碼资料 @@ -1119,6 +1126,12 @@ 序號 + + + FQC細項資料 + + + 新增檢驗單明細資料檔 @@ -3587,6 +3600,61 @@ + + + 外包機種資料維護 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 修改外包機種資料 + + + + + + + + + + + + + + + + + + + 工作群組維護 @@ -3983,18 +4051,27 @@ - 新增工單條碼區間設定檔 + 新增工單出貨條碼區間設定檔 - 更新工單條碼區間設定檔 + 更新工單出貨條碼區間設定檔 + + + 刪除工單出貨條碼區間 + + 工單號碼 + 起始區間 + 結束區間 + + @@ -4213,6 +4290,12 @@ + + + 查詢工單資料PDS003 + + + 查詢工單資料QRS011 @@ -4588,6 +4671,18 @@ 工單各站數量資料檔 + + + + + + + + + 獲取全部工單各站數量資料 + + + 基本查詢 @@ -4967,6 +5062,15 @@ + + + FQC抽驗過站 + + 入庫單號 + 順序 + UserID + + 判斷過站完成新增or更新 Table @@ -5819,6 +5923,13 @@ + + + ByWipNo 確認是否有FQC站別 + + 工單號碼 + 0:沒有設FQC Or rulestationID + 更新流程站別資料 @@ -11440,6 +11551,61 @@ 更新日期 + + + 外包機種資料 + + + + + 入庫單號 + + + + + 入庫料號 + + + + + 組件日期 + + + + + 組件序號 + + + + + 組件SN + + + + + 組件MB + + + + + 組件MAC + + + + + 組件Panel + + + + + 建立者 + + + + + 建立日期 + + 標準工時资料表 @@ -15218,6 +15384,96 @@ 解鎖日期 + + + QC編號 + + + + + 檢驗廠所 + + + + + 抽驗日期 + + + + + 工單料號 + + + + + 料號_品名 + + + + + 工單號碼 + + + + + + + + + + + + + + + VIP? + + + + + + + + + + + + + + + 抽驗標準 + + + + + 廠商代號 + + + + + 產線 + + + + + + + + + + + + + + + 成品99 + + + + + 特採單 + + 入庫單資料檔 Dto @@ -15558,6 +15814,11 @@ 不良備註 + + + 抽驗人員 + + 檢驗項目維護資料檔 DTO @@ -16100,6 +16361,11 @@ 料號 + + + 工單類型 + + 工單KP資訊資料檔 DTO @@ -16410,6 +16676,11 @@ 檢驗日 + + + 工單類型 + + 工單製程對應SOP資料檔 DTO @@ -18011,6 +18282,11 @@ 工時收集資料檔 + + + 外包機種資料 + +