Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e42f8115 由 张东亮
选项

取完料上升时以2/3速度上升

1 个父辈 097668dc
内嵌 并排
正在显示 5 个修改的文件 包含 93 行增加 和 8 行删除
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs
...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
public void TimerProcess() public void TimerProcess()
{ {
//如果急停，不再处理 //如果急停，不再处理
if (Robot.alarmType.Equals(AlarmType.SuddenStop)|| Robot.alarmType.Equals(AlarmType.NoAirpressure_Check)) if (Robot.alarmType.Equals(AlarmType.SuddenStop) || Robot.alarmType.Equals(AlarmType.NoAirpressure_Check))
{ {
return; return;
} }
...@@ -110,7 +110,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -110,7 +110,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (StoreManager.checkWatch(shelfWatch, 10000, true)) if (StoreManager.checkWatch(shelfWatch, 10000, true))
{ {
Asa.ClientAction action= AgvClient.GetAction(Config.AgvName); Asa.ClientAction action = AgvClient.GetAction(Config.AgvName);
var agvcallresult = AgvClient.NeedEnter(Config.AgvName, "", Asa.ClientLevel.High); var agvcallresult = AgvClient.NeedEnter(Config.AgvName, "", Asa.ClientLevel.High);
if (!action.Equals(Asa.ClientAction.NeedEnter)) if (!action.Equals(Asa.ClientAction.NeedEnter))
{ {
...@@ -145,7 +145,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -145,7 +145,7 @@ namespace OnlineStore.DeviceLibrary
BatchAxis.SuddenStop(); BatchAxis.SuddenStop();
BatchAxis.ServoOff(); BatchAxis.ServoOff();
WarnMsg = Name + "复位失败：批量轴打开失败:"+msg; WarnMsg = Name + "复位失败：批量轴打开失败:" + msg;
return false; return false;
} }
if (resetShelf) if (resetShelf)
...@@ -156,7 +156,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -156,7 +156,7 @@ namespace OnlineStore.DeviceLibrary
preCodeList = new List<string>(); preCodeList = new List<string>();
WarnMsg = ""; WarnMsg = "";
alarmType = AlarmType.None; alarmType = AlarmType.None;
MoveInfo.NewMove(MoveType.Reset,new InOutParam()); MoveInfo.NewMove(MoveType.Reset, new InOutParam());
MoveInfo.NextMoveStep(StepEnum.IBR01_StopDown); MoveInfo.NextMoveStep(StepEnum.IBR01_StopDown);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
WorkLog("开始复位，定位气缸下降"); WorkLog("开始复位，定位气缸下降");
...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
} }
LogUtil.info(Name + " BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")"); LogUtil.info(Name + " BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")");
} }
//targetSpeed = Config.BatchAxis_P3Speed / 2; targetSpeed = Robot.Config.BatchAxis_P2Speed * 2 / 3;
} }
// 需要增加定时器，获取验证信号并停止伺服 // 需要增加定时器，获取验证信号并停止伺服
StartMovePosition = BatchAxis.GetAclPosition(); StartMovePosition = BatchAxis.GetAclPosition();
...@@ -565,7 +565,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -565,7 +565,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveType.Equals(MoveType.OutStore)) if (MoveInfo.MoveType.Equals(MoveType.OutStore))
{ {
string code = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ToStr() : ""; string code = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ToStr() : "";
return CurrShelf.ToStr() + "， 出料：" + " " + MoveInfo.MoveStep +" "+$"{MoveInfo?.MoveParam?.PosInfo.hSerial??""} {SServerManager.GetOutTaskCount(MoveInfo?.MoveParam?.PosInfo?.hSerial??"")}" +" \r\n" + code + "\n"; return CurrShelf.ToStr() + "， 出料：" + " " + MoveInfo.MoveStep + " " + $"{MoveInfo?.MoveParam?.PosInfo.hSerial ?? ""} {SServerManager.GetOutTaskCount(MoveInfo?.MoveParam?.PosInfo?.hSerial ?? "")}" + " \r\n" + code + "\n";
} }
else if (MoveInfo.MoveType.Equals(MoveType.InStore)) else if (MoveInfo.MoveType.Equals(MoveType.InStore))
{ {
...@@ -616,7 +616,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -616,7 +616,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (WarnMsg.Contains(msg)) if (WarnMsg.Contains(msg))
{ {
WarnMsg=""; WarnMsg = "";
} }
} }
} }
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
...@@ -288,7 +288,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -288,7 +288,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.IB15_BatchAxisToP2); MoveInfo.NextMoveStep(StepEnum.IB15_BatchAxisToP2);
WorkLog("料串入料 ：料盘已拿走，批量轴到P2,测盘高 "); WorkLog("料串入料 ：料盘已拿走，批量轴到P2,测盘高 ");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
BatchAxisToP2(); BatchAxisToP2(false);
} }
else if (MoveInfo.IsStep(StepEnum.IB15_BatchAxisToP2)) else if (MoveInfo.IsStep(StepEnum.IB15_BatchAxisToP2))
{ {
......
source/XLRStoreClient/XLRStore.csproj
...@@ -54,6 +54,9 @@ ...@@ -54,6 +54,9 @@
<ApplicationIcon>DfIcon.ico</ApplicationIcon> <ApplicationIcon>DfIcon.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Client"> <Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\dll\Client.dll</HintPath>
...@@ -305,6 +308,7 @@ ...@@ -305,6 +308,7 @@
<Content Include="model\sr.prototxt"> <Content Include="model\sr.prototxt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="app.manifest" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
......
source/XLRStoreClient/app.manifest 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC 清单选项
如果想要更改 Windows 用户帐户控制级别，请使用
以下节点之一替换 requestedExecutionLevel 节点。
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
元素。
-->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
Windows 版本的列表。取消评论适当的元素，
Windows 将自动选择最兼容的环境。 -->
<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
</application>
</compatibility>
<!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>
-->
<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->
</assembly>
source/XLRStoreClient/inputForm/FrmInputEquip.cs
...@@ -787,10 +787,12 @@ namespace OnlineStore.XLRStore ...@@ -787,10 +787,12 @@ namespace OnlineStore.XLRStore
thread.IsBackground = true; thread.IsBackground = true;
thread.Start(); thread.Start();
MessageBox.Show("夹爪循环测试开始！"); MessageBox.Show("夹爪循环测试开始！");
MessageBox.Show("夹爪循环测试开始！");
} }
private void btnClampJawStop_Click(object sender, EventArgs e) private void btnClampJawStop_Click(object sender, EventArgs e)
{ {
enable = false; enable = false;
LogUtil.info($"夹爪循环测试结束！");
MessageBox.Show("夹爪循环测试结束！"); MessageBox.Show("夹爪循环测试结束！");
} }
bool enable = false; bool enable = false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!