Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fc1d7511 由 LN
选项

去掉不需要的配置

1 个父辈 fc21f2f3
全部展开
内嵌 并排
正在显示 79 个修改的文件 包含 34 行增加 和 121 行删除
source/ACSingleStore/ACSingleStore.csproj
...@@ -137,79 +137,6 @@ ...@@ -137,79 +137,6 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="Skins\back\DeepCyan.ssk" />
<None Include="Skins\back\DeepGreen.ssk" />
<None Include="Skins\back\DeepOrange.ssk" />
<None Include="Skins\Calmness.ssk" />
<None Include="Skins\CalmnessColor1.ssk" />
<None Include="Skins\CalmnessColor2.ssk" />
<None Include="Skins\DiamondBlue.ssk" />
<None Include="Skins\DiamondGreen.ssk" />
<None Include="Skins\DiamondOlive.ssk" />
<None Include="Skins\DiamondPurple.ssk" />
<None Include="Skins\DiamondRed.ssk" />
<None Include="Skins\Eighteen.ssk" />
<None Include="Skins\EighteenColor1.ssk" />
<None Include="Skins\EighteenColor2.ssk" />
<None Include="Skins\Emerald.ssk" />
<None Include="Skins\EmeraldColor1.ssk" />
<None Include="Skins\EmeraldColor2.ssk" />
<None Include="Skins\EmeraldColor3.ssk" />
<None Include="Skins\GlassBrown.ssk" />
<None Include="Skins\GlassGreen.ssk" />
<None Include="Skins\GlassOrange.ssk" />
<None Include="Skins\Longhorn.ssk" />
<None Include="Skins\MacOS.ssk" />
<None Include="Skins\Midsummer.ssk" />
<None Include="Skins\MidsummerColor1.ssk" />
<None Include="Skins\MidsummerColor2.ssk" />
<None Include="Skins\MidsummerColor3.ssk" />
<None Include="Skins\mp10.ssk" />
<None Include="Skins\mp10green.ssk" />
<None Include="Skins\mp10maroon.ssk" />
<None Include="Skins\mp10mulberry.ssk" />
<None Include="Skins\mp10pink.ssk" />
<None Include="Skins\mp10purple.ssk" />
<None Include="Skins\MSN.ssk" />
<None Include="Skins\office2007.ssk" />
<None Include="Skins\OneBlue.ssk" />
<None Include="Skins\OneCyan.ssk" />
<None Include="Skins\OneGreen.ssk" />
<None Include="Skins\OneOrange.ssk" />
<None Include="Skins\Page.ssk" />
<None Include="Skins\PageColor1.ssk" />
<None Include="Skins\PageColor2.ssk" />
<None Include="Skins\RealOne.ssk" />
<None Include="Skins\Silver.ssk" />
<None Include="Skins\SilverColor1.ssk" />
<None Include="Skins\SilverColor2.ssk" />
<None Include="Skins\SportsBlack.ssk" />
<None Include="Skins\SportsBlue.ssk" />
<None Include="Skins\SportsCyan.ssk" />
<None Include="Skins\SportsGreen.ssk" />
<None Include="Skins\SportsOrange.ssk" />
<None Include="Skins\SteelBlack.ssk" />
<None Include="Skins\SteelBlue.ssk" />
<None Include="Skins\vista1.ssk" />
<None Include="Skins\vista1_green.ssk" />
<None Include="Skins\Vista2_color1.ssk" />
<None Include="Skins\Vista2_color2.ssk" />
<None Include="Skins\Vista2_color3.ssk" />
<None Include="Skins\Vista2_color4.ssk" />
<None Include="Skins\Vista2_color5.ssk" />
<None Include="Skins\Vista2_color6.ssk" />
<None Include="Skins\Vista2_color7.ssk" />
<None Include="Skins\Warm.ssk" />
<None Include="Skins\WarmColor1.ssk" />
<None Include="Skins\WarmColor2.ssk" />
<None Include="Skins\WarmColor3.ssk" />
<None Include="Skins\Wave.ssk" />
<None Include="Skins\WaveColor1.ssk" />
<None Include="Skins\WaveColor2.ssk" />
<None Include="Skins\XPBlue.ssk" />
<None Include="Skins\XPGreen.ssk" />
<None Include="Skins\XPOrange.ssk" />
<None Include="Skins\XPSilver.ssk" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config"> <None Include="App.config">
......
source/ACSingleStore/App.config
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
<add key="HumitureControllerType" value="0"/> <add key="HumitureControllerType" value="0"/>
<add key="UseAIOBOX" value="1"/> <add key="UseAIOBOX" value="1"/>
<!--流水线地址和端口配置--> <!--流水线地址和端口配置-->
<add key ="LineServerIp" value ="192.168.1.110"/> <!--<add key ="LineServerIp" value ="192.168.1.110"/>-->
<add key ="LineServerIp" value =""/>
<add key ="LineServerPort" value ="5246"/> <add key ="LineServerPort" value ="5246"/>
</appSettings> </appSettings>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -30,8 +30,8 @@ PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,, ...@@ -30,8 +30,8 @@ PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,, PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,, PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
,温湿度传感器地址,TemperateServer_Port,9001,,,,,,, ,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,, PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,, PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,,
...@@ -94,28 +94,6 @@ PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,, ...@@ -94,28 +94,6 @@ PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,, PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM2,,,,,,, PRO,温湿度端口号,Humiture_Port,COM2,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,硕科步进电机（压紧轴）控制端口号,CompressAxis_PortName,COM6,,,,,,,
PRO,硕科步进电机（压紧轴）控制波特率,CompressAxis_PortBaudrate,9600,,,,,,,
PRO,硕科步进电机（压紧轴）控制奇偶校验,CompressAxis_PortParity,0,,,,,,,
PRO,硕科步进电机（压紧轴）控制停止位,CompressAxis_StopBits,1,,,,,,,
PRO,硕科步进电机（压紧轴）控制初速度,CompressAxis_StartSpeed,5000,,,,,,,
PRO,硕科步进电机（压紧轴）控制最大速度,CompressAxis_MaxSpeed,8000,,,,,,,
PRO,硕科步进电机（压紧轴）控制末速度,CompressAxis_EndSpeed,6000,,,,,,,
PRO,硕科步进电机（压紧轴）控制加速度,CompressAxis_AddSpeed,3000,,,,,,,
PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,3000,,,,,,,
PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,5000,,,,,,,
PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,,
,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.12,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2920,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2960,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
PRO,模拟信号4默认高度,AIDI4_DefaultPosition,2500,,,,,,,
,,,,,,,,, ,
PRO,模拟信号1的地址,AIDI1_Addr,7,,,,,,,
PRO,模拟信号2的地址,AIDI2_Addr,8,,,,,,,
PRO,模拟信号3的地址,AIDI3_Addr,5,,,,,,,
PRO,模拟信号4的地址,AIDI4_Addr,6,,,,,,,
PRO,IO模块对应的DI数量,IO_DILength,192.168.200.11#8,,,,,, , PRO,IO模块对应的DI数量,IO_DILength,192.168.200.11#8,,,,,, ,
PRO,模块对应的DO数量,IO_DOLength,192.168.200.11#8,,,,,,, PRO,模块对应的DO数量,IO_DOLength,192.168.200.11#8,,,,,,,
PRO,是否有仓门,HasDoor,1,,,,,,, PRO,是否有仓门,HasDoor,1,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -65,11 +65,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,11 +65,7 @@ namespace OnlineStore.DeviceLibrary
IsHasCompress_Axis = config.IsHasCompress_Axis.Equals(1); IsHasCompress_Axis = config.IsHasCompress_Axis.Equals(1);
StoreName = ("料仓BOX_" + config.Id + " ").ToUpper(); StoreName = ("料仓BOX_" + config.Id + " ").ToUpper();
this.StoreID = config.Id; this.StoreID = config.Id;
this.Config = config; this.Config = config;
//this.DIList = config.StoreDIList;
//this.DOList = config.StoreDOList;
//Max_Humidity = config.Max_Humidity;
//Max_Temperature = config.Max_Temperature;
moveAxisList = new List<ConfigMoveAxis>(); moveAxisList = new List<ConfigMoveAxis>();
MoveAxisConfig(); MoveAxisConfig();
List<ACStorePosition> positionList = CSVPositionReader<ACStorePosition>.getPositionList(); List<ACStorePosition> positionList = CSVPositionReader<ACStorePosition>.getPositionList();
...@@ -85,16 +81,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,16 +81,9 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
//初始化摄像机配置 IOManager.Init();
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName); IOManager.instance.ConnectionIOList(Config.DIODeviceNameList);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
//CodeManager.LoadConfig(nameStr, codeStr);
IOManager.Init();
//初始化 //连接设备
IOManager.instance.ConnectionIOList(Config.DIODeviceNameList);
//KNDAIManager.ConnectionIP(Config.AIDevice_IP);
//scanSocket.OnScanRevice += onCodeReceived;
mainTimer.Enabled = false; mainTimer.Enabled = false;
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun); int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
...@@ -243,11 +232,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -243,11 +232,7 @@ namespace OnlineStore.DeviceLibrary
public override void Reset() public override void Reset()
{ {
Reset(true); Reset(true);
} }
/// <summary>
/// 复位
/// </summary>
/// <param name="isNeedClearAuto">是否需要清理自动出入库</param>
public void Reset(bool isNeedClearAuto) public void Reset(bool isNeedClearAuto)
{ {
CurrInOutCount = 0; CurrInOutCount = 0;
......
source/DeviceLibrary/lineConnect/LineConnect.cs
...@@ -15,6 +15,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,6 +15,10 @@ namespace OnlineStore.DeviceLibrary
{ {
string lineServer = ConfigAppSettings.GetValue(Setting_Init.LineServerIp); string lineServer = ConfigAppSettings.GetValue(Setting_Init.LineServerIp);
int linePort = ConfigAppSettings.GetIntValue(Setting_Init.LineServerPort); int linePort = ConfigAppSettings.GetIntValue(Setting_Init.LineServerPort);
if (lineServer.Equals(""))
{
return;
}
client = new TcpClient(); client = new TcpClient();
bool result = client.connect(lineServer, linePort, HandlerMsg,2000); bool result = client.connect(lineServer, linePort, HandlerMsg,2000);
...@@ -22,7 +26,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,7 +26,10 @@ namespace OnlineStore.DeviceLibrary
public static void StopConnect() public static void StopConnect()
{ {
client.close(); if (client != null)
{
client.close();
}
} }
private static int seq = 1; private static int seq = 1;
...@@ -39,6 +46,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,6 +46,10 @@ namespace OnlineStore.DeviceLibrary
public static void SendHeart(int id,string cid,int ss,int runs,string posid) public static void SendHeart(int id,string cid,int ss,int runs,string posid)
{ {
if (client == null)
{
return;
}
try try
{ {
string heartMsg = cmd_heart + cmd_spilt + id + cmd_spilt + cid + cmd_spilt + nextSeq() + cmd_spilt + ss + cmd_spilt + runs + cmd_spilt + posid + cmd_spilt+"\r"; string heartMsg = cmd_heart + cmd_spilt + id + cmd_spilt + cid + cmd_spilt + nextSeq() + cmd_spilt + ss + cmd_spilt + runs + cmd_spilt + posid + cmd_spilt+"\r";
...@@ -50,6 +61,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -50,6 +61,10 @@ namespace OnlineStore.DeviceLibrary
} }
public static void OutStoreEnd(int id, string cid, int ss, int runs, string posid, string plateH, string plateW) public static void OutStoreEnd(int id, string cid, int ss, int runs, string posid, string plateH, string plateW)
{ {
if (client == null)
{
return;
}
try try
{ {
string heartMsg = cmd_outend + cmd_spilt + id + cmd_spilt + cid + cmd_spilt + nextSeq() + cmd_spilt + ss + cmd_spilt + runs + cmd_spilt + posid + cmd_spilt; string heartMsg = cmd_outend + cmd_spilt + id + cmd_spilt + cid + cmd_spilt + nextSeq() + cmd_spilt + ss + cmd_spilt + runs + cmd_spilt + posid + cmd_spilt;
...@@ -82,7 +97,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -82,7 +97,6 @@ namespace OnlineStore.DeviceLibrary
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("HandlerMsg 出错：" + ex.ToString());
} }
} }
public static char cmd_spilt = ';'; public static char cmd_spilt = ';';
...@@ -92,7 +106,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -92,7 +106,15 @@ namespace OnlineStore.DeviceLibrary
public static bool IsConnect() public static bool IsConnect()
{ {
return true; if (client == null)
{
return false;
}
if (client.IsConnected())
{
return true;
}
return false ;
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!