Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f28a4149 由 几米阳光
选项

1

1 个父辈 aca05b44
内嵌 并排
正在显示 4 个修改的文件 包含 13 行增加 和 17 行删除
source/Common/bean/Bean.cs
...@@ -249,5 +249,7 @@ namespace OnlineStore.Common ...@@ -249,5 +249,7 @@ namespace OnlineStore.Common
/// 批量上下料轴 /// 批量上下料轴
/// </summary> /// </summary>
public static string batchAxis = "device_batchAxis"; public static string batchAxis = "device_batchAxis";
public static string posName = "posName";
} }
} }
source/DeviceLibrary/DeviceLibrary/PanasonicServo/BatchAxisController.cs
...@@ -51,11 +51,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -51,11 +51,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("批量上料轴，检测到【" + TargetIoType + "】信号，可以停止运动"); LogUtil.info("批量上料轴，检测到【" + TargetIoType + "】信号，可以停止运动");
result = true; result = true;
} }
//TimeSpan span = DateTime.Now - preTime;
//if (span.TotalMilliseconds > 100)
//{
else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH)) else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH))
//if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
{ {
LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动"); LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动");
result = true; result = true;
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1209,7 +1209,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1209,7 +1209,7 @@ namespace OnlineStore.DeviceLibrary
if (rId.Length > 7) if (rId.Length > 7)
{ {
readId = rId.Substring(6, rId.Length - 7); readId = rId.Substring(6, rId.Length - 7);
LogUtil.info("自动出入库：查找到：RI: " + readId ); LogUtil.debug("自动出入库：查找到：RI: " + readId );
break; break;
} }
} }
...@@ -1654,6 +1654,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1654,6 +1654,10 @@ namespace OnlineStore.DeviceLibrary
lineOperation.alarmList.Add(alarmInfo); lineOperation.alarmList.Add(alarmInfo);
} }
lineOperation.data = AutomaticBaiting.GetBtnStatus(); lineOperation.data = AutomaticBaiting.GetBtnStatus();
if (lineOperation.data == null)
{
lineOperation.data = new Dictionary<string, string>();
}
return lineOperation; return lineOperation;
} }
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
...@@ -229,15 +229,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -229,15 +229,15 @@ namespace OnlineStore.DeviceLibrary
bool result = false; bool result = false;
if (IOManager.IOValue(wait.IoType).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(wait.IoType).Equals(IO_VALUE.HIGH))
{ {
LogUtil.info(wait.ToStr() + " 检测到【" + wait.IoType + "】信号，可以停止运动"); LogUtil.debug(wait.ToStr() + " 检测到【" + wait.IoType + "】信号，可以停止运动");
result = true; result = true;
} }
else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH)) else if (IOManager.IOValue(IO_Type.BatchAxis_Limit).Equals(IO_VALUE.HIGH))
//else if (ACServerManager.GetLimitPositiveSingle(wait.AxisInfo).Equals(1)) //else if (ACServerManager.GetLimitPositiveSingle(wait.AxisInfo).Equals(1))
{ {
LogUtil.info(wait.ToStr() + " 检测到正极限信号，可以停止运动"); LogUtil.debug(wait.ToStr() + " 检测到正极限信号，可以停止运动");
ACServerManager.SuddenStop(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()); //ACServerManager.SuddenStop(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue());
Thread.Sleep(50); //Thread.Sleep(50);
result = true; result = true;
} }
if (result) if (result)
...@@ -382,18 +382,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -382,18 +382,14 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID"); LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID");
//发送扫码内容到服务器进行入库操作 //发送扫码内容到服务器进行入库操作
Operation operation = StoreManager.Store.getLineBoxStatus(); Operation operation = StoreManager.Store.getLineBoxStatus();
operation.op = 1; operation.op = 1;
if (operation.data == null)
{
operation.data = new Dictionary<string, string>();
}
operation.data.Add("code", message); operation.data.Add("code", message);
operation.data.Add("boxId", StoreManager.Store.StoreID.ToString()); operation.data.Add("boxId", StoreManager.Store.StoreID.ToString());
string autoposId = StoreManager.Store.GetAutoPosid(true); string autoposId = StoreManager.Store.GetAutoPosid(true);
if (StoreManager.Store.autoNext && (!String.IsNullOrEmpty(autoposId))) if (StoreManager.Store.autoNext && (!String.IsNullOrEmpty(autoposId)))
{ {
operation.data.Add(ParamDefine.posId, autoposId); operation.data.Add(ParamDefine.posName, autoposId);
LogUtil.info("添加自动入库库位号："+autoposId); LogUtil.info("添加自动入库库位号："+autoposId);
} }
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
...@@ -401,13 +397,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -401,13 +397,11 @@ namespace OnlineStore.DeviceLibrary
if (resultOperation == null) if (resultOperation == null)
{ {
// CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
LogUtil.info(Name + "二维码【" + message + "】没有收到服务器反馈！"); LogUtil.info(Name + "二维码【" + message + "】没有收到服务器反馈！");
return; return;
} }
else if (!string.IsNullOrEmpty(resultOperation.msg)) else if (!string.IsNullOrEmpty(resultOperation.msg))
{ {
//如果有提示消息，直接显示提示
LogUtil.info(Name + "服务器反馈 二维码【" + message + "】【"+ autoposId + "】 ：" + resultOperation.msg); LogUtil.info(Name + "服务器反馈 二维码【" + message + "】【"+ autoposId + "】 ：" + resultOperation.msg);
return; return;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!