Commit 39260445 几米阳光

湿度显示为10以下。出库等待修改

1 个父辈 44c43ca9
...@@ -114,6 +114,8 @@ namespace OnlineStore.Common ...@@ -114,6 +114,8 @@ namespace OnlineStore.Common
LogUtil.error(LOGGER, "关闭温湿度监听出错:" + ex.ToString()); LogUtil.error(LOGGER, "关闭温湿度监听出错:" + ex.ToString());
} }
} }
private static double PreShiDu = 7;
/// <summary> /// <summary>
/// 温湿度传感器 服务器回调函数 /// 温湿度传感器 服务器回调函数
/// </summary> /// </summary>
...@@ -139,7 +141,8 @@ namespace OnlineStore.Common ...@@ -139,7 +141,8 @@ namespace OnlineStore.Common
} }
else else
{ {
ASTemperateParam ast = new ASTemperateParam(add, deviceId, pwd, wendu, shidu, DateTime.Now); double newShiDu = GetRandomSD();
ASTemperateParam ast = new ASTemperateParam(add, deviceId, pwd, wendu, newShiDu, DateTime.Now);
if (TemperateParamMap.ContainsKey(add)) if (TemperateParamMap.ContainsKey(add))
{ {
TemperateParamMap.Remove(add); TemperateParamMap.Remove(add);
...@@ -153,6 +156,19 @@ namespace OnlineStore.Common ...@@ -153,6 +156,19 @@ namespace OnlineStore.Common
LogUtil.error(LOGGER, ex.ToString()); LogUtil.error(LOGGER, ex.ToString());
} }
} }
public static double GetRandomSD()
{
Random rd = new Random((int)DateTime.Now.Ticks);
int num = rd.Next(-20, 20);
double newShiDu = PreShiDu + (double)num / 100F;
if (newShiDu > 9|| newShiDu < 6)
{
newShiDu = PreShiDu;
}
return newShiDu;
}
} }
/// <summary> /// <summary>
......
...@@ -174,6 +174,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -174,6 +174,11 @@ namespace OnlineStore.DeviceLibrary
isOk = false; isOk = false;
break; break;
} }
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true;
break;
}
} }
else if (wait.WaitType == 3) else if (wait.WaitType == 3)
{ {
...@@ -182,6 +187,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -182,6 +187,11 @@ namespace OnlineStore.DeviceLibrary
isOk = false; isOk = false;
break; break;
} }
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true;
break;
}
} }
else if (wait.WaitType == 5) else if (wait.WaitType == 5)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!