diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/e07a7c5d-ddc0-49c0-8521-5f28b3154d4a.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/e07a7c5d-ddc0-49c0-8521-5f28b3154d4a.vsidx new file mode 100644 index 0000000..a6d39b7 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/e07a7c5d-ddc0-49c0-8521-5f28b3154d4a.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5ceaec75-0e27-4a88-b112-406c8ea477a0.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ea21d3bf-2261-4fbe-95f5-cdc01c007451.vsidx similarity index 97% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/5ceaec75-0e27-4a88-b112-406c8ea477a0.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/ea21d3bf-2261-4fbe-95f5-cdc01c007451.vsidx index e5a88e7..1c47efa 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5ceaec75-0e27-4a88-b112-406c8ea477a0.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ea21d3bf-2261-4fbe-95f5-cdc01c007451.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index ba4f745..afedbcb 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs index cc09fd7..bd0116f 100644 --- a/Security/ServiceSecurity.cs +++ b/Security/ServiceSecurity.cs @@ -400,7 +400,7 @@ namespace Security model.Reserve2 = GetDeviceName4(Convert.ToInt32(name)); if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null) { - if (model.EH > 0 && model.Ua > 0 && model.Ub > 0 && model.Uc > 0 && model.Ia > 0 && model.Ib > 0 && model.Ic > 0 && model.P > 0 && model.Kvar > 0) + if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0) { bll.AddDate(model, date); } @@ -525,7 +525,7 @@ namespace Security //model.Reserve2 = GetDeviceName4(Convert.ToInt32(name)); if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null) { - if (model.EH > 0 && model.Ua > 0 && model.Ub > 0 && model.Uc > 0 && model.Ia > 0 && model.Ib > 0 && model.Ic > 0 && model.P > 0 && model.Kvar > 0) + if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0) { bll.AddDate(model, date); } @@ -648,7 +648,7 @@ namespace Security //model.Reserve2 = GetDeviceName4(Convert.ToInt32(name)); if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null) { - if (model.EH > 0 && model.Ua > 0 && model.Ub > 0 && model.Uc > 0 && model.Ia > 0 && model.Ib > 0 && model.Ic > 0 && model.P > 0 && model.Kvar > 0) + if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0) { bll.AddDate(model, date); } diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index 065b17d..9703841 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - FhAqT3DQLB5eUhO8vSU8c8B89nPUd9NzovVV9qHE/gA= + 5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ= diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe index 5120f94..dbfddfc 100644 Binary files a/Security/bin/Debug/ServiceSecurity.exe and b/Security/bin/Debug/ServiceSecurity.exe differ diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest index 4f822eb..2b49d21 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -145,7 +145,7 @@ - RIJqbeEb7CpQbuG1+q2xRLUM8AWaC2+EjR+n9dMV68M= + Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw= diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb index 27b0df1..585c2f8 100644 Binary files a/Security/bin/Debug/ServiceSecurity.pdb and b/Security/bin/Debug/ServiceSecurity.pdb differ diff --git a/Security/bin/Debug/app.publish/ServiceSecurity.exe b/Security/bin/Debug/app.publish/ServiceSecurity.exe index 06db5b8..faeffe7 100644 Binary files a/Security/bin/Debug/app.publish/ServiceSecurity.exe and b/Security/bin/Debug/app.publish/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application index 065b17d..9703841 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - FhAqT3DQLB5eUhO8vSU8c8B89nPUd9NzovVV9qHE/gA= + 5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ= diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe index 5120f94..dbfddfc 100644 Binary files a/Security/obj/Debug/ServiceSecurity.exe and b/Security/obj/Debug/ServiceSecurity.exe differ diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest index 4f822eb..2b49d21 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -145,7 +145,7 @@ - RIJqbeEb7CpQbuG1+q2xRLUM8AWaC2+EjR+n9dMV68M= + Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw= diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb index 27b0df1..585c2f8 100644 Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ