diff --git a/AMESCoreStudio.Web/Models/LoginViewModel.cs b/AMESCoreStudio.Web/Models/LoginViewModel.cs
index fd50af81..f4a96152 100644
--- a/AMESCoreStudio.Web/Models/LoginViewModel.cs
+++ b/AMESCoreStudio.Web/Models/LoginViewModel.cs
@@ -12,8 +12,8 @@ namespace AMESCoreStudio.Web
public class LoginViewModel
{
[Required]
- public string LoginNo { get; set; }
+ public string LoginNo { get; set; } = "admin";
[Required]
- public string LoginPassword { get; set; }
+ public string LoginPassword { get; set; } = "admin";
}
}
diff --git a/AMESCoreStudio.Web/ViewModels/PCS/PCS014ViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/PCS014ViewModel.cs
new file mode 100644
index 00000000..6757e744
--- /dev/null
+++ b/AMESCoreStudio.Web/ViewModels/PCS/PCS014ViewModel.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
+using System.ComponentModel.DataAnnotations;
+
+namespace AMESCoreStudio.Web.ViewModels.PCS
+{
+ public class PCS014ViewModel
+ {
+ ///
+ /// 內部條碼
+ ///
+ public string BarCodeNo { get; set; }
+
+ ///
+ /// 工單號碼
+ ///
+ public string WipNo { get; set; }
+
+ ///
+ /// 鎖定條碼區間起
+ ///
+ public string BarCodeNoStr { get; set; }
+
+ ///
+ /// 鎖定條碼區間迄
+ ///
+ public string BarCodeNoEnd { get; set; }
+
+ ///
+ /// 解鎖原因
+ ///
+ [Required(ErrorMessage = "{0},不能空白")]
+ [Display(Name = "解鎖原因")]
+ public string UnLockReason { 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 0df535e3..31e27974 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 33cb2e67..fe281926 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 03414b53..b53353a5 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json
@@ -772,15 +772,15 @@
"lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {}
}
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"dependencies": {
"Microsoft.Data.SqlClient": "1.1.3",
"Microsoft.EntityFrameworkCore.Relational": "5.0.1"
},
"runtime": {
"lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {
- "assemblyVersion": "3.1.18.0",
- "fileVersion": "3.100.1821.36403"
+ "assemblyVersion": "3.1.21.0",
+ "fileVersion": "3.100.2121.52203"
}
},
"compile": {
@@ -2561,7 +2561,7 @@
"AMESCoreStudio.CommonTools": "1.0.0",
"Microsoft.EntityFrameworkCore": "5.0.8",
"Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
- "Microsoft.EntityFrameworkCore.SqlServer": "3.1.18",
+ "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21",
"Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5",
"Oracle.EntityFrameworkCore": "5.21.1",
"Swashbuckle.AspNetCore": "6.1.4"
@@ -4349,12 +4349,12 @@
"path": "microsoft.entityframeworkcore.relational/5.0.1",
"hashPath": "microsoft.entityframeworkcore.relational.5.0.1.nupkg.sha512"
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-aosMK6DM1WgE/MVmzgDYwmf4ach8z7WCS6sOJF/s6Dvg77R2zBc7NeIyhbK97Eq8oVv77VrpY0CBKeIw5VMayg==",
- "path": "microsoft.entityframeworkcore.sqlserver/3.1.18",
- "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.18.nupkg.sha512"
+ "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==",
+ "path": "microsoft.entityframeworkcore.sqlserver/3.1.21",
+ "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.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 c818f923..ae3f85ad 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 4d9bdef4..d2f2f6bb 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 46955df7..2e299818 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.Web.runtimeconfig.dev.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json
index 2d16c522..2e393e8b 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.runtimeconfig.dev.json
@@ -1,8 +1,9 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
- "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
- "C:\\Users\\USER\\.nuget\\packages"
+ "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
+ "C:\\Users\\RayLin\\.nuget\\packages",
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
]
}
}
\ No newline at end of file
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 f56a9a67..9e28cab1 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 81f79226..3eb2e492 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 0d396387..3da37dc2 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json
@@ -35,8 +35,8 @@
"Microsoft.EntityFrameworkCore": "5.0.8",
"Microsoft.EntityFrameworkCore.Design": "5.0.8",
"Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
- "Microsoft.EntityFrameworkCore.SqlServer": "3.1.18",
- "Microsoft.EntityFrameworkCore.Tools": "3.1.18",
+ "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21",
+ "Microsoft.EntityFrameworkCore.Tools": "3.1.21",
"Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5",
"Oracle.EntityFrameworkCore": "5.21.1",
"Swashbuckle.AspNetCore": "6.1.4",
@@ -734,22 +734,22 @@
"lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {}
}
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"dependencies": {
"Microsoft.Data.SqlClient": "1.1.3",
"Microsoft.EntityFrameworkCore.Relational": "5.0.8"
},
"runtime": {
"lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {
- "assemblyVersion": "3.1.18.0",
- "fileVersion": "3.100.1821.36403"
+ "assemblyVersion": "3.1.21.0",
+ "fileVersion": "3.100.2121.52203"
}
},
"compile": {
"lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {}
}
},
- "Microsoft.EntityFrameworkCore.Tools/3.1.18": {
+ "Microsoft.EntityFrameworkCore.Tools/3.1.21": {
"dependencies": {
"Microsoft.EntityFrameworkCore.Design": "5.0.8"
}
@@ -4214,19 +4214,19 @@
"path": "microsoft.entityframeworkcore.relational/5.0.8",
"hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512"
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-aosMK6DM1WgE/MVmzgDYwmf4ach8z7WCS6sOJF/s6Dvg77R2zBc7NeIyhbK97Eq8oVv77VrpY0CBKeIw5VMayg==",
- "path": "microsoft.entityframeworkcore.sqlserver/3.1.18",
- "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.18.nupkg.sha512"
+ "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==",
+ "path": "microsoft.entityframeworkcore.sqlserver/3.1.21",
+ "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.nupkg.sha512"
},
- "Microsoft.EntityFrameworkCore.Tools/3.1.18": {
+ "Microsoft.EntityFrameworkCore.Tools/3.1.21": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-71hmcLZqr8o/ZjhwXs8b9OMK4pqPOFfeo6Sdr4aLYlc9Jtfnf+i7gC8Lc9d3Lnh5gy5Ow92JIg7c9MQpPCZXmQ==",
- "path": "microsoft.entityframeworkcore.tools/3.1.18",
- "hashPath": "microsoft.entityframeworkcore.tools.3.1.18.nupkg.sha512"
+ "sha512": "sha512-GlIzvL1+E562ReIVk3S9T5Phh723FYGz7oNFFdV0IFpD3uKZNzRFkGSukQxZAKgYtTzaL6HM7mt/OUXfzdHG0g==",
+ "path": "microsoft.entityframeworkcore.tools/3.1.21",
+ "hashPath": "microsoft.entityframeworkcore.tools.3.1.21.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 cef2726f..011d7ba1 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 76055799..f79e2f39 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 29fc7899..c7d58340 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.runtimeconfig.dev.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
index 2d16c522..2e393e8b 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
@@ -1,8 +1,9 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
- "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
- "C:\\Users\\USER\\.nuget\\packages"
+ "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
+ "C:\\Users\\RayLin\\.nuget\\packages",
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
]
}
}
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index 56e1a327..02b38d58 100644
--- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -122,7 +122,7 @@
用工單號碼获取该條碼资料
- 工單號碼
+ 工單號碼
@@ -4433,6 +4433,14 @@
+
+
+ 複製流程資料
+
+
+
+
+
刪除流程資料
@@ -4758,7 +4766,7 @@
-
+
刪除流程規則資料
@@ -12786,6 +12794,11 @@
料號
+
+
+ POWER_MODE_TYPE
+
+
PLM出貨P_M設定
@@ -12811,6 +12824,16 @@
燒機備註
+
+
+ BIOS_Type
+
+
+
+
+ BIOS
+
+
BIOS版本
@@ -12836,26 +12859,51 @@
是否為精包裝Y/N
+
+
+ EC_Type
+
+
EC
+
+
+ FW_Type
+
+
Firewall
+
+
+ EC_Type
+
+
Firewall 1
+
+
+ FW2_Type
+
+
Firewall 2
+
+
+ OS_Type
+
+
OS版本
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 fefacefd..2b881a55 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 904ffb97..921fc9ac 100644
--- a/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj
+++ b/AMESCoreStudio.WebApi/AMESCoreStudio.WebApi.csproj
@@ -39,8 +39,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -53,5 +53,9 @@
+
+
+
+
diff --git a/AMESCoreStudio.WebApi/DTO/LoginDTO.cs b/AMESCoreStudio.WebApi/DTO/LoginDTO.cs
index f890d200..a9281a90 100644
--- a/AMESCoreStudio.WebApi/DTO/LoginDTO.cs
+++ b/AMESCoreStudio.WebApi/DTO/LoginDTO.cs
@@ -19,13 +19,13 @@ namespace AMESCoreStudio.WebApi
/// 用户名
///
[Required(ErrorMessage = "请输入用户名")]
- public string LoginNo { get; set; }
+ public string LoginNo { get; set; } = "admin";
///
/// 密码
///
[Required(ErrorMessage = "请输入密码")]
- public string LoginPassword { get; set; }
+ public string LoginPassword { get; set; } = "admin";
///
/// 平台
diff --git a/AMESCoreStudio.WebApi/appsettings.json b/AMESCoreStudio.WebApi/appsettings.json
index 62ab68b4..cf453c88 100644
--- a/AMESCoreStudio.WebApi/appsettings.json
+++ b/AMESCoreStudio.WebApi/appsettings.json
@@ -7,8 +7,8 @@
}
},
"ConnectionStrings": {
- "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));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;"
+ "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;",
+ "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
//"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
},
"AllowedHosts": "*"
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 f56a9a67..9e28cab1 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 81f79226..3eb2e492 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 0d396387..3da37dc2 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json
@@ -35,8 +35,8 @@
"Microsoft.EntityFrameworkCore": "5.0.8",
"Microsoft.EntityFrameworkCore.Design": "5.0.8",
"Microsoft.EntityFrameworkCore.Proxies": "5.0.8",
- "Microsoft.EntityFrameworkCore.SqlServer": "3.1.18",
- "Microsoft.EntityFrameworkCore.Tools": "3.1.18",
+ "Microsoft.EntityFrameworkCore.SqlServer": "3.1.21",
+ "Microsoft.EntityFrameworkCore.Tools": "3.1.21",
"Microsoft.VisualStudio.Web.CodeGeneration.Design": "3.1.5",
"Oracle.EntityFrameworkCore": "5.21.1",
"Swashbuckle.AspNetCore": "6.1.4",
@@ -734,22 +734,22 @@
"lib/netstandard2.1/Microsoft.EntityFrameworkCore.Relational.dll": {}
}
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"dependencies": {
"Microsoft.Data.SqlClient": "1.1.3",
"Microsoft.EntityFrameworkCore.Relational": "5.0.8"
},
"runtime": {
"lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {
- "assemblyVersion": "3.1.18.0",
- "fileVersion": "3.100.1821.36403"
+ "assemblyVersion": "3.1.21.0",
+ "fileVersion": "3.100.2121.52203"
}
},
"compile": {
"lib/netstandard2.0/Microsoft.EntityFrameworkCore.SqlServer.dll": {}
}
},
- "Microsoft.EntityFrameworkCore.Tools/3.1.18": {
+ "Microsoft.EntityFrameworkCore.Tools/3.1.21": {
"dependencies": {
"Microsoft.EntityFrameworkCore.Design": "5.0.8"
}
@@ -4214,19 +4214,19 @@
"path": "microsoft.entityframeworkcore.relational/5.0.8",
"hashPath": "microsoft.entityframeworkcore.relational.5.0.8.nupkg.sha512"
},
- "Microsoft.EntityFrameworkCore.SqlServer/3.1.18": {
+ "Microsoft.EntityFrameworkCore.SqlServer/3.1.21": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-aosMK6DM1WgE/MVmzgDYwmf4ach8z7WCS6sOJF/s6Dvg77R2zBc7NeIyhbK97Eq8oVv77VrpY0CBKeIw5VMayg==",
- "path": "microsoft.entityframeworkcore.sqlserver/3.1.18",
- "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.18.nupkg.sha512"
+ "sha512": "sha512-wq3oji8nAQBUuRizaxVgpdy0lJn+BUgrLNZtlKtAbny5emZJARVoQUJW1JuxIizcQzSGmwJ61CPAIE1nxTmZ4A==",
+ "path": "microsoft.entityframeworkcore.sqlserver/3.1.21",
+ "hashPath": "microsoft.entityframeworkcore.sqlserver.3.1.21.nupkg.sha512"
},
- "Microsoft.EntityFrameworkCore.Tools/3.1.18": {
+ "Microsoft.EntityFrameworkCore.Tools/3.1.21": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-71hmcLZqr8o/ZjhwXs8b9OMK4pqPOFfeo6Sdr4aLYlc9Jtfnf+i7gC8Lc9d3Lnh5gy5Ow92JIg7c9MQpPCZXmQ==",
- "path": "microsoft.entityframeworkcore.tools/3.1.18",
- "hashPath": "microsoft.entityframeworkcore.tools.3.1.18.nupkg.sha512"
+ "sha512": "sha512-GlIzvL1+E562ReIVk3S9T5Phh723FYGz7oNFFdV0IFpD3uKZNzRFkGSukQxZAKgYtTzaL6HM7mt/OUXfzdHG0g==",
+ "path": "microsoft.entityframeworkcore.tools/3.1.21",
+ "hashPath": "microsoft.entityframeworkcore.tools.3.1.21.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 cef2726f..011d7ba1 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 76055799..f79e2f39 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 29fc7899..c7d58340 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.runtimeconfig.dev.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
index 2d16c522..2e393e8b 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.runtimeconfig.dev.json
@@ -1,8 +1,9 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
- "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
- "C:\\Users\\USER\\.nuget\\packages"
+ "C:\\Users\\RayLin\\.dotnet\\store\\|arch|\\|tfm|",
+ "C:\\Users\\RayLin\\.nuget\\packages",
+ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
]
}
}
\ No newline at end of file
diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
index 56e1a327..02b38d58 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
@@ -122,7 +122,7 @@
用工單號碼获取该條碼资料
- 工單號碼
+ 工單號碼
@@ -4433,6 +4433,14 @@
+
+
+ 複製流程資料
+
+
+
+
+
刪除流程資料
@@ -4758,7 +4766,7 @@
-
+
刪除流程規則資料
@@ -12786,6 +12794,11 @@
料號
+
+
+ POWER_MODE_TYPE
+
+
PLM出貨P_M設定
@@ -12811,6 +12824,16 @@
燒機備註
+
+
+ BIOS_Type
+
+
+
+
+ BIOS
+
+
BIOS版本
@@ -12836,26 +12859,51 @@
是否為精包裝Y/N
+
+
+ EC_Type
+
+
EC
+
+
+ FW_Type
+
+
Firewall
+
+
+ EC_Type
+
+
Firewall 1
+
+
+ FW2_Type
+
+
Firewall 2
+
+
+ OS_Type
+
+
OS版本
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 fefacefd..2b881a55 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 62ab68b4..cf453c88 100644
--- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json
+++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json
@@ -7,8 +7,8 @@
}
},
"ConnectionStrings": {
- "AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));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;"
+ "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1522))(CONNECT_DATA=(SERVICE_NAME=xe)));User Id=JHAMES;Password=AMES666;",
+ "AMESContext1": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
//"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
},
"AllowedHosts": "*"
diff --git a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo
index f1d29303..6e16a32a 100644
Binary files a/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo and b/其他專案資料/AMES_AP/.vs/AMES_AP/v16/.suo differ
diff --git a/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj b/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
index 5dbad29c..c454203f 100644
--- a/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
+++ b/其他專案資料/AMES_AP/AMES_AP/AMES_AP.csproj
@@ -77,12 +77,14 @@
Login.cs
+
+
diff --git a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b090d2b6..34d9d250 100644
Binary files a/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/其他專案資料/AMES_AP/AMES_AP/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ