Skip to content

张东亮 / NS200

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c39c8e47 由 贾鹏旭
选项

Merge branch 'master' of http://106.15.194.121:8083/zdl/ns200

2 个父辈 dd3f09d7 d357dcbb
内嵌 并排
正在显示 7 个修改的文件 包含 26 行增加 和 24 行删除
DeviceLibrary/AGVManager.cs
using DeviceLib.WebApi.Schemas;
using DeviceLib.WebApi.Schemas;
using DeviceLibrary.AGVService.Schemas;
using DL.StandardRobot;
using OnlineStore;
......@@ -102,7 +102,7 @@ namespace DeviceLibrary
sendOpMimoCmd(task_code, StringDoor(false));
}
}
sendAgvLog("AGV任务" + task_code + "状态更新" + task_status);
sendAgvLog(crc.GetString("Res0107.d1e28be6","AGV任务") + task_code + crc.GetString("Res0108.164140b2","状态更新") + task_status);
}
catch (Exception ex)
{
......@@ -160,7 +160,7 @@ namespace DeviceLibrary
if (RobotManage.mainMachine.RightMoveInfo.MoveStep >= MoveStep.R40_InShelf)
{
rtnData.code = 201;
rtnData.msg = "入料口正在进料";
rtnData.msg = crc.GetString("Res0109.d647c69c","入料口正在进料");
}
}
else if (DeviceCheckDto.UNLOAD_REQ.Equals(deviceCheckDto.operate))//下料请求
......@@ -180,13 +180,13 @@ namespace DeviceLibrary
if (RobotManage.mainMachine.RightMoveInfo.MoveStep >= MoveStep.R30_OutShelf)
{
rtnData.code = 201;
rtnData.msg = "入料口正在出料";
rtnData.msg = crc.GetString("Res0110.97f61551","入料口正在出料");
}
}
else
{
rtnData.code = 201;
rtnData.msg = "任务类型" + deviceCheckDto.task_type + "不允许使用该操作" + deviceCheckDto.operate;
rtnData.msg = crc.GetString("Res0111.bb763c9e","任务类型") + deviceCheckDto.task_type + crc.GetString("Res0112.caa9d6a0","不允许使用该操作") + deviceCheckDto.operate;
}
break;
case B2://NS200出料口上料任务
......@@ -207,7 +207,7 @@ namespace DeviceLibrary
if (RobotManage.mainMachine.LeftMoveInfo.MoveStep >= MoveStep.L60_InShelf)
{
rtnData.code = 201;
rtnData.msg = "出料口正在入料";
rtnData.msg = crc.GetString("Res0113.15f652b4","出料口正在入料");
}
}
else if (DeviceCheckDto.UNLOAD_REQ.Equals(deviceCheckDto.operate))//下料请求
......@@ -227,13 +227,13 @@ namespace DeviceLibrary
if (RobotManage.mainMachine.LeftMoveInfo.MoveStep >= MoveStep.L50_OutShelf)
{
rtnData.code = 201;
rtnData.msg = "出料口正在出料";
rtnData.msg = crc.GetString("Res0114.b6a35f01","出料口正在出料");
}
}
else
{
rtnData.code = 201;
rtnData.msg = "任务类型" + deviceCheckDto.task_type + "不允许使用该操作" + deviceCheckDto.operate;
rtnData.msg = crc.GetString("Res0111.bb763c9e","任务类型") + deviceCheckDto.task_type + crc.GetString("Res0112.caa9d6a0","不允许使用该操作") + deviceCheckDto.operate;
}
break;
case MIMO://MIMO上料任务
......@@ -242,7 +242,7 @@ namespace DeviceLibrary
if (!StringDoorIsOpen)
{
rtnData.code = 201;
rtnData.msg = "折叠门开门信号未亮，不允许上料";
rtnData.msg = crc.GetString("Res0115.75a1fac5","折叠门开门信号未亮，不允许上料");
}
else
{
......@@ -270,7 +270,7 @@ namespace DeviceLibrary
if (!StringDoorIsOpen)
{
rtnData.code = 201;
rtnData.msg = "折叠门开门信号未亮，不允许下料";
rtnData.msg = crc.GetString("Res0116.23d7e98f","折叠门开门信号未亮，不允许下料");
}
else
{
......@@ -296,7 +296,7 @@ namespace DeviceLibrary
else
{
rtnData.code = 201;
rtnData.msg = "任务类型" + deviceCheckDto.task_type + "不允许使用该操作" + deviceCheckDto.operate;
rtnData.msg = crc.GetString("Res0111.bb763c9e","任务类型") + deviceCheckDto.task_type + crc.GetString("Res0112.caa9d6a0","不允许使用该操作") + deviceCheckDto.operate;
}
break;
}
......@@ -525,4 +525,4 @@ public class TaskState
public bool updated { get; set; } = false;
public string task_status { get; set; } = "CREATED";
}
}
}
\ No newline at end of file
DeviceLibrary/AutoScanAndLabel/AxisBean.cs
using OnlineStore.Common;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
......@@ -78,7 +79,7 @@ namespace DeviceLibrary
else
{
AxisManager.ServoOff(portName, slvAddr);
msg = "打开轴" + Config.Explain + "失败 ";
msg = crc.GetString("Res0117.2bf5c941","打开轴") + Config.Explain + crc.GetString("Res0118.33d2a704","失败 ");
LogUtil.info(AxisName + msg);
return false;
}
......@@ -144,7 +145,7 @@ namespace DeviceLibrary
int isAlarm = AxisManager.GetAlarmStatus(deviceName, axisNo);
if (isAlarm.Equals(1))
{
clearMsg = "清理报警，";
clearMsg = crc.GetString("Res0119.cbd5d752","清理报警，");
AxisManager.AlarmClear(deviceName, axisNo);
Thread.Sleep(200);
AxisManager.ServoOn(deviceName, axisNo);
......@@ -191,7 +192,7 @@ namespace DeviceLibrary
}
else
{
msg = MoveInfo.Name + " " + MoveInfo.MoveStep + axis.DisplayStr + ",收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
msg = MoveInfo.Name + " " + MoveInfo.MoveStep + axis.DisplayStr + crc.GetString("Res0120.405c5a9e",",收到原点完成信号，当前位置[") + outCount + crc.GetString("Res0121.6658614e","]，误差过大，需要报警");
LogUtil.error(msg);
}
}
......@@ -351,4 +352,4 @@ namespace DeviceLibrary
}
}
}
\ No newline at end of file
DeviceLibrary/AutoScanAndLabel/MainMachine _LabelProcess.cs
......@@ -73,7 +73,7 @@ namespace DeviceLibrary
var r = ip.Result;
if (r.Item1)
{
Msg.add("标签取起失败!", MsgLevel.warning);
Msg.add(crc.GetString("Res0122.62c858d3","标签取起失败!"), MsgLevel.warning);
}
else
LabelMoveInfo.NextMoveStep(MoveStep.Lbl06);
......
DeviceLibrary/AutoScanAndLabel/MainMachine _RightProcess.cs
......@@ -249,7 +249,7 @@ namespace DeviceLibrary
string state = "";
if (IOValue(IO_Type.RightEnd_Check).Equals(IO_VALUE.HIGH))
{
state +=crc.GetString("Res0218", "有料串,已提取{0}张料盘", RightCount);
state += string.Format(crc.GetString("Res0123.d86f0192","有料串,已提取{0}张料盘"), RightCount);
if (RightShelfNoTray)
state += crc.GetString("Res0100", ",料串已清空. ");
else
......
DeviceLibrary/AutoScanAndLabel/MoveInfo.cs
using OnlineStore.Common;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
......@@ -244,11 +245,11 @@ namespace DeviceLibrary
}
else if (WaitType.Equals(WaitEnum.W008_BatchAxis))
{
return "批量轴上升到上料点";
return crc.GetString("Res0124.84e7c741","批量轴上升到上料点");
}
else if (WaitType.Equals(WaitEnum.W009_ScanCode))
{
return "扫码完成";
return crc.GetString("Res0125.ed4de1c6","扫码完成");
}
else if (WaitType.Equals(WaitEnum.W013_Action))
{
......@@ -347,4 +348,4 @@ namespace DeviceLibrary
/// </summary>
internal static int W013_Action = 13;
}
}
}
\ No newline at end of file
DeviceLibrary/AutoScanAndLabel/RobotManage.cs
......@@ -54,7 +54,7 @@ namespace DeviceLibrary
}
if (!printerHelper.Connection(""))
{
msg += crc.GetString("Res0217", "标签打印机打开失败") + "\n";
msg += crc.GetString("Res0126.f11b67ff","标签打印机打开失败") + "\n";
IsLoadOk = false;
}
else
......
dll/dll.zip 0 → 100644
此文件类型无法预览
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!