修改判断
This commit is contained in:
parent
6af007ff48
commit
a8d2a3cabb
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -400,7 +400,7 @@ namespace Security
|
||||||
model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
|
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 != 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);
|
bll.AddDate(model, date);
|
||||||
}
|
}
|
||||||
|
@ -525,7 +525,7 @@ namespace Security
|
||||||
//model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
|
//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 != 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);
|
bll.AddDate(model, date);
|
||||||
}
|
}
|
||||||
|
@ -648,7 +648,7 @@ namespace Security
|
||||||
//model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
|
//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 != 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);
|
bll.AddDate(model, date);
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||||
</dsig:Transforms>
|
</dsig:Transforms>
|
||||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||||
<dsig:DigestValue>FhAqT3DQLB5eUhO8vSU8c8B89nPUd9NzovVV9qHE/gA=</dsig:DigestValue>
|
<dsig:DigestValue>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
|
||||||
</hash>
|
</hash>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Binary file not shown.
|
@ -145,7 +145,7 @@
|
||||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||||
</dsig:Transforms>
|
</dsig:Transforms>
|
||||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||||
<dsig:DigestValue>RIJqbeEb7CpQbuG1+q2xRLUM8AWaC2+EjR+n9dMV68M=</dsig:DigestValue>
|
<dsig:DigestValue>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
|
||||||
</hash>
|
</hash>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -14,7 +14,7 @@
|
||||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||||
</dsig:Transforms>
|
</dsig:Transforms>
|
||||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||||
<dsig:DigestValue>FhAqT3DQLB5eUhO8vSU8c8B89nPUd9NzovVV9qHE/gA=</dsig:DigestValue>
|
<dsig:DigestValue>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
|
||||||
</hash>
|
</hash>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Binary file not shown.
|
@ -145,7 +145,7 @@
|
||||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||||
</dsig:Transforms>
|
</dsig:Transforms>
|
||||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||||
<dsig:DigestValue>RIJqbeEb7CpQbuG1+q2xRLUM8AWaC2+EjR+n9dMV68M=</dsig:DigestValue>
|
<dsig:DigestValue>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
|
||||||
</hash>
|
</hash>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue