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 25d0b7cd..34cc09de 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 72ba08d1..e5e89358 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 f84f39f8..5d368154 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json @@ -816,15 +816,15 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "dependencies": { "Microsoft.Data.SqlClient": "1.1.3", "Microsoft.EntityFrameworkCore.Relational": "5.0.1" }, "runtime": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": { - "assemblyVersion": "3.1.21.0", - "fileVersion": "3.100.2121.52203" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { @@ -2631,9 +2631,10 @@ "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { "AMESCoreStudio.CommonTools": "1.0.0", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21", + "Microsoft.EntityFrameworkCore.SqlServer": "3.1.23", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5", "Oracle.EntityFrameworkCore": "5.21.1", "Swashbuckle.AspNetCore": "6.1.4" @@ -4442,12 +4443,12 @@ "path": "microsoft.entityframeworkcore.relational/5.0.1", "hashPath": "microsoft.entityframeworkcore.relational.5.0.1.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.21", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.nupkg.sha512" + "sha512": "sha512-jfTL7M74a1TCrg6+BgUnWDz6gd2ouXeAqJO84ILb1AUUQVVDScJFJpAjJcY7AqkAW1VinL4TYfSiNSfX1AhUsg==", + "path": "microsoft.entityframeworkcore.sqlserver/3.1.23", + "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.23.nupkg.sha512" }, "Microsoft.Extensions.ApiDescription.Server/3.0.0": { "type": "package", diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index 064a555f..0e87fb75 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 74fc9d3d..47865eb2 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 14bdb80c..8f77484f 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 77f3b308..09d84725 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.deps.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json index 3da37dc2..399fa13a 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -32,11 +32,12 @@ "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { "AMESCoreStudio.CommonTools": "1.0.0", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21", - "Microsoft.EntityFrameworkCore.Tools": "3.1.21", + "Microsoft.EntityFrameworkCore.SqlServer": "3.1.23", + "Microsoft.EntityFrameworkCore.Tools": "3.1.23", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5", "Oracle.EntityFrameworkCore": "5.21.1", "Swashbuckle.AspNetCore": "6.1.4", @@ -353,6 +354,37 @@ "System.Text.Encodings.Web": "4.5.0" } }, + "Microsoft.AspNetCore.JsonPatch/3.1.20": { + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "12.0.2" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.JsonPatch.dll": { + "assemblyVersion": "3.1.20.0", + "fileVersion": "3.100.2021.47242" + } + }, + "compile": { + "lib/netstandard2.0/Microsoft.AspNetCore.JsonPatch.dll": {} + } + }, + "Microsoft.AspNetCore.Mvc.NewtonsoftJson/3.1.20": { + "dependencies": { + "Microsoft.AspNetCore.JsonPatch": "3.1.20", + "Newtonsoft.Json": "12.0.2", + "Newtonsoft.Json.Bson": "1.0.2" + }, + "runtime": { + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": { + "assemblyVersion": "3.1.20.0", + "fileVersion": "3.100.2021.47242" + } + }, + "compile": { + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {} + } + }, "Microsoft.AspNetCore.Razor/2.2.0": { "dependencies": { "Microsoft.AspNetCore.Html.Abstractions": "2.2.0" @@ -734,22 +766,22 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "dependencies": { "Microsoft.Data.SqlClient": "1.1.3", "Microsoft.EntityFrameworkCore.Relational": "5.0.8" }, "runtime": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": { - "assemblyVersion": "3.1.21.0", - "fileVersion": "3.100.2121.52203" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {} } }, - "Microsoft.EntityFrameworkCore.Tools/3.1.21": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "dependencies": { "Microsoft.EntityFrameworkCore.Design": "5.0.8" } @@ -902,7 +934,7 @@ "Microsoft.IdentityModel.JsonWebTokens/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Tokens": "5.5.0", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -943,7 +975,7 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Protocols": "5.5.0", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "System.IdentityModel.Tokens.Jwt": "5.5.0" }, "runtime": { @@ -959,7 +991,7 @@ "Microsoft.IdentityModel.Tokens/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Logging": "5.5.0", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "System.Security.Cryptography.Cng": "4.5.0" }, "runtime": { @@ -1002,7 +1034,7 @@ }, "Microsoft.VisualStudio.Web.CodeGeneration.Contracts/3.1.5": { "dependencies": { - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll": { @@ -1018,7 +1050,7 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "5.0.2", "Microsoft.VisualStudio.Web.CodeGeneration.Templating": "3.1.5", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Core.dll": { @@ -1080,7 +1112,7 @@ "dependencies": { "Microsoft.CodeAnalysis.CSharp.Workspaces": "3.3.1", "Microsoft.VisualStudio.Web.CodeGeneration.Contracts": "3.1.5", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "NuGet.Frameworks": "4.7.0" }, "runtime": { @@ -1173,17 +1205,31 @@ "System.Xml.XDocument": "4.3.0" } }, - "Newtonsoft.Json/11.0.2": { + "Newtonsoft.Json/12.0.2": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "11.0.0.0", - "fileVersion": "11.0.2.21924" + "assemblyVersion": "12.0.0.0", + "fileVersion": "12.0.2.23222" } }, "compile": { "lib/netstandard2.0/Newtonsoft.Json.dll": {} } }, + "Newtonsoft.Json.Bson/1.0.2": { + "dependencies": { + "Newtonsoft.Json": "12.0.2" + }, + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.Bson.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.2.22727" + } + }, + "compile": { + "lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {} + } + }, "NuGet.Frameworks/4.7.0": { "dependencies": { "NETStandard.Library": "1.6.1" @@ -1784,7 +1830,7 @@ "dependencies": { "Microsoft.IdentityModel.JsonWebTokens": "5.5.0", "Microsoft.IdentityModel.Tokens": "5.5.0", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -4095,6 +4141,20 @@ "path": "microsoft.aspnetcore.html.abstractions/2.2.0", "hashPath": "microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512" }, + "Microsoft.AspNetCore.JsonPatch/3.1.20": { + "type": "package", + "serviceable": true, + "sha512": "sha512-6CfgfUGwM2egAi/8ECUW1Gvf4O/7fN/JqC1GpX28s9V8qqRsEfgPFgFrgYLdBexLVZ1knJv1X9efG440gV4N3w==", + "path": "microsoft.aspnetcore.jsonpatch/3.1.20", + "hashPath": "microsoft.aspnetcore.jsonpatch.3.1.20.nupkg.sha512" + }, + "Microsoft.AspNetCore.Mvc.NewtonsoftJson/3.1.20": { + "type": "package", + "serviceable": true, + "sha512": "sha512-QZx3UYnUwFIxajOEpYu5CgXRiZIgz3ytGmRS4GEXIByDuJqCRJcoVudDsbX/LcaK0gysY0VmR7e8kevFMjPyHA==", + "path": "microsoft.aspnetcore.mvc.newtonsoftjson/3.1.20", + "hashPath": "microsoft.aspnetcore.mvc.newtonsoftjson.3.1.20.nupkg.sha512" + }, "Microsoft.AspNetCore.Razor/2.2.0": { "type": "package", "serviceable": true, @@ -4214,19 +4274,19 @@ "path": "microsoft.entityframeworkcore.relational/5.0.8", "hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.21", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.nupkg.sha512" + "sha512": "sha512-jfTL7M74a1TCrg6+BgUnWDz6gd2ouXeAqJO84ILb1AUUQVVDScJFJpAjJcY7AqkAW1VinL4TYfSiNSfX1AhUsg==", + "path": "microsoft.entityframeworkcore.sqlserver/3.1.23", + "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.23.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.Tools/3.1.21": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-GlIzvL1+E562ReIVk3S9T5Phh723FYGz7oNFFdV0IFpD3uKZNzRFkGSukQxZAKgYtTzaL6HM7mt/OUXfzdHG0g==", - "path": "microsoft.entityframeworkcore.tools/3.1.21", - "hashPath": "microsoft.entityframeworkcore.tools.3.1.21.nupkg.sha512" + "sha512": "sha512-1RRy8gGH4x7gFH6S6WqTXMfN3wyhjUWsfqglzl4wI9of3p9QV55Y2tikoSY7G1NbFWFfvCfiaTFZz2P1BAJcTQ==", + "path": "microsoft.entityframeworkcore.tools/3.1.23", + "hashPath": "microsoft.entityframeworkcore.tools.3.1.23.nupkg.sha512" }, "Microsoft.Extensions.ApiDescription.Server/3.0.0": { "type": "package", @@ -4445,12 +4505,19 @@ "path": "netstandard.library/1.6.1", "hashPath": "netstandard.library.1.6.1.nupkg.sha512" }, - "Newtonsoft.Json/11.0.2": { + "Newtonsoft.Json/12.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rTK0s2EKlfHsQsH6Yx2smvcTCeyoDNgCW7FEYyV01drPlh2T243PR2DiDXqtC5N4GDm4Ma/lkxfW5a/4793vbA==", + "path": "newtonsoft.json/12.0.2", + "hashPath": "newtonsoft.json.12.0.2.nupkg.sha512" + }, + "Newtonsoft.Json.Bson/1.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-IvJe1pj7JHEsP8B8J8DwlMEx8UInrs/x+9oVY+oCD13jpLu4JbJU2WCIsMRn5C4yW9+DgkaO8uiVE5VHKjpmdQ==", - "path": "newtonsoft.json/11.0.2", - "hashPath": "newtonsoft.json.11.0.2.nupkg.sha512" + "sha512": "sha512-QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", + "path": "newtonsoft.json.bson/1.0.2", + "hashPath": "newtonsoft.json.bson.1.0.2.nupkg.sha512" }, "NuGet.Frameworks/4.7.0": { "type": "package", diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 94f6e7a9..9677c5ff 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 21d725f4..813a69cf 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 19e8b504..e70681d1 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -1653,6 +1653,58 @@ + + + 料號基本資料檔Controller + + + + + 建構式 + + + + + + 查詢料號流程資料檔 + + + + + + 料號流程資料檔 + + ItemID + + + + + 料號流程查詢 + + 料號 + 站別 + + + + + 新增料號流程資料檔 + + + + + + + 修改料號流程資料檔 + + + + + + Delete料號流程 + + + + 料號基本資料檔Controller @@ -1823,6 +1875,13 @@ 建立日期迄 + + + 刪除 + + D + + 料號站別工項資料檔 @@ -3228,6 +3287,51 @@ + + + 料號基本資料檔Controller + + + + + 建構式 + + + + + + 查詢料號基本資料檔 + + + + + + 料號基本資料檔 to ItemID + + ItemID + + + + + 料號基本資料檔 to ItemNO + + 料號 + 料號 + + + + + 新增料號基本資料檔 + + + + + + + 修改料號基本資料檔 + + + 工作群組維護 @@ -3665,6 +3769,32 @@ + + + 工單上傳圖檔資料表 + + + + + 工單上傳圖檔資料表 By 工單號碼 + + 工單號碼 + + + + + 更新工單上傳圖檔資料表 + + + + + + + 新增工單上傳圖檔資料表 + + + + @@ -4916,6 +5046,13 @@ + + + 用維修原因获取維修責任單位资料 + + 維修原因代碼 + + 更新維修責任單位资料 @@ -4955,10 +5092,20 @@ - + 根據流程ID獲取流程規則資料 + + + + + + + + 根據流程規則編號查詢指定單一資料 + + @@ -4977,13 +5124,11 @@ - + 更新流程规则资料 - - @@ -4994,13 +5139,11 @@ - + 删除流程规则 - - @@ -5736,6 +5879,13 @@ + + + UserInfo By UserNo + + + + @@ -6061,6 +6211,11 @@ 產品類別 STANDARD(標準品),Order（訂單） + + + 結束抽驗時間 + + 建立UserID @@ -6325,7 +6480,7 @@ - 檔案名稱 + SOP文件敘述 @@ -6338,6 +6493,11 @@ SOP類型 + + + SOP類型名稱 + + 建立UserID @@ -6838,6 +6998,11 @@ SOP類型 + + + SOP類型_名稱 + + 生產單位代號 @@ -7118,291 +7283,588 @@ 內部異常 - + - 平台类型 + - + - 未知 + 列印方式 - + - Web + ON Line列印 - + - Mobile + OFF Line列印 - + - WeChat + 認證Logo - + - 激活状态 + CE - + - 未激活 + KCC - + - 正常 + FCC - + - 禁用 + ROHS - + - 注销 + UL - + - + WEEE - + - + MADE IN - - + - + 皆無 - - + - + 公司Logo - + - + A VALUE - + - + 無 - + - + WipAttr - + - + 正常工單 - + - + 非標96工單 - + - + 工單資訊 系統工程資訊 Power mode - + - + H/W ATX - + - + H/W ATX，S/W AT - + - + H/W AT - + - + 工單資訊 系統工程資訊 Type - + - 工廠 + N/A - + - 單位 + Check - - ClassInfo - 線別 + + + Program - + - 班别資料 + 備註說明 - - TIME_SEGMENT - 生產時段 + + + SOP Type - + - 工作臺類別 + SOP - + - 工作臺 + 技術轉移 - + - 責任單位資料 + N/A - + - 郵件群组類别 + 暫時文件 - + - 郵件群组資料 + REWORK - + - 測試代號 + SMD點膠 - + - List + A面全點 - + - 正背面 + B面全點 - + - 工單性質 + A面部份點膠 - + - 產品別 + B面部份點膠 - + - 工單機種資料 + 不須點膠 - + - 工單基本資料文件 + DIP - + - 流程資料 + A面 - + - 流程站別資料 + B面 - + - 流程規則資料 + NA - + - 條碼狀態資料 + PCB烘烤 - + - 異常群組資料 + 依廠內規範 - + - 異常類別資料 + 125℃/ 2Hr - + - 工單狀態資料 + 120℃/ 1Hr (FPC) - + - 工單鎖定資料檔 + 其他 - + - 工單條碼起迄資料檔 + PCB加工 - + - 異常原因資料 + 噴印字樣 - + - 工單投產纪錄資料文件 + 其他 - + - 工單投產纪錄資料文件 + NA - + - 工單投產纪錄資料文件 + 錫膏 - + - 維修群組資料 + KOKI 無鉛錫膏(S3X58-M406-3) - + - 維修類別資料 + 千住 無鉛錫膏(M705-221BM5-32-11.5K3) - + - 維修原因資料 + 千住 無鹵錫膏(M705-S101ZH-S4)、無鹵錫絲(SHF RC101 F3 M705) + + + + + 其他 + + + + + Get Enum Display + + + + + + + 平台类型 + + + + + 未知 + + + + + Web + + + + + Mobile + + + + + WeChat + + + + + 激活状态 + + + + + 未激活 + + + + + 正常 + + + + + 禁用 + + + + + 注销 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工廠 + + + + + 單位 + + + + ClassInfo + 線別 + + + + + 班别資料 + + + + TIME_SEGMENT + 生產時段 + + + + + 工作臺類別 + + + + + 工作臺 + + + + + 責任單位資料 + + + + + 郵件群组類别 + + + + + 郵件群组資料 + + + + + 測試代號 + + + + + List + + + + + 正背面 + + + + + 工單性質 + + + + + 產品別 + + + + + 工單機種資料 + + + + + 工單基本資料文件 + + + + + 流程資料 + + + + + 流程站別資料 + + + + + 流程規則資料 + + + + + 條碼狀態資料 + + + + + 異常群組資料 + + + + + 異常類別資料 + + + + + 工單狀態資料 + + + + + 工單鎖定資料檔 + + + + + 工單條碼起迄資料檔 + + + + + 異常原因資料 + + + + + 工單投產纪錄資料文件 + + + + + 工單投產纪錄資料文件 + + + + + 工單投產纪錄資料文件 + + + + + 維修群組資料 + + + + + 維修類別資料 + + + + + 維修原因資料 @@ -7800,6 +8262,16 @@ 工單治具資料檔 + + + 工單上傳圖檔資料表 + + + + + 出貨序號規則 + + 條碼變更資料表 @@ -10264,7 +10736,7 @@ - 檔案名稱 + SOP文件敘述 @@ -10862,52 +11334,87 @@ 創建日期 - + + + 更新者ID + + + + + 更新日期 + + + + + 維修解碼上傳圖檔資料表 + + + + + 不良維修ID + + + + + 圖檔名稱 + + + + + 圖檔 + + + + + 創建者ID + + + + + 創建日期 + + + 更新者ID - + 更新日期 - - - 維修解碼上傳圖檔資料表 - - - + - 不良維修ID + 區域資料檔 - + - 圖檔名稱 + 區域代碼 - + - 圖檔 + 區域名稱 - + 創建者ID - + 創建日期 - + 更新者ID - + 更新日期 @@ -11204,6 +11711,76 @@ 更新日期 + + + 層別資料檔 + + + + + 區域代碼 + + + + + 層別描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 位置資料檔 + + + + + 位置代碼 + + + + + 位置描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備記錄檔 @@ -11979,6 +12556,96 @@ 維修原因狀態 + + + 料號出貨序號規則資料檔 + + + + + 序號規則ID + + + + + 料號 + + + + + 規則 + + + + + 年 + + + + + 流水序號 + + + + + 月 + + + + + 流水序號 + + + + + 周 + + + + + 流水序號 + + + + + 生產序號 + + + + + 流水序號 + + + + + 流水序號 + + + + + 流水序號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 標準工時资料表 @@ -12374,6 +13041,11 @@ 生產單位 + + + 備註 + + 建立者 @@ -12459,16 +13131,41 @@ 料號 + + + 工程負責人員 + + SMD點膠 + + + SMD點紅膠備註 + + + + + SMD點防焊膠 + + + + + SMD點防焊膠備註 + + 正背面 + + + DIP正背面備註 + + 是否需要CARRIER(Y/N) @@ -12479,6 +13176,11 @@ 是否需要貼付膠帶(Y/N) + + + 是否需要點防焊膠(Y/N) + + 是否燒錄(Y/N) @@ -12489,6 +13191,16 @@ 燒錄位置 + + + 燒錄備註 + + + + + 零件是否需要烘烤(Y/N) + + 零件烘烤溫度 @@ -12499,21 +13211,41 @@ 零件烘烤時間 + + + 零件烘烤備註 + + PCB烘烤 + + + PCB烘烤備註 + + PCB加工 + + + PCB加工備註 + + 錫膏 + + + 錫膏備註 + + 燒機比率 @@ -12529,16 +13261,31 @@ 燒機時間 + + + 燒機備註 + + BIOS版本 + + + BIOS備註 + + Check Sum + + + Check Sum備註 + + 創建者ID @@ -12559,6 +13306,26 @@ 更新日期 + + + PE工程師姓名 Engineer + + + + + SMDs + + + + + SMD防焊膠s + + + + + 正背面 + + 工單箱號資料檔 @@ -12779,6 +13546,11 @@ 單箱數量 + + + SFIS流程確認(Y/N) + + 判斷前製程是否已經投入 (Y-判斷;N-不判斷) @@ -12859,6 +13631,16 @@ 客戶類別 + + + 客戶類別醫療(Y-是;N-否) + + + + + 客戶類別VIP(Y-是;N-否) + + 關聯工單 @@ -12894,6 +13676,56 @@ 工單-基本資料 + + + 工單上傳圖檔資料表 + + + + + ID + + + + + 工單號碼 + + + + + 圖檔名稱 + + + + + 圖檔 + + + + + 上傳路徑 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 工單KP資訊資料檔 @@ -12999,6 +13831,11 @@ 工單屬性 + + + 備註 + + 建立UserID @@ -13019,6 +13856,11 @@ 更新日期 + + + 認證Logos + + 工單鎖定資料檔 @@ -13399,6 +14241,11 @@ 料號 + + + 工程負責人員 + + POWER_MODE_TYPE @@ -13584,6 +14431,11 @@ OS_Desc + + + PE工程師姓名 Engineer + + 工單各站數量資料檔 – By TIME @@ -14309,6 +15161,11 @@ 流程站別規則資料 + + + 流程規則編號 + + 流程站別編號 diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll index 2b881a55..e5391437 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll differ diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj index a272ed33..bf42ffaa 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj @@ -15,6 +15,7 @@ + diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs new file mode 100644 index 00000000..fa6d53b2 --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs @@ -0,0 +1,245 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using AMESCoreStudio.WebApi.Models.AMES; +using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.WebApi.DTO.AMES; + +namespace AMESCoreStudio.WebApi.Controllers.AMES +{ + /// + /// 料號基本資料檔Controller + /// + [Route("api/[controller]")] + [ApiController] + public class SerialRulesController : ControllerBase + { + private readonly AMESContext _context; + + /// + /// 建構式 + /// + /// + public SerialRulesController(AMESContext context) + { + _context = context; + } + + /// + /// 查詢料號基本資料檔 + /// + /// + // GET: api/ + [HttpGet] + public async Task>> GetSerialRule() + { + IQueryable q = _context.SerialRules; + q = q.OrderBy(p => p.SerialRuleID); + var SerialRule = await q.ToListAsync(); + return SerialRule; + } + + + /// + /// 料號基本資料檔 to ItemID + /// + /// ItemID + /// + [HttpGet("{id}")] + public async Task> GetSerialRule(int id) + { + IQueryable q = _context.SerialRules; + + ResultModel result = new ResultModel(); + result.Data = await q.Where(p => p.SerialRuleID == id).ToListAsync(); + return result; + } + + /// + /// 料號基本資料檔 to ItemNO + /// + /// 料號 + /// 料號 + /// + [HttpGet("ByQurey/{itemNo}/{lotNo}")] + public async Task> GetSerialRuleByQurey(string itemNo,string lotNo) + { + IQueryable q = _context.SerialRules; + ResultModel result = new ResultModel(); + var serialRule = await q.Where(p => p.ItemNo == itemNo).FirstOrDefaultAsync(); + var serialRuleNew = serialRule; + if (serialRule == null) + { + result.Success = false; + result.Msg = "無料號對應出貨序號規則"; + return result; + } + if(serialRule.LotLen!=0 ) + { + if (lotNo == null) { + + + result.Success = false; + result.Msg = "所輸入LOT字數與規則不符合"; + return result; + + + } + if(serialRule.LotLen != lotNo.Length) + { + result.Success = false; + result.Msg = "所輸入LOT字數與規則不符合"; + return result; + } + + } + + + + var strRule = serialRule.Rule.ToUpper(); + var serial = serialRule.Rule; + if (strRule.Contains("[YYYY]")) //年份 + { + serial = serial.Replace("[YYYY]", System.DateTime.Now.ToString("yyyy")); + if (serialRule.YNum != System.DateTime.Now.Year) + { + serialRuleNew.YNum = System.DateTime.Now.Year; + if (serialRule.SnNum > 0) + serialRuleNew.SnNum = 0; + } + } + if (strRule.Contains("[YY]"))//年份後兩碼 + { + serial = serial.Replace("[YY]", System.DateTime.Now.ToString("yy")); + if (serialRule.YNum.ToString() != System.DateTime.Now.ToString("yy")) + { + serialRuleNew.YNum = int.Parse(System.DateTime.Now.ToString("yy")); + if (serialRule.SnNum > 0) + serialRuleNew.SnNum = 0; + } + } + if (strRule.Contains("[MM]"))//月份 + { + serial = serial.Replace("[MM]", System.DateTime.Now.ToString("MM")); + + if (serialRule.MNum != System.DateTime.Now.Month) + { + serialRuleNew.MNum = System.DateTime.Now.Month; + if (serialRule.SnNum > 0) + serialRuleNew.SnNum = 0; + } + } + //if (strRule.Contains("[MM1]"))//月份縮寫 + //{ + // serial = strRule.Replace("[MM]", System.DateTime.Now.ToString("MMM")); + //} + if (strRule.Contains("[WW]")) + { + System.Globalization.GregorianCalendar gc = new System.Globalization.GregorianCalendar(); + DateTime datetime = DateTime.Now; + int week = gc.GetWeekOfYear(datetime, System.Globalization.CalendarWeekRule.FirstDay, DayOfWeek.Sunday); + serial = serial.Replace("[WW]", week.ToString()); + + if (serialRule.WNum != week) { + serialRuleNew.WNum = week; + if (serialRule.SnNum > 0) + serialRuleNew.SnNum = 0; + } + } + if (strRule.Contains("[LOT3]")) + { + serial = serial.Replace("[LOT3]",lotNo); + } + if (strRule.Contains("[LOT4]")) + { + serial = serial.Replace("[LOT4]", lotNo); + } + if (strRule.Contains("[SN3]")) + { + + serialRuleNew.SnNum++; + serial = serial.Replace("[SN3]", serialRuleNew.SnNum.ToString("000")); + } + if (strRule.Contains("[SN4]")) + { + serialRuleNew.SnNum++; + serial = serial.Replace("[SN4]", serialRuleNew.SnNum.ToString("0000")); + } + + _context.Entry(serialRuleNew).State = EntityState.Modified; + await _context.SaveChangesAsync(); + + result.Success = true; + result.Msg = serial; + return result; + + + } + + /// + /// 新增料號基本資料檔 + /// + /// + /// + [HttpPost] + public async Task> PostSerialRule([FromBody] SerialRule SerialRule) + { + ResultModel result = new ResultModel(); + Helper helper = new Helper(_context); + SerialRule.SerialRuleID = helper.GetIDKey("SERIALRULE_ID").Result; + _context.SerialRules.Add(SerialRule); + try + { + await _context.SaveChangesAsync(); + result.Success = true; + result.Msg = "OK"; + } + catch (Exception ex) + { + result.Success = false; + result.Msg = ex.InnerException.Message; + } + return result; + } + + + /// + /// 修改料號基本資料檔 + /// + /// + [HttpPut] + + public async Task> PutSerialRule([FromBody] SerialRule SerialRule) + { + ResultModel result = new ResultModel(); + //_context.Attach(SerialRule); + // 指定更新某個欄位 + //_context.Entry(SerialRule).Property(p => p.SerialRuleID).IsModified = true; + _context.Entry(SerialRule).State = EntityState.Modified; + + try + { + await _context.SaveChangesAsync(); + result.Success = true; + result.Msg = "OK"; + } + catch (Exception ex) + { + result.Success = false; + result.Msg = ex.InnerException.Message; + } + return result; + } + + + // DELETE api//5 + [HttpDelete("{id}")] + public void DeleteSerialRule(int id) + { + } + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs b/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs new file mode 100644 index 00000000..83914bff --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using System.Runtime.Serialization; +#nullable disable + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 料號出貨序號規則資料檔 + /// + [Table("SERIAL_RULE", Schema = "JHAMES")] + public partial class SerialRule + { + /// + /// 序號規則ID + /// + [Key] + [Column("SERIAL_RULE_ID")] + [DataMember] + public int SerialRuleID { get; set; } + + /// + /// 料號 + /// + [Required] + [Column("ITEM_NO")] + [StringLength(20)] + [DataMember] + public string ItemNo { get; set; } + + /// + /// 規則 + /// + [Required] + [Column("RULE")] + [StringLength(50)] + [DataMember] + public string Rule { get; set; } + + /// + /// 年 + /// + [Column("Y_NUM")] + [DataMember] + public int YNum { get; set; } + + + /// + /// 流水序號 + /// + [Column("Y_LENGTH")] + [DataMember] + public int YLen { get; set; } + + /// + /// 月 + /// + [Column("M_NUM")] + [DataMember] + public int MNum { get; set; } + + + /// + /// 流水序號 + /// + [Column("M_LENGTH")] + [DataMember] + public int MLen { get; set; } + + /// + /// 周 + /// + [Column("W_NUM")] + [DataMember] + public int WNum { get; set; } + + /// + /// 流水序號 + /// + [Column("W_LENGTH")] + [DataMember] + public int WLen { get; set; } + + /// + /// 生產序號 + /// + [Column("LOT_NUM")] + [DataMember] + public int LotNum { get; set; } + + /// + /// 流水序號 + /// + [Column("LOT_LENGTH")] + [DataMember] + public int LotLen { get; set; } + + /// + /// 流水序號 + /// + [Column("SN_NUM")] + [DataMember] + public int SnNum { get; set; } + + /// + /// 流水序號 + /// + [Column("SN_LENGTH")] + [DataMember] + public int SnLen { get; set; } + + /// + /// 建立UserID + /// + [Column("CREATE_USERID")] + [Required] + [DataMember] + public int CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [Required] + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 更新UserID + /// + [Column("UPDATE_USERID")] + [DataMember] + public int UpdateUserID { get; set; } = 0; + + /// + /// 更新日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + public DateTime? UpdateDate { get; set; } = DateTime.Now; + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index 2427cc79..414fb4b3 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -754,6 +754,13 @@ namespace AMESCoreStudio.WebApi /// 工單上傳圖檔資料表 /// public virtual DbSet WipInfoBlobs { get; set; } + + + /// + /// 出貨序號規則 + /// + public virtual DbSet SerialRules { get; set; } + } } diff --git a/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs b/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs index 9e58344c..a62de7ea 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs @@ -75,13 +75,6 @@ namespace AMESCoreStudio.WebApi.Models.BAS [DataMember] public string MaterialFlowRemark { get; set; } - /// - /// 料號作業流程 - /// - [Column("MATERIAL_FLOW_REMARK")] - [Display(Name = "料號作業流程")] - [DataMember] - public string MaterialFlowRemark { get; set; } /// /// 創建者ID 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 14bdb80c..8f77484f 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 77f3b308..09d84725 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.deps.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json index 3da37dc2..399fa13a 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -32,11 +32,12 @@ "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { "AMESCoreStudio.CommonTools": "1.0.0", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21", - "Microsoft.EntityFrameworkCore.Tools": "3.1.21", + "Microsoft.EntityFrameworkCore.SqlServer": "3.1.23", + "Microsoft.EntityFrameworkCore.Tools": "3.1.23", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5", "Oracle.EntityFrameworkCore": "5.21.1", "Swashbuckle.AspNetCore": "6.1.4", @@ -353,6 +354,37 @@ "System.Text.Encodings.Web": "4.5.0" } }, + "Microsoft.AspNetCore.JsonPatch/3.1.20": { + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "12.0.2" + }, + "runtime": { + "lib/netstandard2.0/Microsoft.AspNetCore.JsonPatch.dll": { + "assemblyVersion": "3.1.20.0", + "fileVersion": "3.100.2021.47242" + } + }, + "compile": { + "lib/netstandard2.0/Microsoft.AspNetCore.JsonPatch.dll": {} + } + }, + "Microsoft.AspNetCore.Mvc.NewtonsoftJson/3.1.20": { + "dependencies": { + "Microsoft.AspNetCore.JsonPatch": "3.1.20", + "Newtonsoft.Json": "12.0.2", + "Newtonsoft.Json.Bson": "1.0.2" + }, + "runtime": { + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": { + "assemblyVersion": "3.1.20.0", + "fileVersion": "3.100.2021.47242" + } + }, + "compile": { + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll": {} + } + }, "Microsoft.AspNetCore.Razor/2.2.0": { "dependencies": { "Microsoft.AspNetCore.Html.Abstractions": "2.2.0" @@ -734,22 +766,22 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "dependencies": { "Microsoft.Data.SqlClient": "1.1.3", "Microsoft.EntityFrameworkCore.Relational": "5.0.8" }, "runtime": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": { - "assemblyVersion": "3.1.21.0", - "fileVersion": "3.100.2121.52203" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {} } }, - "Microsoft.EntityFrameworkCore.Tools/3.1.21": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "dependencies": { "Microsoft.EntityFrameworkCore.Design": "5.0.8" } @@ -902,7 +934,7 @@ "Microsoft.IdentityModel.JsonWebTokens/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Tokens": "5.5.0", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll": { @@ -943,7 +975,7 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Protocols": "5.5.0", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "System.IdentityModel.Tokens.Jwt": "5.5.0" }, "runtime": { @@ -959,7 +991,7 @@ "Microsoft.IdentityModel.Tokens/5.5.0": { "dependencies": { "Microsoft.IdentityModel.Logging": "5.5.0", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "System.Security.Cryptography.Cng": "4.5.0" }, "runtime": { @@ -1002,7 +1034,7 @@ }, "Microsoft.VisualStudio.Web.CodeGeneration.Contracts/3.1.5": { "dependencies": { - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll": { @@ -1018,7 +1050,7 @@ "dependencies": { "Microsoft.Extensions.DependencyInjection": "5.0.2", "Microsoft.VisualStudio.Web.CodeGeneration.Templating": "3.1.5", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Core.dll": { @@ -1080,7 +1112,7 @@ "dependencies": { "Microsoft.CodeAnalysis.CSharp.Workspaces": "3.3.1", "Microsoft.VisualStudio.Web.CodeGeneration.Contracts": "3.1.5", - "Newtonsoft.Json": "11.0.2", + "Newtonsoft.Json": "12.0.2", "NuGet.Frameworks": "4.7.0" }, "runtime": { @@ -1173,17 +1205,31 @@ "System.Xml.XDocument": "4.3.0" } }, - "Newtonsoft.Json/11.0.2": { + "Newtonsoft.Json/12.0.2": { "runtime": { "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "11.0.0.0", - "fileVersion": "11.0.2.21924" + "assemblyVersion": "12.0.0.0", + "fileVersion": "12.0.2.23222" } }, "compile": { "lib/netstandard2.0/Newtonsoft.Json.dll": {} } }, + "Newtonsoft.Json.Bson/1.0.2": { + "dependencies": { + "Newtonsoft.Json": "12.0.2" + }, + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.Bson.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.2.22727" + } + }, + "compile": { + "lib/netstandard2.0/Newtonsoft.Json.Bson.dll": {} + } + }, "NuGet.Frameworks/4.7.0": { "dependencies": { "NETStandard.Library": "1.6.1" @@ -1784,7 +1830,7 @@ "dependencies": { "Microsoft.IdentityModel.JsonWebTokens": "5.5.0", "Microsoft.IdentityModel.Tokens": "5.5.0", - "Newtonsoft.Json": "11.0.2" + "Newtonsoft.Json": "12.0.2" }, "runtime": { "lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll": { @@ -4095,6 +4141,20 @@ "path": "microsoft.aspnetcore.html.abstractions/2.2.0", "hashPath": "microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512" }, + "Microsoft.AspNetCore.JsonPatch/3.1.20": { + "type": "package", + "serviceable": true, + "sha512": "sha512-6CfgfUGwM2egAi/8ECUW1Gvf4O/7fN/JqC1GpX28s9V8qqRsEfgPFgFrgYLdBexLVZ1knJv1X9efG440gV4N3w==", + "path": "microsoft.aspnetcore.jsonpatch/3.1.20", + "hashPath": "microsoft.aspnetcore.jsonpatch.3.1.20.nupkg.sha512" + }, + "Microsoft.AspNetCore.Mvc.NewtonsoftJson/3.1.20": { + "type": "package", + "serviceable": true, + "sha512": "sha512-QZx3UYnUwFIxajOEpYu5CgXRiZIgz3ytGmRS4GEXIByDuJqCRJcoVudDsbX/LcaK0gysY0VmR7e8kevFMjPyHA==", + "path": "microsoft.aspnetcore.mvc.newtonsoftjson/3.1.20", + "hashPath": "microsoft.aspnetcore.mvc.newtonsoftjson.3.1.20.nupkg.sha512" + }, "Microsoft.AspNetCore.Razor/2.2.0": { "type": "package", "serviceable": true, @@ -4214,19 +4274,19 @@ "path": "microsoft.entityframeworkcore.relational/5.0.8", "hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.21", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.nupkg.sha512" + "sha512": "sha512-jfTL7M74a1TCrg6+BgUnWDz6gd2ouXeAqJO84ILb1AUUQVVDScJFJpAjJcY7AqkAW1VinL4TYfSiNSfX1AhUsg==", + "path": "microsoft.entityframeworkcore.sqlserver/3.1.23", + "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.23.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.Tools/3.1.21": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-GlIzvL1+E562ReIVk3S9T5Phh723FYGz7oNFFdV0IFpD3uKZNzRFkGSukQxZAKgYtTzaL6HM7mt/OUXfzdHG0g==", - "path": "microsoft.entityframeworkcore.tools/3.1.21", - "hashPath": "microsoft.entityframeworkcore.tools.3.1.21.nupkg.sha512" + "sha512": "sha512-1RRy8gGH4x7gFH6S6WqTXMfN3wyhjUWsfqglzl4wI9of3p9QV55Y2tikoSY7G1NbFWFfvCfiaTFZz2P1BAJcTQ==", + "path": "microsoft.entityframeworkcore.tools/3.1.23", + "hashPath": "microsoft.entityframeworkcore.tools.3.1.23.nupkg.sha512" }, "Microsoft.Extensions.ApiDescription.Server/3.0.0": { "type": "package", @@ -4445,12 +4505,19 @@ "path": "netstandard.library/1.6.1", "hashPath": "netstandard.library.1.6.1.nupkg.sha512" }, - "Newtonsoft.Json/11.0.2": { + "Newtonsoft.Json/12.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rTK0s2EKlfHsQsH6Yx2smvcTCeyoDNgCW7FEYyV01drPlh2T243PR2DiDXqtC5N4GDm4Ma/lkxfW5a/4793vbA==", + "path": "newtonsoft.json/12.0.2", + "hashPath": "newtonsoft.json.12.0.2.nupkg.sha512" + }, + "Newtonsoft.Json.Bson/1.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-IvJe1pj7JHEsP8B8J8DwlMEx8UInrs/x+9oVY+oCD13jpLu4JbJU2WCIsMRn5C4yW9+DgkaO8uiVE5VHKjpmdQ==", - "path": "newtonsoft.json/11.0.2", - "hashPath": "newtonsoft.json.11.0.2.nupkg.sha512" + "sha512": "sha512-QYFyxhaABwmq3p/21VrZNYvCg3DaEoN/wUuw5nmfAf0X3HLjgupwhkEWdgfb9nvGAUIv3osmZoD3kKl4jxEmYQ==", + "path": "newtonsoft.json.bson/1.0.2", + "hashPath": "newtonsoft.json.bson.1.0.2.nupkg.sha512" }, "NuGet.Frameworks/4.7.0": { "type": "package", diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 94f6e7a9..9677c5ff 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 21d725f4..813a69cf 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 19e8b504..e70681d1 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -1653,6 +1653,58 @@ + + + 料號基本資料檔Controller + + + + + 建構式 + + + + + + 查詢料號流程資料檔 + + + + + + 料號流程資料檔 + + ItemID + + + + + 料號流程查詢 + + 料號 + 站別 + + + + + 新增料號流程資料檔 + + + + + + + 修改料號流程資料檔 + + + + + + Delete料號流程 + + + + 料號基本資料檔Controller @@ -1823,6 +1875,13 @@ 建立日期迄 + + + 刪除 + + D + + 料號站別工項資料檔 @@ -3228,6 +3287,51 @@ + + + 料號基本資料檔Controller + + + + + 建構式 + + + + + + 查詢料號基本資料檔 + + + + + + 料號基本資料檔 to ItemID + + ItemID + + + + + 料號基本資料檔 to ItemNO + + 料號 + 料號 + + + + + 新增料號基本資料檔 + + + + + + + 修改料號基本資料檔 + + + 工作群組維護 @@ -3665,6 +3769,32 @@ + + + 工單上傳圖檔資料表 + + + + + 工單上傳圖檔資料表 By 工單號碼 + + 工單號碼 + + + + + 更新工單上傳圖檔資料表 + + + + + + + 新增工單上傳圖檔資料表 + + + + @@ -4916,6 +5046,13 @@ + + + 用維修原因获取維修責任單位资料 + + 維修原因代碼 + + 更新維修責任單位资料 @@ -4955,10 +5092,20 @@ - + 根據流程ID獲取流程規則資料 + + + + + + + + 根據流程規則編號查詢指定單一資料 + + @@ -4977,13 +5124,11 @@ - + 更新流程规则资料 - - @@ -4994,13 +5139,11 @@ - + 删除流程规则 - - @@ -5736,6 +5879,13 @@ + + + UserInfo By UserNo + + + + @@ -6061,6 +6211,11 @@ 產品類別 STANDARD(標準品),Order（訂單） + + + 結束抽驗時間 + + 建立UserID @@ -6325,7 +6480,7 @@ - 檔案名稱 + SOP文件敘述 @@ -6338,6 +6493,11 @@ SOP類型 + + + SOP類型名稱 + + 建立UserID @@ -6838,6 +6998,11 @@ SOP類型 + + + SOP類型_名稱 + + 生產單位代號 @@ -7118,291 +7283,588 @@ 內部異常 - + - 平台类型 + - + - 未知 + 列印方式 - + - Web + ON Line列印 - + - Mobile + OFF Line列印 - + - WeChat + 認證Logo - + - 激活状态 + CE - + - 未激活 + KCC - + - 正常 + FCC - + - 禁用 + ROHS - + - 注销 + UL - + - + WEEE - + - + MADE IN - - + - + 皆無 - - + - + 公司Logo - + - + A VALUE - + - + 無 - + - + WipAttr - + - + 正常工單 - + - + 非標96工單 - + - + 工單資訊 系統工程資訊 Power mode - + - + H/W ATX - + - + H/W ATX，S/W AT - + - + H/W AT - + - + 工單資訊 系統工程資訊 Type - + - 工廠 + N/A - + - 單位 + Check - - ClassInfo - 線別 + + + Program - + - 班别資料 + 備註說明 - - TIME_SEGMENT - 生產時段 + + + SOP Type - + - 工作臺類別 + SOP - + - 工作臺 + 技術轉移 - + - 責任單位資料 + N/A - + - 郵件群组類别 + 暫時文件 - + - 郵件群组資料 + REWORK - + - 測試代號 + SMD點膠 - + - List + A面全點 - + - 正背面 + B面全點 - + - 工單性質 + A面部份點膠 - + - 產品別 + B面部份點膠 - + - 工單機種資料 + 不須點膠 - + - 工單基本資料文件 + DIP - + - 流程資料 + A面 - + - 流程站別資料 + B面 - + - 流程規則資料 + NA - + - 條碼狀態資料 + PCB烘烤 - + - 異常群組資料 + 依廠內規範 - + - 異常類別資料 + 125℃/ 2Hr - + - 工單狀態資料 + 120℃/ 1Hr (FPC) - + - 工單鎖定資料檔 + 其他 - + - 工單條碼起迄資料檔 + PCB加工 - + - 異常原因資料 + 噴印字樣 - + - 工單投產纪錄資料文件 + 其他 - + - 工單投產纪錄資料文件 + NA - + - 工單投產纪錄資料文件 + 錫膏 - + - 維修群組資料 + KOKI 無鉛錫膏(S3X58-M406-3) - + - 維修類別資料 + 千住 無鉛錫膏(M705-221BM5-32-11.5K3) - + - 維修原因資料 + 千住 無鹵錫膏(M705-S101ZH-S4)、無鹵錫絲(SHF RC101 F3 M705) + + + + + 其他 + + + + + Get Enum Display + + + + + + + 平台类型 + + + + + 未知 + + + + + Web + + + + + Mobile + + + + + WeChat + + + + + 激活状态 + + + + + 未激活 + + + + + 正常 + + + + + 禁用 + + + + + 注销 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工廠 + + + + + 單位 + + + + ClassInfo + 線別 + + + + + 班别資料 + + + + TIME_SEGMENT + 生產時段 + + + + + 工作臺類別 + + + + + 工作臺 + + + + + 責任單位資料 + + + + + 郵件群组類别 + + + + + 郵件群组資料 + + + + + 測試代號 + + + + + List + + + + + 正背面 + + + + + 工單性質 + + + + + 產品別 + + + + + 工單機種資料 + + + + + 工單基本資料文件 + + + + + 流程資料 + + + + + 流程站別資料 + + + + + 流程規則資料 + + + + + 條碼狀態資料 + + + + + 異常群組資料 + + + + + 異常類別資料 + + + + + 工單狀態資料 + + + + + 工單鎖定資料檔 + + + + + 工單條碼起迄資料檔 + + + + + 異常原因資料 + + + + + 工單投產纪錄資料文件 + + + + + 工單投產纪錄資料文件 + + + + + 工單投產纪錄資料文件 + + + + + 維修群組資料 + + + + + 維修類別資料 + + + + + 維修原因資料 @@ -7800,6 +8262,16 @@ 工單治具資料檔 + + + 工單上傳圖檔資料表 + + + + + 出貨序號規則 + + 條碼變更資料表 @@ -10264,7 +10736,7 @@ - 檔案名稱 + SOP文件敘述 @@ -10862,52 +11334,87 @@ 創建日期 - + + + 更新者ID + + + + + 更新日期 + + + + + 維修解碼上傳圖檔資料表 + + + + + 不良維修ID + + + + + 圖檔名稱 + + + + + 圖檔 + + + + + 創建者ID + + + + + 創建日期 + + + 更新者ID - + 更新日期 - - - 維修解碼上傳圖檔資料表 - - - + - 不良維修ID + 區域資料檔 - + - 圖檔名稱 + 區域代碼 - + - 圖檔 + 區域名稱 - + 創建者ID - + 創建日期 - + 更新者ID - + 更新日期 @@ -11204,6 +11711,76 @@ 更新日期 + + + 層別資料檔 + + + + + 區域代碼 + + + + + 層別描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + + + + 位置資料檔 + + + + + 位置代碼 + + + + + 位置描述 + + + + + 創建者ID + + + + + 創建日期 + + + + + 更新者ID + + + + + 更新日期 + + 設備記錄檔 @@ -11979,6 +12556,96 @@ 維修原因狀態 + + + 料號出貨序號規則資料檔 + + + + + 序號規則ID + + + + + 料號 + + + + + 規則 + + + + + 年 + + + + + 流水序號 + + + + + 月 + + + + + 流水序號 + + + + + 周 + + + + + 流水序號 + + + + + 生產序號 + + + + + 流水序號 + + + + + 流水序號 + + + + + 流水序號 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 標準工時资料表 @@ -12374,6 +13041,11 @@ 生產單位 + + + 備註 + + 建立者 @@ -12459,16 +13131,41 @@ 料號 + + + 工程負責人員 + + SMD點膠 + + + SMD點紅膠備註 + + + + + SMD點防焊膠 + + + + + SMD點防焊膠備註 + + 正背面 + + + DIP正背面備註 + + 是否需要CARRIER(Y/N) @@ -12479,6 +13176,11 @@ 是否需要貼付膠帶(Y/N) + + + 是否需要點防焊膠(Y/N) + + 是否燒錄(Y/N) @@ -12489,6 +13191,16 @@ 燒錄位置 + + + 燒錄備註 + + + + + 零件是否需要烘烤(Y/N) + + 零件烘烤溫度 @@ -12499,21 +13211,41 @@ 零件烘烤時間 + + + 零件烘烤備註 + + PCB烘烤 + + + PCB烘烤備註 + + PCB加工 + + + PCB加工備註 + + 錫膏 + + + 錫膏備註 + + 燒機比率 @@ -12529,16 +13261,31 @@ 燒機時間 + + + 燒機備註 + + BIOS版本 + + + BIOS備註 + + Check Sum + + + Check Sum備註 + + 創建者ID @@ -12559,6 +13306,26 @@ 更新日期 + + + PE工程師姓名 Engineer + + + + + SMDs + + + + + SMD防焊膠s + + + + + 正背面 + + 工單箱號資料檔 @@ -12779,6 +13546,11 @@ 單箱數量 + + + SFIS流程確認(Y/N) + + 判斷前製程是否已經投入 (Y-判斷;N-不判斷) @@ -12859,6 +13631,16 @@ 客戶類別 + + + 客戶類別醫療(Y-是;N-否) + + + + + 客戶類別VIP(Y-是;N-否) + + 關聯工單 @@ -12894,6 +13676,56 @@ 工單-基本資料 + + + 工單上傳圖檔資料表 + + + + + ID + + + + + 工單號碼 + + + + + 圖檔名稱 + + + + + 圖檔 + + + + + 上傳路徑 + + + + + 建立UserID + + + + + 建立日期 + + + + + 更新UserID + + + + + 更新日期 + + 工單KP資訊資料檔 @@ -12999,6 +13831,11 @@ 工單屬性 + + + 備註 + + 建立UserID @@ -13019,6 +13856,11 @@ 更新日期 + + + 認證Logos + + 工單鎖定資料檔 @@ -13399,6 +14241,11 @@ 料號 + + + 工程負責人員 + + POWER_MODE_TYPE @@ -13584,6 +14431,11 @@ OS_Desc + + + PE工程師姓名 Engineer + + 工單各站數量資料檔 – By TIME @@ -14309,6 +15161,11 @@ 流程站別規則資料 + + + 流程規則編號 + + 流程站別編號 diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll index 2b881a55..e5391437 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/Microsoft.EntityFrameworkCore.SqlServer.dll differ