Commit 09c2146a LN

料架属于空位展示修改

1 个父辈 45422c2b
...@@ -769,7 +769,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -769,7 +769,7 @@ namespace OnlineStore.DeviceLibrary
CheckAxisAlarm(); CheckAxisAlarm();
ShowTimeLog("轴报警检测完成"); ShowTimeLog("轴报警检测完成");
} }
ShelfEmptyProcess();
foreach (WorkStation shelf in StationMap.Values) foreach (WorkStation shelf in StationMap.Values)
{ {
shelf.TimerProcess(); shelf.TimerProcess();
......
...@@ -41,7 +41,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -41,7 +41,7 @@ namespace OnlineStore.DeviceLibrary
string json = HttpHelper.Post(url, "", 2000); string json = HttpHelper.Post(url, "", 2000);
if (rfids != "") if (rfids != "")
{ {
LogUtil.info("http :URL:" + url + " :Response:" + json + " 耗时[" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "]"); LogUtil.debug("http :URL:" + url + " :Response:" + json + " 耗时[" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "]");
} }
else else
{ {
...@@ -52,13 +52,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -52,13 +52,14 @@ namespace OnlineStore.DeviceLibrary
return map; return map;
} }
ResultData result = JsonHelper.DeserializeJsonToObject<ResultData>(json); RFIDResultData result = JsonHelper.DeserializeJsonToObject<RFIDResultData>(json);
if (result.code >= 0 || (!String.IsNullOrEmpty(result.msg))){ if (result.code > 0||result.data==null)
{
LogUtil.error("getShelfEmptySlot,rfids[" + rfids + "]结果:code=" + result.code + ",msg=" + result.msg); LogUtil.error("getShelfEmptySlot,rfids[" + rfids + "]结果:code=" + result.code + ",msg=" + result.msg);
} }
else else
{ {
map = (Dictionary<string, int>)(result.data); map = result.data;
return map; return map;
} }
} }
...@@ -354,6 +355,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,6 +355,14 @@ namespace OnlineStore.DeviceLibrary
public object data { get; set; } public object data { get; set; }
} }
public class RFIDResultData
{
public int code { get; set; }
public string msg { get; set; }
public Dictionary<string,int> data { get; set; }
}
//public class ResultData //public class ResultData
//{ //{
// //{"code":0,"msg":"ok","data":"7"} // //{"code":0,"msg":"ok","data":"7"}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!