Skip to content

孙克 / ACSingleStore

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

1

1 个父辈 55bad263
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 16 行增加 和 16 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -169,6 +169,10 @@ namespace OnlineStore.ACSingleStore ...@@ -169,6 +169,10 @@ namespace OnlineStore.ACSingleStore
private DateTime preReadModblsTime = DateTime.Now; private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
if (!this.Visible)
{
return;
}
//HumitureServer.RandomData(store.Config.GetTempAddrList()); //HumitureServer.RandomData(store.Config.GetTempAddrList());
lblTemp.Text = store.currTempStr; lblTemp.Text = store.currTempStr;
//验证运动是否完成 //验证运动是否完成
...@@ -1250,6 +1254,8 @@ namespace OnlineStore.ACSingleStore ...@@ -1250,6 +1254,8 @@ namespace OnlineStore.ACSingleStore
private void 显示ToolStripMenuItem_Click(object sender, EventArgs e) private void 显示ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
try
{
FrmPwd fw = new FrmPwd(10); FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog(); DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK)) if (!result.Equals(DialogResult.OK))
...@@ -1261,6 +1267,10 @@ namespace OnlineStore.ACSingleStore ...@@ -1261,6 +1267,10 @@ namespace OnlineStore.ACSingleStore
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
}catch(Exception ex)
{
LogUtil.error("显示界面出错："+ex.ToString());
}
} }
private void ExitApp() private void ExitApp()
{ {
......
source/ACSingleStore/FrmStoreBox.resx
...@@ -1263,7 +1263,7 @@ ...@@ -1263,7 +1263,7 @@
</value> </value>
</data> </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>169</value>
</metadata> </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
source/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
//if (isHomeEnd.Equals(1)) //if (isHomeEnd.Equals(1))
//{ //{
int value = 2000; int value = 2000;
LogUtil.info("轴【" + portName + "】原点返回时发现原点已亮且回过原点，需要先相对走" + value); LogUtil.info("轴【" + portName + "_" + slvAddr + "】原点返回时发现原点已亮且回过原点，需要先相对走" + value);
RelMove(portName, slvAddr, value); RelMove(portName, slvAddr, value);
bool isStop = false; bool isStop = false;
for (int i = 0; i <= 10; i++) for (int i = 0; i <= 10; i++)
...@@ -312,13 +312,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -312,13 +312,13 @@ namespace OnlineStore.DeviceLibrary
if (GetBusyStatus(portName, slvAddr).Equals(0)) if (GetBusyStatus(portName, slvAddr).Equals(0))
{ {
isStop = true; isStop = true;
LogUtil.info("轴【" + portName + "】 相对走" + value + "已结束"); LogUtil.info("轴【" + portName + "_" + slvAddr + "】相对走" + value + "已结束");
break; break;
} }
} }
if (!isStop) if (!isStop)
{ {
LogUtil.info("轴【" + portName + "】 相对走" + value + "已等待2分钟，直接停止"); LogUtil.info("轴【" + portName + "_" + slvAddr + "】相对走" + value + "已等待2分钟，直接停止");
SuddenStop(portName, slvAddr); SuddenStop(portName, slvAddr);
} }
//} //}
...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("轴【" + portName + "】原点返回前验证是否在原点出错：" + ex.StackTrace); LogUtil.error("轴【" + portName + "_" + slvAddr + "】原点返回前验证是否在原点出错：" + ex.StackTrace);
} }
UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove1); UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove1);
LogUtil.debug("回原点：反方向"); LogUtil.debug("回原点：反方向");
...@@ -341,7 +341,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -341,7 +341,7 @@ namespace OnlineStore.DeviceLibrary
if ((preSpeed.Equals(-1)) || (!preSpeed.Equals(Math.Abs(speed)))) if ((preSpeed.Equals(-1)) || (!preSpeed.Equals(Math.Abs(speed))))
{ {
string v1 = slvAddr + "064601 " + ACServerManager.SpeedToStr(speed, 4) + " ffff"; string v1 = slvAddr + "064601 " + ACServerManager.SpeedToStr(speed, 4) + " ffff";
LogUtil.debug("轴【" + portName + "】更新速度为【" + speed + "】，发送数据【" + v1 + "】"); LogUtil.debug("轴【" + portName + "_" + slvAddr + "】更新速度为【" + speed + "】，发送数据【" + v1 + "】");
SendStrAndSleep(portName, v1, SleepMSendons); SendStrAndSleep(portName, v1, SleepMSendons);
UpdateAddrValue(portName,slvAddr, ACCMDManager.Speed_Addr, Math.Abs(speed)); UpdateAddrValue(portName,slvAddr, ACCMDManager.Speed_Addr, Math.Abs(speed));
Thread.Sleep(SleepMSendons); Thread.Sleep(SleepMSendons);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1102,19 +1102,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1102,19 +1102,9 @@ namespace OnlineStore.DeviceLibrary
isWaitScan = false; isWaitScan = false;
IsScanCode = true; IsScanCode = true;
//BeginScannering();
//判断料盘尺寸
if (GetSize() <= 7)
{
LogUtil.info(StoreName + "检测到寸料盘，开始扫码"); LogUtil.info(StoreName + "检测到寸料盘，开始扫码");
GetCameraCode(); GetCameraCode();
} }
else
{
LogUtil.info(StoreName + "检测到大于7寸的料盘，请放入正确的料盘");
IsScanCode = false;
}
}
} }
else else
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!