diff --git a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj index 1c19c219..8d048742 100644 --- a/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj +++ b/AMESCoreStudio.Web/AMESCoreStudio.Web.csproj @@ -15,11 +15,11 @@ - + @@ -48,7 +48,6 @@ - diff --git a/AMESCoreStudio.Web/Models/LoginViewModel.cs b/AMESCoreStudio.Web/Models/LoginViewModel.cs index e0dd2d1c..f46d9bf3 100644 --- a/AMESCoreStudio.Web/Models/LoginViewModel.cs +++ b/AMESCoreStudio.Web/Models/LoginViewModel.cs @@ -12,9 +12,9 @@ namespace AMESCoreStudio.Web public class LoginViewModel { [Required] - public string LoginNo { get; set; } = "admin"; + public string LoginNo { get; set; } [Required] - public string LoginPassword { get; set; } = "admin"; + public string LoginPassword { get; set; } public string Language { get; set; } } 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 a8e77667..7dd907b5 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 b7136d6b..79a660a7 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 756d0fa5..19ed2a0a 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json @@ -861,15 +861,15 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "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.24.0", - "fileVersion": "3.100.2422.18003" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { @@ -2802,7 +2802,7 @@ "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "3.1.20", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.24", + "Microsoft.EntityFrameworkCore.SqlServer": "3.1.23", "Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5", "Oracle.EntityFrameworkCore": "5.21.1", "Swashbuckle.AspNetCore": "6.1.4" @@ -4613,12 +4613,12 @@ "path": "microsoft.entityframeworkcore.relational/5.0.1", "hashPath": "microsoft.entityframeworkcore.relational.5.0.1.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-BbirN089SgwAPU8v63TPefDRlVy5bWaeotxj29XEpyhiosmn6GJMF/vP8uUuAF0izhKBw/OnnNO8CR4r/Gbmwg==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.24", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.24.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 b6a2ca74..e0c65212 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.exe b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe index 54632062..4d9bdef4 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.exe differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index 459a0fdb..0f1de341 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 b4ac0ba7..5c5e5ee0 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 858fa6a0..3a6d9fef 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 2ced654b..399fa13a 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -36,8 +36,8 @@ "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.24", - "Microsoft.EntityFrameworkCore.Tools": "3.1.24", + "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", @@ -766,22 +766,22 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "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.24.0", - "fileVersion": "3.100.2422.18003" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {} } }, - "Microsoft.EntityFrameworkCore.Tools/3.1.24": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "dependencies": { "Microsoft.EntityFrameworkCore.Design": "5.0.8" } @@ -4274,19 +4274,19 @@ "path": "microsoft.entityframeworkcore.relational/5.0.8", "hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-BbirN089SgwAPU8v63TPefDRlVy5bWaeotxj29XEpyhiosmn6GJMF/vP8uUuAF0izhKBw/OnnNO8CR4r/Gbmwg==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.24", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.24.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.24": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-m1ZRmDAnHtpcsaOoLPPwfDLpWZPPk02OCPQii7+KR2DeS5jw4QuNsguCnk0tAq0gjACTrxP/+BFS57lGAfy/Sw==", - "path": "microsoft.entityframeworkcore.tools/3.1.24", - "hashPath": "microsoft.entityframeworkcore.tools.3.1.24.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", diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 4a0e3296..0eb7ee80 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.exe b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe index 87c4046e..76055799 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 63260592..27b48985 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 306da9f3..eeed1eb3 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -179,18 +179,6 @@ 工單ID - - - 條碼批次查詢 - - 工單號碼 - 料號 - 生產單位 - 線別 - 頁數 - 筆數 - - 更新條碼资料 @@ -347,18 +335,6 @@ barcodeID - - - - - 工單號料 - 內部條碼 - 組件編號 - 內部條碼List - 頁數 - 筆數 - - 用barcode獲取資料 @@ -453,85 +429,6 @@ - - - 條碼報廢轉出資料檔 - - - - - - - - - - - 獲取全部報廢轉出資料 - - - - - - 根據ID獲取單一報廢轉出資料 - - - - - - - - - - - - - - 報廢資料查詢 - - - - - - - - - - - - - 轉出資料查詢 - - - - - - - - - - - - - 根據ID修改單一筆報廢轉出資料 - - - - - - - - 新增報廢轉出資料 - - - - - - - 根據ID刪除單一筆報廢轉出資料 - - - - 條碼過站資料檔 @@ -560,12 +457,6 @@ - - - 查詢工單站別條碼資料 By 條碼批次查詢 - - - 查詢 已過站數量 @@ -1256,12 +1147,6 @@ - - - FQC細項資料(全部) - - - 新增檢驗單明細資料檔 @@ -1319,13 +1204,6 @@ - - - 更新入庫單 抽驗係數標準 - - - - 新增入庫單 @@ -3200,17 +3078,6 @@ 抽驗數量 - - - 查詢抽驗標準維護 - - 抽驗係數ID - AQL類型 - 批量 - 頁數 - - - 更新抽驗標準 @@ -3823,18 +3690,6 @@ 錫膏基本資料檔 - - - 錫膏資料查詢 - - 錫膏編號 - PCB板號 - 正背面 - 狀態 - 頁數 - 筆數 - - 更新錫膏基本資料檔 @@ -4023,13 +3878,6 @@ 鋼板基本資料檔 - - - By 鋼板編號 查詢 - - 鋼板編號 - - 鋼板資料查詢 @@ -4061,15 +3909,6 @@ 鋼板量測記錄資料檔 - - - 鋼板編號紀錄 By 鋼板編號 - - - - - - 更新鋼板量測記錄資料檔 @@ -4077,11 +3916,11 @@ - + 新增鋼板量測記錄資料檔 - + @@ -5099,60 +4938,6 @@ - - - 生產工時報工資料 - - - - - - - - - - - 獲取全部生產報工工時資料 - - - - - - 查詢生產工時報工資料 - - - - - - 根據ID查詢某一筆生產報工工時 - - - - - - - - - 修改生產工時報工資料 - - - - - - - - 新增生產工時報工資料 - - - - - - - - - - - 工作群組維護 @@ -5451,7 +5236,7 @@ BurnInfo-燒入資料檔 - + @@ -7039,91 +6824,6 @@ - - - 條碼資料 DTO - - - - - 内部條碼ID - - - - - 内部條碼 - - - - - 工單ID - - - - - 工單號碼 - - - - - 料號 - - - - - 工單數量 - - - - - 流程站 - - - - - 流程站ID - - - - - 生產單位 - - - - - 生產單位名稱 - - - - - 線別ID - - - - - 線別名稱 - - - - - 數量 - - - - - 建立者Name - - - - - 建立時間 - - - - - 修改時間 - - 條碼组件變更資料檔 DTO @@ -7199,31 +6899,16 @@ 條碼组件資料檔 DTO - - - 條碼組件ID - - 内部條碼ID - - - 内部條碼 - - 工單ID - - - 工單 - - 流程站 @@ -7234,11 +6919,6 @@ 流程站ID - - - 组件代碼 - - 组件代碼Name @@ -7685,159 +7365,54 @@ 工作站基本資料 - - - 報廢轉出資料檔 - - - + - 報廢轉出序號ID + 條碼過站資料檔 - + - 條碼ID + 內部條碼ID - + 工單ID - + 流程站別ID - + - 生產單位 + 規則狀態值 - + - 責任部門ID + 投入日期 - + - 作業人員ID + 系统狀態 - + - 作業時間 + 線别ID - + - 作業原因 + 站别的次數 - + - 根本原因預防處理 - - - - - 預防措施 - - - - - 預防處理 - - - - - 流程狀態 - - - - - IPQA UserID - - - - - PE UserID - - - - - 主管ID - - - - - 建立UserID - - - - - 建立日期 - - - - - 更新UserID - - - - - 更新日期 - - - - - 條碼過站資料檔 - - - - - 內部條碼ID - - - - - 工單ID - - - - - 流程站別ID - - - - - 規則狀態值 - - - - - 投入日期 - - - - - 系统狀態 - - - - - 線别ID - - - - - 站别的次數 - - - - - 過站次數（不限定工單） + 過站次數（不限定工單） @@ -9240,41 +8815,6 @@ Proved - - - 抽樣允收標準 - - - - - Major - - - - - Minor - - - - - NOTE - - - - - ECN_MEMO - - - - - PLM_ECN - - - - - 檢驗地方 A:廠驗 B:委外 C:免驗 - - 檢驗結果上傳圖檔資料表 @@ -11695,11 +11235,6 @@ 檢驗項目英文 - - - 類型 - - 建立UserID @@ -11740,19 +11275,14 @@ 抽驗係数名稱 - + - 描述 + 是否AQL標準 - AQL類型 成品:半成品 - - - - - AQL + AQL類型 @@ -14540,116 +14070,6 @@ 更新日期 - - - 生產工時報工資料 - - - - - 生產工時ID - - - - - 制程代碼 - - - - - 線別 - - - - - 站別ID - - - - - 正背面 - - - - - 工單號碼 - - - - - 作業人數 - - - - - 開工時間 - - - - - 投入站採集傳感器 - - - - - 產出站採集傳感器 - - - - - 生產數量 - - - - - 總工時 - - - - - 完工時間 - - - - - 備註 - - - - - 工程編號 - - - - - 組合機種數量 - - - - - 扣除時間(Min) - - - - - 建立者 - - - - - 建立日期 - - - - - 修改者 - - - - - 修改日期 - - 工作類別資料檔 @@ -15397,7 +14817,7 @@ - 流程備註 + 狀態 @@ -16517,12 +15937,12 @@ - 批量 + - 醫療機種 + @@ -16532,7 +15952,7 @@ - 抽樣 + @@ -16540,9 +15960,9 @@ - + - 抽驗係數名稱 + 抽驗標準 @@ -16552,12 +15972,12 @@ - 產線備註 + 產線 - 入庫庫別 + @@ -16565,44 +15985,9 @@ - - - AQL 類型 - - - - - AQL 描述 - - - - - 抽驗數 - - - - - 允收數 - - - - - 不良數 - - - - - 檢驗結果Judgment Quantity - - - + - Major - - - - - Minor + 成品99 @@ -16610,86 +15995,6 @@ 特採單 - - - 判斷結果 - - - - - 缺點描述 - - - - - 委外廠 Name - - - - - 檢驗儀器編號 - - - - - 檢驗項目 OS CPU RAM - - - - - 抽驗人員 - - - - - 主管 - - - - - 檢驗工項 - - - - - - - - - - 檢驗工項名稱 - - - - - 檢驗類型 - - - - - 檢驗 - - - - - 出貨序號 - - - - - 生產序號 - - - - - 是否抽驗 - - - - - 檢驗結果 - - 入庫單資料檔 Dto @@ -16745,11 +16050,6 @@ 抽驗狀態 P-PASS(允收);R-REJECT(批退); A-初始狀態 - - - 檢驗時間 - - 抽驗數量 @@ -16765,31 +16065,6 @@ 不良數 - - - CritID - - - - - AQL - - - - - AQL 描述 - - - - - 抽驗係數名稱 - - - - - AQL類型 - - 允收數量 @@ -16800,11 +16075,6 @@ 拒收數量 - - - 特採單 - - 判定備註 @@ -16895,61 +16165,11 @@ 檢驗者姓名 Engineer - - - 抽樣允收標準 - - - - - 抽樣允收標準 名稱 - - - - - Major Qty - - - - - Minor Qty - - - - - Wip_ECN - - - - - PLM_ECN - - - - - ECN_Memo - - - - - NOTE - - - - - 檢驗地方 A:廠驗 B:委外 C:免驗 - - 附件檔案 - - - 檢驗 - - 檢查工項 @@ -17177,7 +16397,7 @@ - 出貨序號 + 外部序號 @@ -17185,11 +16405,6 @@ 狀態 P-PASS;F-FAIL;C-CPN - - - IsSample - - 不良代碼 @@ -17562,49 +16777,19 @@ 抽驗標準ID - - - 抽驗係数ID - - 係數名稱 - - - 描述 - - - - - AQL類型 成品:半成品 - - - - - AQL - - 抽樣代碼 - - - 抽樣_起始數量 - - - - - 抽樣_結束數量 - - - 抽樣點數 起始數量 ~ 結束數量 + 抽樣點數 @@ -17672,16 +16857,6 @@ 檢驗項目英文 - - - 檢驗項目類型 - - - - - 檢驗項目類型 名稱 - - 建立UserID @@ -17787,7 +16962,7 @@ 有效日期 - + 狀態 0=失效 ; 1=有效 @@ -17887,81 +17062,6 @@ 更新日期 - - - SteelPlateInfoDto 鋼板紀錄資料檔Dto - - - - - 鋼板量測記錄ID - - - - - 鋼板ID - - - - - 鋼板編號 - - - - - 張力_1 - - - - - 張力_2 - - - - - 張力_3 - - - - - 張力_4 - - - - - 張力_5 - - - - - 檢查狀態 - - - - - 備註 - - - - - 判定結果 P=PASS ; F=FAIL ; N=未量測 - - - - - 建立UserID - - - - - 建立User - - - - - 建立日期 - - WipInfo Select Dto @@ -18784,115 +17884,6 @@ 內部異常 - - - - - - - - 抽樣計畫允收標準 - - - - - First Insp. - - - - - Minor - - - - - 檢驗項目_類型 - - - - - Major - - - - - Minor - - - - - AQL_類型 - - - - - 成品99 - - - - - 半成品96 - - - - - 檢驗地點 - - - - - 廠驗 - - - - - 委外 - - - - - 免驗 - - - - - Get Enum Display - - - - - - - - - - - - 鋼板量測狀態 - - - - - 上線前 - - - - - 清洗後 - - - - - 每周點檢 - - - - - Get Enum Display - - - - @@ -20037,16 +19028,7 @@ 檢驗單明細資料檔 - - - 生產工時報工資料檔 - - - - - 鋼板基本資料檔 - - + 鋼板量測記錄資料檔 @@ -20062,11 +19044,6 @@ 錫膏使用紀錄資料檔 - - - 條碼報廢轉出資料檔 - - 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 ea8a80ec..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 0ad91fa0..bf42ffaa 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj @@ -38,8 +38,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user index a68e9516..4d3e0e03 100644 --- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user +++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj.user @@ -1,7 +1,7 @@  - 650.4 + 650 ApiControllerWithContextScaffolder root/Common/Api True diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeInfo.cs index 05871cf2..d5cc32ec 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeInfo.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeInfo.cs @@ -55,9 +55,9 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 條碼過站位置 /// - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [DataMember] - public int StationID { get; set; } + public int RuleStationID { get; set; } /// /// 條碼過站狀態 P:PASS F:不良 diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs index e36abfb7..ba8cfb78 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs @@ -37,11 +37,12 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 流程站别ID + /// 改抓StationID 20220418 /// - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [DataMember] [Display(Name = "站别")] - public int StationID { get; set; } + public int RuleStationID { get; set; } /// /// 组件代碼 diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs index e205d5ef..2a5b7551 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs @@ -54,10 +54,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 流程站别ID /// - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [DataMember] [Display(Name = "站别")] - public int StationID { get; set; } + public int RuleStationID { get; set; } /// /// 工單ID diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs index 704181c2..aebacee2 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeQngInfo.cs @@ -47,8 +47,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES [DataMember] [Display(Name = "流程站別ID")] [Required(ErrorMessage = "{0},不能空白")] - [Column("STATION_ID")] - public int StationID { get; set; } + [Column("RULE_STATION_ID")] + public int RuleStationID { get; set; } /// /// 生產單位 diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs index a2349108..b70c4c5c 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs @@ -34,23 +34,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Display(Name = "工單ID")] public int WipID { get; set; } - /// - /// 流程ID - /// - [Key] - [Column("FLOW_RULE_ID")] - [DataMember] - [Display(Name = "流程ID")] - public int FlowRuleID { get; set; } - /// /// 流程站別ID /// [Key] - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [DataMember] [Display(Name = "流程站別ID")] - public int StationID { get; set; } + public int RuleStationID { get; set; } /// /// 規則狀態值 diff --git a/AMESCoreStudio.WebApi/Models/AMES/QngInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/QngInfo.cs index cdb0f4c2..634a08cc 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/QngInfo.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/QngInfo.cs @@ -75,8 +75,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES [DataMember] [Display(Name = "流程站別ID")] [Required(ErrorMessage = "{0},不能空白")] - [Column("STATION_ID")] - public int StationID { get; set; } + [Column("RULE_STATION_ID")] + public int RuleStationID { get; set; } /// /// 覆判結果 P-PASS F-FAIL diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipClass.cs b/AMESCoreStudio.WebApi/Models/AMES/WipClass.cs index 25dc13be..ab0bc9ac 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipClass.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipClass.cs @@ -30,8 +30,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Key] [Required] [DataMember] - [Column("STATION_ID")] - public int StationID { get; set; } + [Column("RULE_STATION_ID")] + public int RuleStationID { get; set; } /// /// 過站狀態 diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipRetrue.cs b/AMESCoreStudio.WebApi/Models/AMES/WipRetrue.cs index c0655ec9..62cea7c1 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipRetrue.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipRetrue.cs @@ -35,15 +35,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 指定過站 RuleStation /// [DataMember] - [Column("GOSTATION_ID", TypeName = "NUMBER")] - public decimal GoStationId { get; set; } + [Column("GORULE_STATION_ID", TypeName = "NUMBER")] + public decimal GoruleStationId { get; set; } /// /// 返回過站 RuleStation /// [DataMember] - [Column("RESTATION_ID", TypeName = "NUMBER")] - public decimal ReStationId { get; set; } + [Column("RERULE_STATION_ID", TypeName = "NUMBER")] + public decimal ReruleStationId { get; set; } /// /// 返回類型 P:單站退回 A:通過退回 diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipRule.cs b/AMESCoreStudio.WebApi/Models/AMES/WipRule.cs index cfc72072..a0a3cb08 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipRule.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipRule.cs @@ -25,11 +25,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 站別ID /// [Key] - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [DataMember] [Required(ErrorMessage = "{0},不能空白")] [Display(Name = "站別ID")] - public int StationID { get; set; } = -1; + public int RuleStationID { get; set; } = -1; /// /// 組件代碼 diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipStation.cs b/AMESCoreStudio.WebApi/Models/AMES/WipStation.cs index 047e3a5e..abd64357 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipStation.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipStation.cs @@ -30,8 +30,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Key] [Required] [DataMember] - [Column("STATION_ID")] - public int StationID { get; set; } + [Column("RULE_STATION_ID")] + public int RuleStationID { get; set; } /// /// 過站狀態 diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipTime.cs b/AMESCoreStudio.WebApi/Models/AMES/WipTime.cs index 0d3db4e2..5d54438d 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipTime.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipTime.cs @@ -30,8 +30,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Key] [Required] [DataMember] - [Column("STATION_ID")] - public int StationID { get; set; } + [Column("RULE_STATION_ID")] + public int RuleStationID { get; set; } /// /// 過站狀態 diff --git a/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs b/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs index f8d00e09..a62de7ea 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/MaterialFlow.cs @@ -68,7 +68,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS public string MaterialFlowStatus { get; set; } /// - /// 流程備註 + /// 狀態 /// [Column("MATERIAL_FLOW_REMARK")] [Display(Name = "流程備註")] diff --git a/AMESCoreStudio.WebApi/Models/BAS/Rules.cs b/AMESCoreStudio.WebApi/Models/BAS/Rules.cs index 8c528dc0..bdd36c45 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/Rules.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/Rules.cs @@ -19,21 +19,13 @@ namespace AMESCoreStudio.WebApi.Models.BAS [DataMember] public int RuleID { get; set; } - /// - /// 流程ID - /// - [Column("FLOW_RULE_ID")] - [Display(Name = "流程ID")] - [DataMember] - public int FlowRuleID { get; set; } - /// /// 流程站別編號 /// - [Column("STATION_ID")] + [Column("RULE_STATION_ID")] [Display(Name = "流程站別編號")] [DataMember] - public int StationID { get; set; } + public int RuleStationID { get; set; } /// /// 規則描述 diff --git a/AMESCoreStudio.WebApi/Startup.cs b/AMESCoreStudio.WebApi/Startup.cs index 77bc81a6..dea27ec8 100644 --- a/AMESCoreStudio.WebApi/Startup.cs +++ b/AMESCoreStudio.WebApi/Startup.cs @@ -15,6 +15,8 @@ using System.IO; using System.Reflection; using Swashbuckle.AspNetCore.Swagger; using Microsoft.OpenApi.Models; +using System.Text.Json.Serialization; +using Newtonsoft.Json.Serialization; namespace AMESCoreStudio.WebApi { diff --git a/AMESCoreStudio.WebApi/appsettings.json b/AMESCoreStudio.WebApi/appsettings.json index 8c4614f2..32d48456 100644 --- a/AMESCoreStudio.WebApi/appsettings.json +++ b/AMESCoreStudio.WebApi/appsettings.json @@ -7,8 +7,10 @@ } }, "ConnectionStrings": { - "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.188.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=JHAMES;", - "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;" + "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHAMES;Password=AMES666;", + "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=JHSYS;Password=ASYS666;" + //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;" + //"AMESContextO": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;" }, "MailSmtpServer": "", "MailSmtpPort": "25", 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 b4ac0ba7..5c5e5ee0 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 858fa6a0..3a6d9fef 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 2ced654b..399fa13a 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -36,8 +36,8 @@ "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", - "Microsoft.EntityFrameworkCore.SqlServer": "3.1.24", - "Microsoft.EntityFrameworkCore.Tools": "3.1.24", + "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", @@ -766,22 +766,22 @@ "lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {} } }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "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.24.0", - "fileVersion": "3.100.2422.18003" + "assemblyVersion": "3.1.23.0", + "fileVersion": "3.100.2322.12304" } }, "compile": { "lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {} } }, - "Microsoft.EntityFrameworkCore.Tools/3.1.24": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "dependencies": { "Microsoft.EntityFrameworkCore.Design": "5.0.8" } @@ -4274,19 +4274,19 @@ "path": "microsoft.entityframeworkcore.relational/5.0.8", "hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512" }, - "Microsoft.EntityFrameworkCore.SqlServer/3.1.24": { + "Microsoft.EntityFrameworkCore.SqlServer/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-BbirN089SgwAPU8v63TPefDRlVy5bWaeotxj29XEpyhiosmn6GJMF/vP8uUuAF0izhKBw/OnnNO8CR4r/Gbmwg==", - "path": "microsoft.entityframeworkcore.sqlserver/3.1.24", - "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.24.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.24": { + "Microsoft.EntityFrameworkCore.Tools/3.1.23": { "type": "package", "serviceable": true, - "sha512": "sha512-m1ZRmDAnHtpcsaOoLPPwfDLpWZPPk02OCPQii7+KR2DeS5jw4QuNsguCnk0tAq0gjACTrxP/+BFS57lGAfy/Sw==", - "path": "microsoft.entityframeworkcore.tools/3.1.24", - "hashPath": "microsoft.entityframeworkcore.tools.3.1.24.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", diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 4a0e3296..0eb7ee80 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.exe b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe index 87c4046e..76055799 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.exe differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index 63260592..27b48985 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 306da9f3..eeed1eb3 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -179,18 +179,6 @@ 工單ID - - - 條碼批次查詢 - - 工單號碼 - 料號 - 生產單位 - 線別 - 頁數 - 筆數 - - 更新條碼资料 @@ -347,18 +335,6 @@ barcodeID - - - - - 工單號料 - 內部條碼 - 組件編號 - 內部條碼List - 頁數 - 筆數 - - 用barcode獲取資料 @@ -453,85 +429,6 @@ - - - 條碼報廢轉出資料檔 - - - - - - - - - - - 獲取全部報廢轉出資料 - - - - - - 根據ID獲取單一報廢轉出資料 - - - - - - - - - - - - - - 報廢資料查詢 - - - - - - - - - - - - - 轉出資料查詢 - - - - - - - - - - - - - 根據ID修改單一筆報廢轉出資料 - - - - - - - - 新增報廢轉出資料 - - - - - - - 根據ID刪除單一筆報廢轉出資料 - - - - 條碼過站資料檔 @@ -560,12 +457,6 @@ - - - 查詢工單站別條碼資料 By 條碼批次查詢 - - - 查詢 已過站數量 @@ -1256,12 +1147,6 @@ - - - FQC細項資料(全部) - - - 新增檢驗單明細資料檔 @@ -1319,13 +1204,6 @@ - - - 更新入庫單 抽驗係數標準 - - - - 新增入庫單 @@ -3200,17 +3078,6 @@ 抽驗數量 - - - 查詢抽驗標準維護 - - 抽驗係數ID - AQL類型 - 批量 - 頁數 - - - 更新抽驗標準 @@ -3823,18 +3690,6 @@ 錫膏基本資料檔 - - - 錫膏資料查詢 - - 錫膏編號 - PCB板號 - 正背面 - 狀態 - 頁數 - 筆數 - - 更新錫膏基本資料檔 @@ -4023,13 +3878,6 @@ 鋼板基本資料檔 - - - By 鋼板編號 查詢 - - 鋼板編號 - - 鋼板資料查詢 @@ -4061,15 +3909,6 @@ 鋼板量測記錄資料檔 - - - 鋼板編號紀錄 By 鋼板編號 - - - - - - 更新鋼板量測記錄資料檔 @@ -4077,11 +3916,11 @@ - + 新增鋼板量測記錄資料檔 - + @@ -5099,60 +4938,6 @@ - - - 生產工時報工資料 - - - - - - - - - - - 獲取全部生產報工工時資料 - - - - - - 查詢生產工時報工資料 - - - - - - 根據ID查詢某一筆生產報工工時 - - - - - - - - - 修改生產工時報工資料 - - - - - - - - 新增生產工時報工資料 - - - - - - - - - - - 工作群組維護 @@ -5451,7 +5236,7 @@ BurnInfo-燒入資料檔 - + @@ -7039,91 +6824,6 @@ - - - 條碼資料 DTO - - - - - 内部條碼ID - - - - - 内部條碼 - - - - - 工單ID - - - - - 工單號碼 - - - - - 料號 - - - - - 工單數量 - - - - - 流程站 - - - - - 流程站ID - - - - - 生產單位 - - - - - 生產單位名稱 - - - - - 線別ID - - - - - 線別名稱 - - - - - 數量 - - - - - 建立者Name - - - - - 建立時間 - - - - - 修改時間 - - 條碼组件變更資料檔 DTO @@ -7199,31 +6899,16 @@ 條碼组件資料檔 DTO - - - 條碼組件ID - - 内部條碼ID - - - 内部條碼 - - 工單ID - - - 工單 - - 流程站 @@ -7234,11 +6919,6 @@ 流程站ID - - - 组件代碼 - - 组件代碼Name @@ -7685,159 +7365,54 @@ 工作站基本資料 - - - 報廢轉出資料檔 - - - + - 報廢轉出序號ID + 條碼過站資料檔 - + - 條碼ID + 內部條碼ID - + 工單ID - + 流程站別ID - + - 生產單位 + 規則狀態值 - + - 責任部門ID + 投入日期 - + - 作業人員ID + 系统狀態 - + - 作業時間 + 線别ID - + - 作業原因 + 站别的次數 - + - 根本原因預防處理 - - - - - 預防措施 - - - - - 預防處理 - - - - - 流程狀態 - - - - - IPQA UserID - - - - - PE UserID - - - - - 主管ID - - - - - 建立UserID - - - - - 建立日期 - - - - - 更新UserID - - - - - 更新日期 - - - - - 條碼過站資料檔 - - - - - 內部條碼ID - - - - - 工單ID - - - - - 流程站別ID - - - - - 規則狀態值 - - - - - 投入日期 - - - - - 系统狀態 - - - - - 線别ID - - - - - 站别的次數 - - - - - 過站次數（不限定工單） + 過站次數（不限定工單） @@ -9240,41 +8815,6 @@ Proved - - - 抽樣允收標準 - - - - - Major - - - - - Minor - - - - - NOTE - - - - - ECN_MEMO - - - - - PLM_ECN - - - - - 檢驗地方 A:廠驗 B:委外 C:免驗 - - 檢驗結果上傳圖檔資料表 @@ -11695,11 +11235,6 @@ 檢驗項目英文 - - - 類型 - - 建立UserID @@ -11740,19 +11275,14 @@ 抽驗係数名稱 - + - 描述 + 是否AQL標準 - AQL類型 成品:半成品 - - - - - AQL + AQL類型 @@ -14540,116 +14070,6 @@ 更新日期 - - - 生產工時報工資料 - - - - - 生產工時ID - - - - - 制程代碼 - - - - - 線別 - - - - - 站別ID - - - - - 正背面 - - - - - 工單號碼 - - - - - 作業人數 - - - - - 開工時間 - - - - - 投入站採集傳感器 - - - - - 產出站採集傳感器 - - - - - 生產數量 - - - - - 總工時 - - - - - 完工時間 - - - - - 備註 - - - - - 工程編號 - - - - - 組合機種數量 - - - - - 扣除時間(Min) - - - - - 建立者 - - - - - 建立日期 - - - - - 修改者 - - - - - 修改日期 - - 工作類別資料檔 @@ -15397,7 +14817,7 @@ - 流程備註 + 狀態 @@ -16517,12 +15937,12 @@ - 批量 + - 醫療機種 + @@ -16532,7 +15952,7 @@ - 抽樣 + @@ -16540,9 +15960,9 @@ - + - 抽驗係數名稱 + 抽驗標準 @@ -16552,12 +15972,12 @@ - 產線備註 + 產線 - 入庫庫別 + @@ -16565,44 +15985,9 @@ - - - AQL 類型 - - - - - AQL 描述 - - - - - 抽驗數 - - - - - 允收數 - - - - - 不良數 - - - - - 檢驗結果Judgment Quantity - - - + - Major - - - - - Minor + 成品99 @@ -16610,86 +15995,6 @@ 特採單 - - - 判斷結果 - - - - - 缺點描述 - - - - - 委外廠 Name - - - - - 檢驗儀器編號 - - - - - 檢驗項目 OS CPU RAM - - - - - 抽驗人員 - - - - - 主管 - - - - - 檢驗工項 - - - - - - - - - - 檢驗工項名稱 - - - - - 檢驗類型 - - - - - 檢驗 - - - - - 出貨序號 - - - - - 生產序號 - - - - - 是否抽驗 - - - - - 檢驗結果 - - 入庫單資料檔 Dto @@ -16745,11 +16050,6 @@ 抽驗狀態 P-PASS(允收);R-REJECT(批退); A-初始狀態 - - - 檢驗時間 - - 抽驗數量 @@ -16765,31 +16065,6 @@ 不良數 - - - CritID - - - - - AQL - - - - - AQL 描述 - - - - - 抽驗係數名稱 - - - - - AQL類型 - - 允收數量 @@ -16800,11 +16075,6 @@ 拒收數量 - - - 特採單 - - 判定備註 @@ -16895,61 +16165,11 @@ 檢驗者姓名 Engineer - - - 抽樣允收標準 - - - - - 抽樣允收標準 名稱 - - - - - Major Qty - - - - - Minor Qty - - - - - Wip_ECN - - - - - PLM_ECN - - - - - ECN_Memo - - - - - NOTE - - - - - 檢驗地方 A:廠驗 B:委外 C:免驗 - - 附件檔案 - - - 檢驗 - - 檢查工項 @@ -17177,7 +16397,7 @@ - 出貨序號 + 外部序號 @@ -17185,11 +16405,6 @@ 狀態 P-PASS;F-FAIL;C-CPN - - - IsSample - - 不良代碼 @@ -17562,49 +16777,19 @@ 抽驗標準ID - - - 抽驗係数ID - - 係數名稱 - - - 描述 - - - - - AQL類型 成品:半成品 - - - - - AQL - - 抽樣代碼 - - - 抽樣_起始數量 - - - - - 抽樣_結束數量 - - - 抽樣點數 起始數量 ~ 結束數量 + 抽樣點數 @@ -17672,16 +16857,6 @@ 檢驗項目英文 - - - 檢驗項目類型 - - - - - 檢驗項目類型 名稱 - - 建立UserID @@ -17787,7 +16962,7 @@ 有效日期 - + 狀態 0=失效 ; 1=有效 @@ -17887,81 +17062,6 @@ 更新日期 - - - SteelPlateInfoDto 鋼板紀錄資料檔Dto - - - - - 鋼板量測記錄ID - - - - - 鋼板ID - - - - - 鋼板編號 - - - - - 張力_1 - - - - - 張力_2 - - - - - 張力_3 - - - - - 張力_4 - - - - - 張力_5 - - - - - 檢查狀態 - - - - - 備註 - - - - - 判定結果 P=PASS ; F=FAIL ; N=未量測 - - - - - 建立UserID - - - - - 建立User - - - - - 建立日期 - - WipInfo Select Dto @@ -18784,115 +17884,6 @@ 內部異常 - - - - - - - - 抽樣計畫允收標準 - - - - - First Insp. - - - - - Minor - - - - - 檢驗項目_類型 - - - - - Major - - - - - Minor - - - - - AQL_類型 - - - - - 成品99 - - - - - 半成品96 - - - - - 檢驗地點 - - - - - 廠驗 - - - - - 委外 - - - - - 免驗 - - - - - Get Enum Display - - - - - - - - - - - - 鋼板量測狀態 - - - - - 上線前 - - - - - 清洗後 - - - - - 每周點檢 - - - - - Get Enum Display - - - - @@ -20037,16 +19028,7 @@ 檢驗單明細資料檔 - - - 生產工時報工資料檔 - - - - - 鋼板基本資料檔 - - + 鋼板量測記錄資料檔 @@ -20062,11 +19044,6 @@ 錫膏使用紀錄資料檔 - - - 條碼報廢轉出資料檔 - - 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 ea8a80ec..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 diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json index 8c4614f2..32d48456 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json @@ -7,8 +7,10 @@ } }, "ConnectionStrings": { - "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.188.1)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=JHAMES;", - "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=JHDB)));User Id=JHSYS;Password=ASYS666;" + "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHAMES;Password=AMES666;", + "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=JHSYS;Password=ASYS666;" + //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;" + //"AMESContextO": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;" }, "MailSmtpServer": "", "MailSmtpPort": "25", diff --git a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo deleted file mode 100644 index aad60f6a..00000000 Binary files a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo and /dev/null differ diff --git a/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs b/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs deleted file mode 100644 index 29810132..00000000 --- a/其他專案資料/AMES_AP/AMES_AP/Login.Designer.cs +++ /dev/null @@ -1,199 +0,0 @@ -namespace AMES_AP -{ - partial class Login - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Login)); - this.txtUserName = new MaterialSkin.Controls.MaterialTextBox2(); - this.materialLabel1 = new MaterialSkin.Controls.MaterialLabel(); - this.txtPassword = new MaterialSkin.Controls.MaterialTextBox2(); - this.cbxRemember = new MaterialSkin.Controls.MaterialCheckbox(); - this.btnLogin = new MaterialSkin.Controls.MaterialButton(); - this.lblErrorMessage = new MaterialSkin.Controls.MaterialLabel(); - this.SuspendLayout(); - // - // txtUserName - // - this.txtUserName.AnimateReadOnly = false; - this.txtUserName.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.txtUserName.CharacterCasing = System.Windows.Forms.CharacterCasing.Normal; - this.txtUserName.Depth = 0; - this.txtUserName.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - this.txtUserName.HideSelection = true; - this.txtUserName.Hint = "帳號"; - this.txtUserName.LeadingIcon = null; - this.txtUserName.Location = new System.Drawing.Point(16, 142); - this.txtUserName.MaxLength = 32767; - this.txtUserName.MouseState = MaterialSkin.MouseState.OUT; - this.txtUserName.Name = "txtUserName"; - this.txtUserName.PasswordChar = '\0'; - this.txtUserName.PrefixSuffixText = null; - this.txtUserName.ReadOnly = false; - this.txtUserName.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.txtUserName.SelectedText = ""; - this.txtUserName.SelectionLength = 0; - this.txtUserName.SelectionStart = 0; - this.txtUserName.ShortcutsEnabled = true; - this.txtUserName.Size = new System.Drawing.Size(392, 48); - this.txtUserName.TabIndex = 0; - this.txtUserName.TabStop = false; - this.txtUserName.Text = "1"; - this.txtUserName.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; - this.txtUserName.TrailingIcon = null; - this.txtUserName.UseSystemPasswordChar = false; - // - // materialLabel1 - // - this.materialLabel1.AutoSize = true; - this.materialLabel1.BackColor = System.Drawing.Color.Transparent; - this.materialLabel1.Depth = 0; - this.materialLabel1.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - this.materialLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.materialLabel1.Location = new System.Drawing.Point(159, 103); - this.materialLabel1.MouseState = MaterialSkin.MouseState.HOVER; - this.materialLabel1.Name = "materialLabel1"; - this.materialLabel1.Size = new System.Drawing.Size(66, 19); - this.materialLabel1.TabIndex = 1; - this.materialLabel1.Text = "Welcome"; - // - // txtPassword - // - this.txtPassword.AnimateReadOnly = false; - this.txtPassword.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.txtPassword.CharacterCasing = System.Windows.Forms.CharacterCasing.Normal; - this.txtPassword.Depth = 0; - this.txtPassword.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - this.txtPassword.HideSelection = true; - this.txtPassword.Hint = "密碼"; - this.txtPassword.LeadingIcon = null; - this.txtPassword.Location = new System.Drawing.Point(16, 202); - this.txtPassword.MaxLength = 32767; - this.txtPassword.MouseState = MaterialSkin.MouseState.OUT; - this.txtPassword.Name = "txtPassword"; - this.txtPassword.PasswordChar = '●'; - this.txtPassword.PrefixSuffixText = null; - this.txtPassword.ReadOnly = false; - this.txtPassword.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.txtPassword.SelectedText = ""; - this.txtPassword.SelectionLength = 0; - this.txtPassword.SelectionStart = 0; - this.txtPassword.ShortcutsEnabled = true; - this.txtPassword.Size = new System.Drawing.Size(392, 48); - this.txtPassword.TabIndex = 2; - this.txtPassword.TabStop = false; - this.txtPassword.Text = "1"; - this.txtPassword.TextAlign = System.Windows.Forms.HorizontalAlignment.Left; - this.txtPassword.TrailingIcon = null; - this.txtPassword.UseSystemPasswordChar = true; - // - // cbxRemember - // - this.cbxRemember.AutoSize = true; - this.cbxRemember.BackColor = System.Drawing.Color.Transparent; - this.cbxRemember.Depth = 0; - this.cbxRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F); - this.cbxRemember.Location = new System.Drawing.Point(16, 254); - this.cbxRemember.Margin = new System.Windows.Forms.Padding(0); - this.cbxRemember.MouseLocation = new System.Drawing.Point(-1, -1); - this.cbxRemember.MouseState = MaterialSkin.MouseState.HOVER; - this.cbxRemember.Name = "cbxRemember"; - this.cbxRemember.ReadOnly = false; - this.cbxRemember.Ripple = true; - this.cbxRemember.Size = new System.Drawing.Size(137, 37); - this.cbxRemember.TabIndex = 4; - this.cbxRemember.Text = "Remember Me"; - this.cbxRemember.UseVisualStyleBackColor = false; - // - // btnLogin - // - this.btnLogin.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.btnLogin.Density = MaterialSkin.Controls.MaterialButton.MaterialButtonDensity.Default; - this.btnLogin.Depth = 0; - this.btnLogin.HighEmphasis = true; - this.btnLogin.Icon = null; - this.btnLogin.Location = new System.Drawing.Point(162, 306); - this.btnLogin.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); - this.btnLogin.MouseState = MaterialSkin.MouseState.HOVER; - this.btnLogin.Name = "btnLogin"; - this.btnLogin.NoAccentTextColor = System.Drawing.Color.Empty; - this.btnLogin.Size = new System.Drawing.Size(64, 36); - this.btnLogin.TabIndex = 5; - this.btnLogin.Text = "Login"; - this.btnLogin.Type = MaterialSkin.Controls.MaterialButton.MaterialButtonType.Contained; - this.btnLogin.UseAccentColor = false; - this.btnLogin.UseVisualStyleBackColor = true; - this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click); - // - // lblErrorMessage - // - this.lblErrorMessage.AutoSize = true; - this.lblErrorMessage.BackColor = System.Drawing.Color.Transparent; - this.lblErrorMessage.Depth = 0; - this.lblErrorMessage.Font = new System.Drawing.Font("Roboto", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel); - this.lblErrorMessage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblErrorMessage.Location = new System.Drawing.Point(100, 342); - this.lblErrorMessage.MouseState = MaterialSkin.MouseState.HOVER; - this.lblErrorMessage.Name = "lblErrorMessage"; - this.lblErrorMessage.Size = new System.Drawing.Size(1, 0); - this.lblErrorMessage.TabIndex = 6; - // - // Login - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(424, 415); - this.Controls.Add(this.lblErrorMessage); - this.Controls.Add(this.btnLogin); - this.Controls.Add(this.cbxRemember); - this.Controls.Add(this.txtPassword); - this.Controls.Add(this.materialLabel1); - this.Controls.Add(this.txtUserName); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.Name = "Login"; - this.Padding = new System.Windows.Forms.Padding(2, 51, 2, 2); - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Login Form"; - this.Load += new System.EventHandler(this.Login_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private MaterialSkin.Controls.MaterialTextBox2 txtUserName; - private MaterialSkin.Controls.MaterialLabel materialLabel1; - private MaterialSkin.Controls.MaterialTextBox2 txtPassword; - private MaterialSkin.Controls.MaterialCheckbox cbxRemember; - private MaterialSkin.Controls.MaterialButton btnLogin; - private MaterialSkin.Controls.MaterialLabel lblErrorMessage; - - } -} - diff --git a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs b/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs deleted file mode 100644 index df0c24a6..00000000 --- a/其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs +++ /dev/null @@ -1,410 +0,0 @@ -using MaterialSkin.Controls; -using System; -using System.Collections.Generic; -using System.Collections; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using Newtonsoft.Json; -using AMES_AP.Models; - -namespace AMES_AP -{ - public partial class StockControlForm : MaterialForm - { - private WipInfo wipInfo = new WipInfo(); - - public StockControlForm() - { - InitializeComponent(); - } - - private void Form1_Load(object sender, EventArgs e) - { - GetUnitSelect(); - - ArrayList mylist = new ArrayList(); - mylist.Add(new DictionaryEntry("A", "彩盒列印")); - mylist.Add(new DictionaryEntry("B", "外箱列印")); - comboBox1.DataSource = new BindingSource(mylist, null); - comboBox1.DisplayMember = "Value"; - comboBox1.ValueMember = "Key"; - - materialCheckedListBox1.Items.Add("CE", false); - materialCheckedListBox1.Items.Add("FCC", false); - materialCheckedListBox1.Items.Add("ROHS", false); - materialCheckedListBox1.Items.Add("UL", false); - } - - #region 下拉選單 - /// - /// 生產單位 - /// - private void GetUnitSelect() - { - var query = ApiHelper.GetMethod("api/FactoryUnits"); - if (query == "error" || query == "無法連線WebAPI") - { - MessageBox.Show(query); - return; - } - var result = JsonConvert.DeserializeObject>(query); - ArrayList myline = new ArrayList(); - foreach (var item in result) - { - myline.Add(new DictionaryEntry(item.UnitNo, item.UnitCode + "-" + item.UnitName)); - } - UnitSelect.DataSource = new BindingSource(myline, null); - UnitSelect.DisplayMember = "Value"; - UnitSelect.ValueMember = "Key"; - - GetLineSelect(); - } - - /// - /// 線別 - /// - private void GetLineSelect() - { - var query = ApiHelper.GetMethod($"api/LineInfoes/Unit/{UnitSelect.SelectedValue}"); - if (query == "error" || query == "無法連線WebAPI") - { - MessageBox.Show(query); - return; - } - var result = JsonConvert.DeserializeObject>(query); - ArrayList myline = new ArrayList(); - foreach (var item in result) - { - myline.Add(new DictionaryEntry(item.LineID, item.LineDesc)); - } - LineSelect.DataSource = new BindingSource(myline, null); - LineSelect.DisplayMember = "Value"; - LineSelect.ValueMember = "Key"; - } - - /// - /// 作業站 - /// - /// 流程ID - private void GetStationSelect(int FlowRuleID) - { - var query = ApiHelper.GetMethod($"api/RuleStations/Flow/{FlowRuleID}"); - if (query == "error" || query == "無法連線WebAPI") - { - MessageBox.Show(query); - return; - } - var result = JsonConvert.DeserializeObject>(query); - ArrayList myline = new ArrayList(); - foreach (var item in result) - { - myline.Add(new DictionaryEntry(item.station.StationID, item.station.StationName)); - } - StationSelect.DataSource = new BindingSource(myline, null); - StationSelect.DisplayMember = "Value"; - StationSelect.ValueMember = "Key"; - } - #endregion - - private void UnitSelect_SelectionChangeCommitted(object sender, EventArgs e) - { - GetLineSelect(); - } - - private void txtWipNo_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - if (string.IsNullOrWhiteSpace(txtWipNo.Text)) - { - MessageBox.Show("請輸入工單號碼", "錯誤訊息", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - - var query = ApiHelper.GetMethod($"api/WipInfos/WipInfoByWipNo/{txtWipNo.Text}"); - if (query == "error" || query == "無法連線WebAPI") - { - MessageBox.Show(query); - return; - } - - var wipInfos = JsonConvert.DeserializeObject>(query); - wipInfo = wipInfos.FirstOrDefault(w => w.UnitNO == UnitSelect.SelectedValue.ToString()); - if (wipInfo == null) - { - MessageBox.Show("找不到工單相關資訊", "錯誤訊息", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - - - GetStationSelect(wipInfos.FirstOrDefault().FlowRuleID); - - GetWipInfoData(wipInfos.FirstOrDefault()); - - GetBoxData(); - } - } - - private void BarCodeNo_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - var query_barCode = ApiHelper.GetMethod($"api/BarcodeInfoes/No/{BarCodeNo.Text}"); - if (query_barCode == "error" || query_barCode == "無法連線WebAPI") - { - MessageBox.Show(query_barCode); - return; - } - - var barcodeInfos = JsonConvert.DeserializeObject>(query_barCode).FirstOrDefault(); - - if (!string.IsNullOrWhiteSpace(barcodeInfos.BoxNo)) - { - MessageBox.Show($"內部序號【{BarCodeNo.Text}】已裝箱過"); - return; - } - - var query_Station = ApiHelper.GetMethod($"api/Stationses/{StationSelect.SelectedValue.ToString()}"); - if (query_Station == "error" || query_Station == "無法連線WebAPI") - { - MessageBox.Show(query_barCode); - return; - } - var station = JsonConvert.DeserializeObject>(query_Station).FirstOrDefault(); - if (station.TypeNo != "P") - { - MessageBox.Show("請選擇包裝相關作業站"); - return; - } - - var resultModel = BarCodeCheck(); - - if (!resultModel.Success) - { - MessageBox.Show(resultModel.Msg); - return; - } - - // 重新抓取BarCodeInfo - query_barCode = ApiHelper.GetMethod($"api/BarcodeInfoes/No/{BarCodeNo.Text}"); - barcodeInfos = JsonConvert.DeserializeObject>(query_barCode).FirstOrDefault(); - barcodeInfos.BoxNo = NowBoxNo.Text; - - var result = ApiHelper.PutMethod("api/BarcodeInfoes", JsonConvert.SerializeObject(barcodeInfos)); - - if (result) - { - SetWipBox(); - //MessageBox.Show("裝箱完成"); - BarCodeNo.Text = ""; - GetBoxData(); - } - else - { - MessageBox.Show("裝箱失敗"); - - } - } - } - - private void ExtraNo_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - var query_extraNo = ApiHelper.GetMethod($"api/BarcodeInfoes/ByExtraNo/{ExtraNo.Text}"); - if (query_extraNo == "error" || query_extraNo == "無法連線WebAPI") - { - MessageBox.Show(query_extraNo); - return; - } - - var barcodeInfos = JsonConvert.DeserializeObject>(query_extraNo).FirstOrDefault(); - - if (barcodeInfos == null) - { - MessageBox.Show($"找不到客戶序號【{ExtraNo.Text}】"); - return; - } - - if (barcodeInfos.WipID != wipInfo.WipID) - { - MessageBox.Show($"客戶序號【{ExtraNo.Text}】，不再這張【{txtWipNo.Text}】工單內"); - return; - } - - if (!string.IsNullOrWhiteSpace(barcodeInfos.BoxNo)) - { - MessageBox.Show($"客戶序號【{ExtraNo.Text}】已裝箱過"); - return; - } - - // 重新抓取BarCodeInfo - query_extraNo = ApiHelper.GetMethod($"api/BarcodeInfoes/ByExtraNo/{ExtraNo.Text}"); - barcodeInfos = JsonConvert.DeserializeObject>(query_extraNo).FirstOrDefault(); - barcodeInfos.BoxNo = NowBoxNo.Text; - - var result = ApiHelper.PutMethod("api/BarcodeInfoes", JsonConvert.SerializeObject(barcodeInfos)); - - if (result) - { - MessageBox.Show("裝箱完成"); - ExtraNo.Text = ""; - SetWipBox(); - GetBoxData(); - } - else - { - MessageBox.Show("裝箱失敗"); - } - } - } - - /// - /// 工單基本資料 - /// - /// - private void GetWipInfoData(WipInfo wipInfo) - { - WipNo.Text = wipInfo.WipNO; - ItemNo.Text = wipInfo.GetWipAtt.ItemNO; - CustomerNo.Text = wipInfo.CustomerNO; - - PlanQty.Text = wipInfo.PlanQTY.ToString(); - ModelNo.Text = wipInfo.GetWipAtt.ModelNO; - CustomerItemNo.Text = wipInfo.CustomerItemNO; - - BoxCnt.Text = wipInfo.BoxCNT.ToString(); - } - - private void GetBoxData() - { - int wipID = wipInfo.WipID; - var query_wipBox = ApiHelper.GetMethod($"api/WipBox/ByWipID/{wipID}"); - if (query_wipBox == "error" || query_wipBox == "無法連線WebAPI") - { - MessageBox.Show(query_wipBox); - return; - } - var wipBoxs = JsonConvert.DeserializeObject>(query_wipBox); - // 本箱數量 - BoxS.Text = wipBoxs.Count().ToString(); - // 當前箱號 - if (wipBoxs.Where(w => w.BoxStatus != 0).Count() == 0) - NowBoxNo.Text = "BOX" + WipNo.Text + "001"; - else - NowBoxNo.Text = wipBoxs.Where(w => w.BoxStatus != 0).FirstOrDefault().BoxNo; - - // 單箱數量 - var query_barCode = ApiHelper.GetMethod($"api/BarcodeInfoes/ByBoxNo/{NowBoxNo.Text}"); - if (query_barCode == "error" || query_barCode == "無法連線WebAPI") - { - MessageBox.Show(query_barCode); - return; - } - var barcodeInfos = JsonConvert.DeserializeObject>(query_barCode); - ByBox.Text = barcodeInfos.Count().ToString(); - } - - private void SetWipBox() - { - int wipID = wipInfo.WipID; - bool checkbox = false; - int boxQty = int.Parse(ByBox.Text) + 1; - - if (boxQty == int.Parse(BoxCnt.Text)) - checkbox = true; - - var wipBox = new WipBox - { - WipID = wipID, - BoxNo = NowBoxNo.Text, - BoxCnt = int.Parse(ByBox.Text) + 1, - BoxStatus = checkbox ? 0 : 1 - }; - - var query_wipBox = ApiHelper.GetMethod($"api/WipBox/{NowBoxNo.Text}"); - if (query_wipBox == "error" || query_wipBox == "無法連線WebAPI") - { - MessageBox.Show(query_wipBox); - return; - } - - var result_wipBox = JsonConvert.DeserializeObject(query_wipBox); - if (result_wipBox == null) - ApiHelper.PostInsertMethod("api/WipBox", JsonConvert.SerializeObject(wipBox)); - else - ApiHelper.PutMethod("api/WipBox", JsonConvert.SerializeObject(wipBox)); - - // 自動裝箱 - if (checkbox) - { - string BoxNoOrder = NowBoxNo.Text.Substring(NowBoxNo.Text.Length - 3, 3); - BoxNoOrder = (int.Parse(BoxNoOrder) + 1).ToString().PadLeft(3, '0'); - - NowBoxNo.Text = NowBoxNo.Text.Substring(0, NowBoxNo.Text.Length - 3) + BoxNoOrder; - wipBox.BoxNo = NowBoxNo.Text; - wipBox.BoxStatus = 1; - wipBox.BoxCnt = 0; - ApiHelper.PostInsertMethod("api/WipBox", JsonConvert.SerializeObject(wipBox)); - } - } - - private void ManualCloseBox_Click(object sender, EventArgs e) - { - if (ByBox.Text == "0") - { - MessageBox.Show("目前當前箱號裝箱數為0，無法關箱"); - return; - } - - var wipBox = new WipBox - { - WipID = wipInfo.WipID, - BoxNo = NowBoxNo.Text, - BoxCnt = int.Parse(ByBox.Text), - BoxStatus = 0 - }; - - var query_wipBox = ApiHelper.GetMethod($"api/WipBox/{NowBoxNo.Text}"); - if (query_wipBox == "error" || query_wipBox == "無法連線WebAPI") - { - MessageBox.Show(query_wipBox); - return; - } - - ApiHelper.PutMethod("api/WipBox", JsonConvert.SerializeObject(wipBox)); - - string BoxNoOrder = NowBoxNo.Text.Substring(NowBoxNo.Text.Length - 3, 3); - BoxNoOrder = (int.Parse(BoxNoOrder) + 1).ToString().PadLeft(3, '0'); - - NowBoxNo.Text = NowBoxNo.Text.Substring(0, NowBoxNo.Text.Length - 3) + BoxNoOrder; - wipBox.BoxNo = NowBoxNo.Text; - wipBox.BoxStatus = 1; - wipBox.BoxCnt = 0; - ApiHelper.PostInsertMethod("api/WipBox", JsonConvert.SerializeObject(wipBox)); - GetBoxData(); - } - - private ResultModel BarCodeCheck() - { - var x = new BarCodeCheckDto - { - wipNo = txtWipNo.Text, - barcode = BarCodeNo.Text, - barcodeType = "M", - station = int.Parse(StationSelect.SelectedValue.ToString()), - line = int.Parse(LineSelect.SelectedValue.ToString()), - unitNo = UnitSelect.SelectedValue.ToString() - }; - - var result = ApiHelper.PostMethod("api/BarCodeCheck/PassIngByCheck", JsonConvert.SerializeObject(x)); - - return JsonConvert.DeserializeObject(result); - } - - } -} diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache deleted file mode 100644 index 25096152..00000000 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/AMES_AP.csproj.AssemblyReference.cache and /dev/null differ diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 36b24cd7..00000000 Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ