Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 20634728 由 刘韬
选项

1

1 个父辈 351f8cbf
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 61 行增加 和 39 行删除
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 5a1faba90251847885c81b6291b50d083a8262c9")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 351f8cbf8c7888864dfefdd40ed3c316e14ecb98")]
[assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/ACSingleStore/resources/en-US.lngres
FrmStoreBox_tabControl2_Text FrmStoreBox_tabControl2_Text FrmStoreBox_tabControl2_Text
FrmStoreBox_tabPage4_Text 料仓操作 Operation
FrmStoreBox_tabPage9_Text IO调试 IO Debug
FrmStoreBox_chbBuzzer_Text 启用蜂鸣器 Enable the buzzer
......@@ -89,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: Port number:
FrmStoreBox_btnTempClose_Text 断开 Disconnect
FrmStoreBox_btnTempInit_Text 初始化 Initialize
FrmStoreBox_groupBox3_Text 设备状态 Machine state
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 Wait to start
FrmStoreBox_groupInout_Text 料仓操作 Operation
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- Current temperature--& current humidity--
......
source/ACSingleStore/resources/ja-JP.lngres
......@@ -89,7 +89,6 @@ FrmStoreBox_label27_Text 端口号: ポート番号
FrmStoreBox_btnTempClose_Text 断开 接続解除
FrmStoreBox_btnTempInit_Text 初始化 初期化
FrmStoreBox_groupBox3_Text 设备状态 デバイスの状態
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 起動待つ
FrmStoreBox_groupInout_Text 料仓操作 BOX操作
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 現在の温度-‐、現在の湿度-‐
......
source/ACSingleStore/resources/zh-CN.lngres
......@@ -88,7 +88,6 @@ FrmStoreBox_label27_Text 端口号: 端口号:
FrmStoreBox_btnTempClose_Text 断开 断开
FrmStoreBox_btnTempInit_Text 初始化 初始化
FrmStoreBox_groupBox3_Text 设备状态 设备状态
FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text FrmStoreBox_lblWarnMsg_Text
FrmStoreBox_lblThisSta_Text 等待启动 等待启动
FrmStoreBox_groupInout_Text 料仓操作 料仓操作
FrmStoreBox_lblTemp_Text 当前温度--，当前湿度-- 当前温度--，当前湿度--
......
source/ACSingleStore/useControl/uc_boxdebug.cs
......@@ -86,6 +86,7 @@ namespace OnlineStore.ACSingleStore.useControl
var cells = dataGridView1.Rows[pp.row].Cells[pp.col];
cells.Style = GetStyle(arg1);
}
checkVerify();
}
DataGridViewCellStyle GetStyle(string posid) {
if (htpp.ContainsKey(posid) && posState.ContainsKey(posid))
......@@ -95,7 +96,9 @@ namespace OnlineStore.ACSingleStore.useControl
var cells = dataGridView1.Rows[pp.row].Cells[pp.col];
cells.Selected = true;
if (pps.InStoreCheck == 1 && pps.OutStoreCheck == 1)
{
return dgv_ok;
}
else if (pps.InStoreCheck == 1)
return dgv_oin;
else if (pps.OutStoreCheck == 1)
......@@ -103,6 +106,23 @@ namespace OnlineStore.ACSingleStore.useControl
}
return dgv_none;
}
void checkVerify() {
int finish = 0;
for (int i = 0; i < store.PositionNumList.Count; i++)
{
var posid = store.PositionNumList[i];
if (htpp.ContainsKey(posid) && posState.ContainsKey(posid))
{
var pps = (PosState)posState[posid];
if (pps.InStoreCheck == 1 && pps.OutStoreCheck == 1)
{
finish++;
}
}
}
double s = (double)finish / store.PositionNumList.Count;
label_verify.Text = s.ToString("0.0") + "%";
}
Hashtable htpp = new Hashtable();
class PosPos {
public string Posid;
......@@ -309,6 +329,7 @@ namespace OnlineStore.ACSingleStore.useControl
dataGridView1.Rows.RemoveAt(dataGridView1.Rows.Count - 1);
setData(store.PositionNumList.Last());
checkVerify();
}
void setData(string posid) {
ACStorePosition ktkPosition = CSVPositionReader<ACStorePosition>.GetPositon(posid);
......
source/DeviceLibrary/ResourceControl.cs
......@@ -148,11 +148,11 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string TimeOut = "TimeOut";
/// <summary>
///"收到急停信号，报警急停"
///"收到急停信号，报警急停" 1078
/// </summary>
public static string inSuddenStop = "inSuddenStop";
/// <summary>
///"进出轴报警！复位失败，请检查"
///"进出轴报警！复位失败，请检查" 1070
/// </summary>
public static string InoutAlarm = "InoutAlarm";
/// <summary>
......@@ -180,7 +180,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string InStoreError = "InStoreError";
/// <summary>
///"入库未找到库位：条码[{0}]库位号[{1}]"
///"入库未找到库位：条码[{0}]库位号[{1}]"[1080]
/// </summary>
public static string InStoreNoPosition = "InStoreNoPosition";
/// <summary>
......@@ -188,7 +188,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string OutStoreError = "OutStoreError";
/// <summary>
///"出库未找库位：{0}"
///"出库未找库位：{0}" 1082
/// </summary>
public static string OutStoreNoPosition = "OutStoreNoPosition";
......@@ -262,7 +262,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string TakeTrayOut = "TakeTrayOut";
/// <summary>
///未检测到气压信号
///未检测到气压信号 1079
/// </summary>
public static string NoAIr = "NoAIr";
/// <summary>
......@@ -346,13 +346,14 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string OpenAxisFail = "OpenAxisFail";
/// <summary>
/// 运动轴{0}报警
/// 运动轴{0}报警 1080
/// </summary>
public static string AxisAlarm = "AxisAlarm";
public static string CustAlarm = "CustAlarm";
/// <summary>
/// 等待信号{0}={1}超时
/// 等待信号{0}={1}超时 1084
/// </summary>
public static string WaitSingleTimeOut = "WaitSingleTimeOut";
/// <summary>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -146,7 +146,7 @@ namespace OnlineStore.DeviceLibrary
isInSuddenDown = true;
LogUtil.error(LOGGER, StoreName + "收到急停信号,报警急停");
// WarnMsg = StoreName + "收到急停信号，报警急停";
SetWarnMsg(ResourceControl.inSuddenStop);
SetWarnMsg(ResourceControl.inSuddenStop);//[1078]
//报警时会关闭所有轴
Alarm(StoreAlarmType.SuddenStop, "1", StoreMoveType.None);
}
......@@ -511,7 +511,7 @@ namespace OnlineStore.DeviceLibrary
//如果此时轴三还在报警，需要提示错误并等待
if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
{
SetWarnMsg(ResourceControl.InoutAlarm);
SetWarnMsg(ResourceControl.InoutAlarm);//1070
//WarnMsg = "进出轴报警！复位失败，请检查!";
LogUtil.error(LOGGER, "进出轴报警！复位失败，请检查！");
}
......@@ -839,7 +839,7 @@ namespace OnlineStore.DeviceLibrary
if (span.TotalSeconds > Config.AirCheckSeconds)
{
//WarnMsg = "未检测到气压信号";
SetWarnMsg(ResourceControl.NoAIr);
SetWarnMsg(ResourceControl.NoAIr);//1079
preAirValue = IO_VALUE.LOW;
//LogUtil.info("已持续【" + FormUtil.GetSpanStr(span) + "】未检测到气压信号，报警");
//Alarm(StoreAlarmType.NoAirCheck, "2", StoreMoveType.None);
......@@ -1190,17 +1190,21 @@ namespace OnlineStore.DeviceLibrary
IsScanCode = true;
CurrScanCount++;
LogUtil.info(StoreName + "[" + CurrScanCount + "]检测到" + height + "mm料盘，开始扫码");
// GetCameraCode();
//GetCameraCode();
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
LastScanTime = DateTime.Now;
var isdl = dlScanSocket.BeginScan();
if (isdl)
LogUtil.info(StoreName + "DL扫码枪="+isdl);
if (!isdl)
{
Task.Run(() =>
{
List<string> codelist;
if (CodeManager.IsServerAccess())
var IsServerAccess = CodeManager.IsServerAccess();
LogUtil.info(StoreName + "IsServerAccess=" + IsServerAccess);
if (IsServerAccess)
{
codelist = new List<string>() { "server" };
}
else
......@@ -1386,7 +1390,7 @@ namespace OnlineStore.DeviceLibrary
if (alarmIo == 1)
{
//WarnMsg = StoreName + " 运动轴" + axisInfo.Explain + "报警";
SetWarnMsg(ResourceControl.AxisAlarm, axisInfo.DisplayStr);
SetWarnMsg(ResourceControl.AxisAlarm, axisInfo.DisplayStr);//1080
info.AlarmIoValue = alarmIo;
Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(axisInfo).ToString(), StoreMoveType.None);
isInAlarm = true;
......@@ -1586,7 +1590,7 @@ namespace OnlineStore.DeviceLibrary
{
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因
InStoreFail = true;
SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId);
SetWarnMsg(ResourceControl.InStoreNoPosition, message, posId);//[1081]
// WarnMsg = "入库未找到库位：二维码【" + message + "】库位【" + posId + "】 ";
LogUtil.error(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info(LOGGER, "收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
......@@ -1822,7 +1826,7 @@ namespace OnlineStore.DeviceLibrary
{
result = 44;
}
else if (result >= 28)
else if (result >= 32)
{
result = 32;
}
......@@ -2255,15 +2259,15 @@ namespace OnlineStore.DeviceLibrary
index++;
string plateW = plateWArray[index];
string plateH = plateHArray[index];
string[] posArray = posId.Split('#');
if (posArray.Length != 2)
{
//WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreError, posId);
LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误");
continue;
}
int storeId = int.Parse(posArray[0]);
//string[] posArray = posId.Split('#');
//if (posArray.Length != 2)
//{
// //WarnMsg = StoreName + "出库格式错误：库位号【" + posId + "】";
// SetWarnMsg(ResourceControl.OutStoreError, posId);
// LogUtil.error(LOGGER, "收到服务器出库命令：库位号【" + posId + "】格式错误");
// continue;
//}
//int storeId = int.Parse(posArray[0]);
//根据发送的posId获取位置列表
ACStorePosition position = CSVPositionReader<ACStorePosition>.GetPositon(posId);
......@@ -2271,7 +2275,7 @@ namespace OnlineStore.DeviceLibrary
{
//出入库没有找到服务器发送的库位，需要打印日志方便查询原因
//WarnMsg = StoreName + "出库未找库位：【" + posId + "】";
SetWarnMsg(ResourceControl.OutStoreNoPosition, posId);
SetWarnMsg(ResourceControl.OutStoreNoPosition, posId);//1082
LogUtil.error(LOGGER, "收到服务器出库命令：未找到【" + posId + "】的库位信息");
continue;
}
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -172,7 +172,7 @@ namespace OnlineStore.DeviceLibrary
{
ConfigIO io = Config.getWaitIO(wait.IoType);
//WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
SetWarnMsg(ResourceControl.WaitSingleTimeOut, io.DisplayStr, wait.IoValue.ToString());
SetWarnMsg(ResourceControl.WaitSingleTimeOut, io.DisplayStr, wait.IoValue.ToString());//1084
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false;
......@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
{
// WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
// + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1) + "");
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1) + ""); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", StoreMove.MoveType);
}
......@@ -330,7 +330,7 @@ namespace OnlineStore.DeviceLibrary
{
if (!DoorIsClose() && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
{
SetWarnMsg(ResourceControl.safety_grating_covered, "开门时安全光栅被遮挡,暂停运行");
SetWarnMsg(ResourceControl.safety_grating_covered, "开门时安全光栅被遮挡,暂停运行");//1086
return;
}
LineMoveP moveP = StoreMove.MoveParam.MoveP;
......@@ -830,7 +830,7 @@ namespace OnlineStore.DeviceLibrary
//OutStoreLog("出库：SO_12_DeviceOutFromDoor 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成");
//ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
//CloseDoor();
SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
SetWarnMsg(ResourceControl.take_out_reel_failure, posId);//1083
OutStoreLog($"料叉没有成功取出料盘,请检查库位[{posId}]");
}
//改为出库完成
......@@ -840,7 +840,7 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SO_TakeReelFaile)
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
SetWarnMsg(ResourceControl.take_out_reel_failure, posId); //1083
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray)
{
......
source/DeviceLibrary/acSingleStore/DoorControl.cs
......@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
continue;
}
if (Config.Door_Axis==null && IOManager.IOValue(IO_Type.Motor_Error).Equals(IO_VALUE.HIGH)) {
SetWarnMsg(ResourceControl.WaitSingleTimeOut, "Motor_Error","Low");
SetWarnMsg(ResourceControl.WaitSingleTimeOut, "Motor_Error","Low");//1084
continue;
}
if (!SafetyLightCurtains && IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
......
source/DeviceLibrary/halcon/CodeManager.cs
......@@ -137,7 +137,7 @@ namespace OnlineStore.DeviceLibrary
{
if (cameraNameList != null && cameraNameList.Count >= 0)
{
if (cameraNameList[0].Trim().ToLower().IndexOf("server") >= -1)
if (cameraNameList[0].Trim().ToLower().IndexOf("server") >= 0)
{
return true;
}
......@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
if (String.IsNullOrEmpty(r))
{
// SaveImageToFile(deviceName, cameraName, bit);
SaveImageToFile("camera", cameraName, bitmap);
}
LogUtil.info(" 【" + cameraName + "】" + " 扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】 ：" + r);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!