Skip to content

刘韬 / SO775-DUOStore

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

使用remotedecode

1 个父辈 a9c5a5a2
内嵌 并排
正在显示 8 个修改的文件 包含 27 行增加 和 71 行删除
source/Common/Common.csproj
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\dll\Newtonsoft.Json.dll</HintPath>
......
source/DUOStore/DUOStore.csproj
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath> <HintPath>..\..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -45,10 +45,6 @@ ...@@ -45,10 +45,6 @@
<Reference Include="Asa.Camera.VisionLib"> <Reference Include="Asa.Camera.VisionLib">
<HintPath>..\..\..\camera\Asa.Camera.VisionLib.dll</HintPath> <HintPath>..\..\..\camera\Asa.Camera.VisionLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.IOModule.AIOBOX, Version=2.4.0.7, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\AIOBOX\AIOBOX\bin\Debug\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID.HiStation"> <Reference Include="Asa.RFID.HiStation">
<HintPath>..\..\..\..\work\RFID\Asa.RFID.HiStation.dll</HintPath> <HintPath>..\..\..\..\work\RFID\Asa.RFID.HiStation.dll</HintPath>
</Reference> </Reference>
...@@ -66,9 +62,9 @@ ...@@ -66,9 +62,9 @@
<Reference Include="HuichuanLibrary"> <Reference Include="HuichuanLibrary">
<HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Neotel.Rmaxis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Neotel.Rmaxis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
...@@ -107,7 +103,6 @@ ...@@ -107,7 +103,6 @@
<Compile Include="duoStore\DUOStoreBean.cs" /> <Compile Include="duoStore\DUOStoreBean.cs" />
<Compile Include="duoStore\StoreManager.cs" /> <Compile Include="duoStore\StoreManager.cs" />
<Compile Include="device\halcon\CodeManager.cs" /> <Compile Include="device\halcon\CodeManager.cs" />
<Compile Include="device\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="device\IO\IOManager.cs" /> <Compile Include="device\IO\IOManager.cs" />
<Compile Include="Properties\Settings1.Designer.cs"> <Compile Include="Properties\Settings1.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
...@@ -149,7 +144,6 @@ ...@@ -149,7 +144,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="Properties\Settings1.settings"> <None Include="Properties\Settings1.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings1.Designer.cs</LastGenOutput> <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
......
source/DeviceLibrary/app.config deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="OnlineStore.DeviceLibrary.Properties.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
<OnlineStore.DeviceLibrary.Properties.Settings1>
<setting name="CurrShelfNum" serializeAs="String">
<value/>
</setting>
<setting name="CurrShelfType" serializeAs="String">
<value>0</value>
</setting>
<setting name="LastOutShelfType" serializeAs="String">
<value>0</value>
</setting>
</OnlineStore.DeviceLibrary.Properties.Settings1>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
source/DeviceLibrary/device/IO/IOManager.cs
...@@ -173,22 +173,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,22 +173,7 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
public static void Init() public static void Init()
{ {
bool UseHCBoard = true;// ConfigAppSettings.GetIntValue(Setting_Init.UseHCBoard).Equals(1); instance = new HCIOManager();
if (UseHCBoard)
{
instance = new HCIOManager();
}
else
{
bool isAIOBox = ConfigAppSettings.GetIntValue(Setting_Init.UseAIOBOX).Equals(1); if (isAIOBox)
{
instance = new AIOBOXManager();
}
//else
//{
// instance = new KNDManager();
//}
}
} }
public abstract void ReadAllDI(string deviceName, byte slaveId); public abstract void ReadAllDI(string deviceName, byte slaveId);
......
source/DeviceLibrary/device/halcon/CodeManager.cs
...@@ -179,29 +179,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -179,29 +179,25 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
RemoteDecodeHelper.RemoteDecodeParam remoteDecodeParam = new RemoteDecodeHelper.RemoteDecodeParam
{
codeTypeList = codeTypeList.ToArray(),
codeCount = 3,
timeout = 3000
};
List<CodeInfo> cc = new List<CodeInfo>(); List<CodeInfo> cc = new List<CodeInfo>();
foreach (string codeType in codeTypeList) cc = RemoteDecodeHelper.DecodeRequest(ho_Image, remoteDecodeParam);
if (codeList == null) return codeList;
foreach (CodeInfo c in cc)
{ {
//判断是否是一维码 string str = CodeManager.ReplaceCode(c.CodeStr);
if (codeType.ToLower().Equals("barcode")) lock (codeList)
{
cc = HDCodeHelper.DecodeBarCode(ho_Image);
}
else
{
cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, 2500);
}
foreach (CodeInfo c in cc)
{ {
string str = CodeManager.ReplaceCode(c.CodeStr); if (!codeList.Contains(str))
lock (codeList)
{ {
if (!codeList.Contains(str)) codeList.Add(str);
{ r = r + "##" + str;
codeList.Add(str);
r = r + "##" + str;
}
} }
} }
} }
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
...@@ -661,7 +661,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -661,7 +661,7 @@ namespace OnlineStore.DeviceLibrary
if (result) { if (result) {
AgvClient.SetStatus(StoreManager.Config.AgvInName, "", Agv.ClientAction.FinishEnter); AgvClient.SetStatus(StoreManager.Config.AgvInName, "", Agv.ClientAction.FinishEnter);
_=Task.Run(() => { _=Task.Run(() => {
Task.Delay(2000); Task.Delay(2000).Wait();
AgvClient.SetStatus(StoreManager.Config.AgvInName, "", Agv.ClientAction.None); AgvClient.SetStatus(StoreManager.Config.AgvInName, "", Agv.ClientAction.None);
}); });
} }
...@@ -681,7 +681,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -681,7 +681,9 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(1000 * 20); Thread.Sleep(1000 * 20);
//等待进料检测信号 //等待进料检测信号
result = WaitIo(IO_Type.Line_InCheck, IO_VALUE.LOW, 10000); result = WaitIo(IO_Type.Line_InCheck, IO_VALUE.LOW, 10000);
//InOutStoreLog($"Line_InCheck:{result}");
result = WaitIo(IO_Type.Line_WaitCheck, IO_VALUE.HIGH, 50000); result = WaitIo(IO_Type.Line_WaitCheck, IO_VALUE.HIGH, 50000);
//InOutStoreLog($"Line_WaitCheck:{result}");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\增广夹爪\log4net.dll</HintPath> <HintPath>..\..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!