Skip to content

孙克 / RC1250-AssemblyLine

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

增加取消任务接口调用

1 个父辈 e9880b04
内嵌 并排
正在显示 2 个修改的文件 包含 47 行增加 和 8 行删除
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -514,9 +514,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -514,9 +514,12 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除"); LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，不拦截托盘，更新此托盘为NG，从waitInStoreList中删除，取消入库任务");
TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败"); TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
waitInStoreList.RemoveAt(reIndex); waitInStoreList.RemoveAt(reIndex);
Task.Factory.StartNew(delegate {
SServerManager.cancelPutInTask(Name, currCode.WareCode);
});
return false; return false;
} }
......
source/DeviceLibrary/assemblymanager/SServerManager.cs
...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
outSize = 0; outSize = 0;
string msg = ""; string msg = "";
try try
{ {
if (String.IsNullOrEmpty(codeStr)) if (String.IsNullOrEmpty(codeStr))
{ {
return msg = deviceName + "未扫到条码"; return msg = deviceName + "未扫到条码";
...@@ -259,7 +259,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -259,7 +259,7 @@ namespace OnlineStore.DeviceLibrary
} }
return msg; return msg;
} }
private static string Addr_clearPutInRfid = "/service/store/qisda/clearPutInRfid"; private static string Addr_clearPutInRfid = "/service/store/qisda/clearPutInRfid";
public static string clearPutInRfid(string deviceName, string rfid) public static string clearPutInRfid(string deviceName, string rfid)
{ {
...@@ -347,10 +347,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -347,10 +347,10 @@ namespace OnlineStore.DeviceLibrary
string resultStr = HttpHelper.Post(server, ""); string resultStr = HttpHelper.Post(server, "");
if (barcode != "") if (barcode != "")
{ {
LogUtil.info(deviceName+ "afterPutCut " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】"); LogUtil.info(deviceName + "afterPutCut " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
} }
else else
{ {
LogUtil.debug(deviceName + "afterPutCut " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】"); LogUtil.debug(deviceName + "afterPutCut " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
} }
//> 返回: //> 返回:
...@@ -383,7 +383,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -383,7 +383,7 @@ namespace OnlineStore.DeviceLibrary
return msg; return msg;
} }
// 分盘料/紧急料启动时获取料架的虚拟RFID调用 地址: /rest/api/qisda/device/findTempRfid // 分盘料/紧急料启动时获取料架的虚拟RFID调用 地址: /rest/api/qisda/device/findTempRfid
private static string Addr_findTempRfid = "/rest/api/qisda/device/findTempRfid"; private static string Addr_findTempRfid = "/rest/api/qisda/device/findTempRfid";
public static string findTempRfid(string deviceName, string rfid, out string tempRfid) public static string findTempRfid(string deviceName, string rfid, out string tempRfid)
...@@ -404,7 +404,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -404,7 +404,7 @@ namespace OnlineStore.DeviceLibrary
string server = GetAddr(Addr_findTempRfid, paramMap); string server = GetAddr(Addr_findTempRfid, paramMap);
DateTime startTime = DateTime.Now; DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, ""); string resultStr = HttpHelper.Post(server, "");
LogUtil.info("findTempRfid " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】"); LogUtil.info(deviceName + "findTempRfid " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr); RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr);
...@@ -418,7 +418,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -418,7 +418,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (data.data != null && data.data.ContainsKey("tempRfid")) if (data.data != null && data.data.ContainsKey("tempRfid"))
{ {
tempRfid= data.data["tempRfid"]; tempRfid = data.data["tempRfid"];
} }
return ""; return "";
} }
...@@ -429,6 +429,42 @@ namespace OnlineStore.DeviceLibrary ...@@ -429,6 +429,42 @@ namespace OnlineStore.DeviceLibrary
return msg; return msg;
} }
// 取消任务地址: /cancelPutInTask //参数: barcode
private static string Addr_cancelPutInTask = "/cancelPutInTask";
public static string cancelPutInTask(string deviceName, string barcode)
{
string msg = "";
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode);
string server = GetAddr(Addr_cancelPutInTask, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Post(server, "");
LogUtil.info(deviceName + "cancelPutInTask " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr);
if (data == null)
{
return msg = deviceName + "cancelPutInTask【 " + barcode + "】 没有收到服务器反馈";
}
else if (data.code.Equals(0).Equals(false))
{
return msg = deviceName + " cancelPutInTask【 " + barcode + "】 ：" + data.msg;
}
return "";
}
catch (Exception ex)
{
LogUtil.error(deviceName + " " + ex.ToString());
}
return msg;
}
} }
public class RfidData public class RfidData
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!