Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7e5b7123 由 LN
选项

出库料串未放满送出问题修改

1 个父辈 f5e6ea05
内嵌 并排
正在显示 4 个修改的文件 包含 83 行增加 和 62 行删除
source/DeviceLibrary/manager/SServerManager.cs
......@@ -648,66 +648,68 @@ namespace OnlineStore.DeviceLibrary
public static ShelfTaskInfo ShelfFinish(string rfid, string barcode = "", string rfidLoc = "0", string robotIndex = "1")
{
LogUtil.info($"ShelfFinish rifd【{rfid}】barcode【{barcode}】rfidLoc【{rfidLoc}】robotIndex【{robotIndex}】");
ShelfTaskInfo task = new ShelfTaskInfo();
task.rfid = rfid;
return task;
// DateTime startTime = DateTime.Now;
// try
// {
// string api = Addr_ShelfFinish;
// Dictionary<string, string> paramMap = new Dictionary<string, string>();
// paramMap.Add("barcode", barcode);
// paramMap.Add("rfid", rfid);
// paramMap.Add("rfidLoc", rfidLoc);
// paramMap.Add("robotIndex", robotIndex);
// //string url = httpAddr + api + "?barcode=" + barcode + "&rfid=" + rfid + "&rfidLoc=" + rfidLoc + "&robotIndex=" + robotIndex;
// string url = GetAddr(api, paramMap);
// LogUtil.debug("http :URL:" + url);
// string json = HttpHelper.Post(url, "", 10000);
// if (barcode != "")
// {
// LogUtil.info("http :URL:" + url + " :Response:" + json + " 耗时[" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "]");
// }
// else
// {
// LogUtil.debug("http :URL:" + url + " :Response:" + json);
// }
// if (string.IsNullOrWhiteSpace(json)) return task;
// //行 2234: [2021 - 04 - 07 15:09:31,412][9]INFO - http :URL:
// //http://192.168.100.14/myproject/rest/api/qisda/device/putShelfFinished?barcode=640253A*34005600000309*QG00006*5000*23C4&rfid=F103&rfidLoc=8&robotIndex=1 :
// //Response:{"code":0,"msg":"ok","data":{"smallTask":"0","cutPackageTask":"0","packageTask":"0","bigTask":"0","smallEmpty":"0","bigEmpty":"5","packageEmpty":"0","rfid":"F103","usedRfidList":"F106,F105,F103","barcode":"640253A*34005600000309*QG00006*5000*23C4","cutTask":"0"}} 耗时[00:00:00.1]
// JavaScriptSerializer serializer = new JavaScriptSerializer();
// Dictionary<string, object> obj = (Dictionary<string, object>)serializer.DeserializeObject(json);
// if (!obj.TryGetValue("code", out object value)) return task;
// if (value.ToString() != "0")
// {
// if (obj.TryGetValue("msg", out value))
// LogUtil.error("http" + api + ": " + value.ToString());
// return task;
// }
// if (!obj.TryGetValue("data", out value)) return task;
// Dictionary<string, object> dict = (Dictionary<string, object>)value;
// if (dict == null)
// {
// LogUtil.info("http" + api + ": data=null");
// return task;
// }
DateTime startTime = DateTime.Now;
try
{
string api = Addr_ShelfFinish;
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode);
paramMap.Add("rfid", rfid);
paramMap.Add("rfidLoc", rfidLoc);
paramMap.Add("robotIndex", robotIndex);
//string url = httpAddr + api + "?barcode=" + barcode + "&rfid=" + rfid + "&rfidLoc=" + rfidLoc + "&robotIndex=" + robotIndex;
string url = GetAddr(api, paramMap);
LogUtil.debug("http :URL:" + url);
string json = HttpHelper.Post(url, "", 10000);
if (barcode != "")
{
LogUtil.info("http :URL:" + url + " :Response:" + json + " 耗时[" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "]");
}
else
{
LogUtil.debug("http :URL:" + url + " :Response:" + json);
}
if (string.IsNullOrWhiteSpace(json)) return task;
//行 2234: [2021 - 04 - 07 15:09:31,412][9]INFO - http :URL:
//http://192.168.100.14/myproject/rest/api/qisda/device/putShelfFinished?barcode=640253A*34005600000309*QG00006*5000*23C4&rfid=F103&rfidLoc=8&robotIndex=1 :
//Response:{"code":0,"msg":"ok","data":{"smallTask":"0","cutPackageTask":"0","packageTask":"0","bigTask":"0","smallEmpty":"0","bigEmpty":"5","packageEmpty":"0","rfid":"F103","usedRfidList":"F106,F105,F103","barcode":"640253A*34005600000309*QG00006*5000*23C4","cutTask":"0"}} 耗时[00:00:00.1]
JavaScriptSerializer serializer = new JavaScriptSerializer();
Dictionary<string, object> obj = (Dictionary<string, object>)serializer.DeserializeObject(json);
if (!obj.TryGetValue("code", out object value)) return task;
if (value.ToString() != "0")
{
if (obj.TryGetValue("msg", out value))
LogUtil.error("http" + api + ": " + value.ToString());
return task;
}
if (!obj.TryGetValue("data", out value)) return task;
Dictionary<string, object> dict = (Dictionary<string, object>)value;
if (dict == null)
{
LogUtil.info("http" + api + ": data=null");
return task;
}
if (dict.TryGetValue("bigEmpty", out value))
int.TryParse(value.ToString(), out task.bigEmpty);
if (dict.TryGetValue("smallEmpty", out value))
int.TryParse(value.ToString(), out task.smallEmpty);
// if (dict.TryGetValue("bigEmpty", out value))
// int.TryParse(value.ToString(), out task.bigEmpty);
// if (dict.TryGetValue("smallEmpty", out value))
// int.TryParse(value.ToString(), out task.smallEmpty);
if (dict.TryGetValue("usedRfidList", out value))
task.usedRfidList = value.ToString();
}
catch (Exception ex)
{
LogUtil.error("http error : " + ex.ToString());
}
return task;
// if (dict.TryGetValue("usedRfidList", out value))
// task.usedRfidList = value.ToString();
// }
// catch (Exception ex)
// {
// LogUtil.error("http error : " + ex.ToString());
// }
// return task;
}
}
public class ShelfTaskInfo
......
source/DeviceLibrary/manager/model/DeviceStep.cs
......@@ -1184,10 +1184,14 @@ namespace OnlineStore.DeviceLibrary
/// 否则直接到IS11_ShelfReady
/// </summary>
IS14_ReelOK,
/// <summary>
/// 料串出库：如果当前位置<=P1,缓慢上升判断料串是否满，若已经满了，直接离开.
/// </summary>
IS15_AxisUpMove,
/// <summary>
/// 如果放料结束检测到料盘信号亮，需要等1500再次判断，防止误判断
/// </summary>
IS15_CheckShelfNeedLeave,
///// <summary>
///// 料串出库：如果当前位置<=P1,缓慢上升判断料串是否满，若已经满了，直接离开.
///// </summary>
//IS15_AxisUpMove,
/// <summary>
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
......@@ -566,6 +566,10 @@ namespace OnlineStore.DeviceLibrary
{
}
else if (MoveInfo.IsStep(StepEnum.IS15_CheckShelfNeedLeave))
{
CheckShelfIsFull();
}
#region 送料串离开
......@@ -651,7 +655,18 @@ namespace OnlineStore.DeviceLibrary
{
if (Robot.IOValue(Config.IO_ReelCheck).Equals(IO_VALUE.HIGH))
{
SendOutShelfLeave("料串出满需离开(信号到位)");
//IS14_ReelOK
//如果是刚刚放料结束的判断，需要等1500再次判断
if (MoveInfo.IsStep(StepEnum.IS14_ReelOK))
{
MoveInfo.NextMoveStep(StepEnum.IS15_CheckShelfNeedLeave);
WorkLog($"出库{MoveInfo.SLog} 放料完成，检测到料串出满需离开(信号到位)，等待1500后再次判断");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
}
else
{
SendOutShelfLeave("料串出满需离开(信号到位)");
}
}
else if (MoveInfo.IsStep(StepEnum.IB07_AxisUpMove))
{
......
source/XLRStoreClient/App.config
......@@ -8,7 +8,7 @@
<add key="App_AutoRun" value="0" />
<add key="App_Title" value="智能存储仓客户端" />
<!--Server address-->
<add key="http.server" value="http://192.168.100.14/myproject/" />
<add key="http.server" value="http://192.168.1.123:8800/" />
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
<add key="StartBlowValue" value="4" />
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!