Skip to content

刘韬 / SO775-DUOStore

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

1

1 个父辈 8b174bb9
内嵌 并排
正在显示 21 个修改的文件 包含 565 行增加 和 2299 行删除
source/Common/Setting_Init.cs
...@@ -11,7 +11,6 @@ namespace OnlineStore.Common ...@@ -11,7 +11,6 @@ namespace OnlineStore.Common
/// </summary> /// </summary>
public class Setting_Init public class Setting_Init
{ {
public static string Agv_Log_Open = "Agv_Log_Open";
public static string Server_Log_Open = "Server_Log_Open"; public static string Server_Log_Open = "Server_Log_Open";
/// <summary> /// <summary>
/// 系统启动时自动启动料仓，=1时自动启动，并隐藏窗口，=0时不需要 /// 系统启动时自动启动料仓，=1时自动启动，并隐藏窗口，=0时不需要
...@@ -21,8 +20,6 @@ namespace OnlineStore.Common ...@@ -21,8 +20,6 @@ namespace OnlineStore.Common
/// 系统主界面标题 /// 系统主界面标题
/// </summary> /// </summary>
public static string App_Title = "App_Title"; public static string App_Title = "App_Title";
public static string http_server = "http.server"; public static string http_server = "http.server";
public static string Store_CID = "Store_CID"; public static string Store_CID = "Store_CID";
...@@ -77,7 +74,6 @@ namespace OnlineStore.Common ...@@ -77,7 +74,6 @@ namespace OnlineStore.Common
/// </summary> /// </summary>
public static string HumitureControllerType = "HumitureControllerType"; public static string HumitureControllerType = "HumitureControllerType";
public static string UseAIOBOX = "UseAIOBOX";
public static string LineServerIp = "LineServerIp"; public static string LineServerIp = "LineServerIp";
public static string LineServerPort = "LineServerPort"; public static string LineServerPort = "LineServerPort";
...@@ -88,7 +84,6 @@ namespace OnlineStore.Common ...@@ -88,7 +84,6 @@ namespace OnlineStore.Common
public static string Store_ConfigPath = "Store_ConfigPath"; public static string Store_ConfigPath = "Store_ConfigPath";
public static string UseBuzzer = "UseBuzzer"; public static string UseBuzzer = "UseBuzzer";
public static string Shelf_Position_Config = "Shelf_Position_Config";
public static string Tool_P3_Offset = "Tool_P3_Offset"; public static string Tool_P3_Offset = "Tool_P3_Offset";
...@@ -99,11 +94,7 @@ namespace OnlineStore.Common ...@@ -99,11 +94,7 @@ namespace OnlineStore.Common
public static string Tool_TargetSpeed = "Tool_TargetSpeed"; public static string Tool_TargetSpeed = "Tool_TargetSpeed";
public static string Tool_TargetPosition = "Tool_TargetPosition"; public static string Tool_TargetPosition = "Tool_TargetPosition";
public static string AgvServerIp = "AgvServerIp";
public static string CodeCount = "CodeCount"; public static string CodeCount = "CodeCount";
public static string AutoShelfInstore = "AutoShelfInstore";
public static string UseDoor = "UseDoor";
public static string InoutDefaultPosition = "InoutDefaultPosition";
} }
} }
source/DUOStore/App.config
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）--> <!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
<add key="StopBlowValue" value="4" /> <add key="StopBlowValue" value="4" />
<!--Server address--> <!--Server address-->
<add key="http.server" value="http://10.85.160.25/myproject/" /> <!--<add key="http.server" value="http://10.85.160.25/myproject/" />-->
<!--storeType--> <!--storeType-->
<add key="store_count" value="2" /> <add key="store_count" value="2" />
<add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" /> <add key="Store_ConfigPath" value="\StoreConfig\StoreConfig.csv" />
<!--start one store config--> <!--start one store config-->
<add key="Shelf_Position_Config" value="\StoreConfig\shelfPosition.csv" />
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" /> <add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" />
<add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv" /> <add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_PA" /> <add key="Store_Type" value="RC_AC_PA" />
...@@ -26,7 +25,6 @@ ...@@ -26,7 +25,6 @@
<add key="Store_CID_2" value="duo-2" /> <add key="Store_CID_2" value="duo-2" />
<!--end one store config--> <!--end one store config-->
<add key="ACBaudRate" value="115200" /> <add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="52000" />
<add key="Config_Pwd" value="123456" /> <add key="Config_Pwd" value="123456" />
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code--> <!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="QR Code#Data Matrix ECC 200" /> <add key="CodeType" value="QR Code#Data Matrix ECC 200" />
...@@ -39,16 +37,11 @@ ...@@ -39,16 +37,11 @@
<add key="UseAIOBOX" value="1" /> <add key="UseAIOBOX" value="1" />
<add key="DIMS" value="60" /> <add key="DIMS" value="60" />
<add key="DOMS" value="300" /> <add key="DOMS" value="300" />
<!--流水线地址和端口配置-->
<add key="LineServerIp" value="192.168.101.11" />
<add key="LineServerPort" value="5246" />
<!--是否调试状态--> <!--是否调试状态-->
<add key="IsInDebug" value="1" /> <add key="IsInDebug" value="1" />
<add key="UseBuzzer" value="0" /> <add key="UseBuzzer" value="0" />
<!--IO模块是否主动上传--> <!--IO模块是否主动上传-->
<add key="AIOAutoUpload" value="0" /> <add key="AIOAutoUpload" value="0" />
<!--AGV调度服务器地址-->
<add key="AgvServerIp" value="10.85.160.20" />
<add key="CodeCount" value="3" /> <add key="CodeCount" value="3" />
<add key="Tool_P3_Offset" value="7000" /> <add key="Tool_P3_Offset" value="7000" />
<add key="Tool_P4_Offset" value="-2000" /> <add key="Tool_P4_Offset" value="-2000" />
...@@ -61,7 +54,7 @@ ...@@ -61,7 +54,7 @@
<add key="Agv_Log_Open" value="1" /> <add key="Agv_Log_Open" value="1" />
<add key="AutoShelfInstore" value="1" /> <add key="AutoShelfInstore" value="1" />
<!--进出轴位置--> <!--进出轴位置-->
<add key ="InoutDefaultPosition" value ="3000"/> <add key ="InOutDefaultPosition" value ="3000"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
...@@ -89,7 +82,7 @@ ...@@ -89,7 +82,7 @@
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
</logger> </logger>
<logger name="AIOBOX"> <logger name="AIOBOX">
<level value="Debug" /> <level value="Info" />
<appender-ref ref="AIOBOX" /> <appender-ref ref="AIOBOX" />
</logger> </logger>
<root> <root>
......
source/DUOStore/FrmAxisMove.Designer.cs
...@@ -51,9 +51,9 @@ namespace OnlineStore.DUOStore ...@@ -51,9 +51,9 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3 = new System.Windows.Forms.Button(); this.btnUpdownP3 = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox(); this.txtMiddleP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP3 = new System.Windows.Forms.Button(); this.btnMiddleP3 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.btnAxisOff = new System.Windows.Forms.Button(); this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button(); this.btnAxisOn = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -98,7 +98,7 @@ namespace OnlineStore.DUOStore ...@@ -98,7 +98,7 @@ namespace OnlineStore.DUOStore
// btnSaveP // btnSaveP
// //
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(51, 244); this.btnSaveP.Location = new System.Drawing.Point(21, 229);
this.btnSaveP.Name = "btnSaveP"; this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39); this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313; this.btnSaveP.TabIndex = 313;
...@@ -113,7 +113,7 @@ namespace OnlineStore.DUOStore ...@@ -113,7 +113,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP6.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP6.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP6.Location = new System.Drawing.Point(602, 223); this.txtUpdownP6.Location = new System.Drawing.Point(602, 238);
this.txtUpdownP6.MaxLength = 0; this.txtUpdownP6.MaxLength = 0;
this.txtUpdownP6.Name = "txtUpdownP6"; this.txtUpdownP6.Name = "txtUpdownP6";
this.txtUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -130,7 +130,7 @@ namespace OnlineStore.DUOStore ...@@ -130,7 +130,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP6.ForeColor = System.Drawing.Color.Green; this.btnUpdownP6.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP6.Location = new System.Drawing.Point(382, 218); this.btnUpdownP6.Location = new System.Drawing.Point(382, 233);
this.btnUpdownP6.Name = "btnUpdownP6"; this.btnUpdownP6.Name = "btnUpdownP6";
this.btnUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP6.Size = new System.Drawing.Size(205, 33); this.btnUpdownP6.Size = new System.Drawing.Size(205, 33);
...@@ -147,7 +147,7 @@ namespace OnlineStore.DUOStore ...@@ -147,7 +147,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP5.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP5.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP5.Location = new System.Drawing.Point(602, 185); this.txtUpdownP5.Location = new System.Drawing.Point(602, 197);
this.txtUpdownP5.MaxLength = 0; this.txtUpdownP5.MaxLength = 0;
this.txtUpdownP5.Name = "txtUpdownP5"; this.txtUpdownP5.Name = "txtUpdownP5";
this.txtUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -164,7 +164,7 @@ namespace OnlineStore.DUOStore ...@@ -164,7 +164,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP5.ForeColor = System.Drawing.Color.Green; this.btnUpdownP5.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP5.Location = new System.Drawing.Point(382, 180); this.btnUpdownP5.Location = new System.Drawing.Point(382, 192);
this.btnUpdownP5.Name = "btnUpdownP5"; this.btnUpdownP5.Name = "btnUpdownP5";
this.btnUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP5.Size = new System.Drawing.Size(205, 33); this.btnUpdownP5.Size = new System.Drawing.Size(205, 33);
...@@ -181,7 +181,7 @@ namespace OnlineStore.DUOStore ...@@ -181,7 +181,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP4.Location = new System.Drawing.Point(602, 147); this.txtUpdownP4.Location = new System.Drawing.Point(602, 156);
this.txtUpdownP4.MaxLength = 0; this.txtUpdownP4.MaxLength = 0;
this.txtUpdownP4.Name = "txtUpdownP4"; this.txtUpdownP4.Name = "txtUpdownP4";
this.txtUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -198,7 +198,7 @@ namespace OnlineStore.DUOStore ...@@ -198,7 +198,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP4.ForeColor = System.Drawing.Color.Green; this.btnUpdownP4.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP4.Location = new System.Drawing.Point(382, 142); this.btnUpdownP4.Location = new System.Drawing.Point(382, 151);
this.btnUpdownP4.Name = "btnUpdownP4"; this.btnUpdownP4.Name = "btnUpdownP4";
this.btnUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP4.Size = new System.Drawing.Size(205, 33); this.btnUpdownP4.Size = new System.Drawing.Size(205, 33);
...@@ -230,7 +230,7 @@ namespace OnlineStore.DUOStore ...@@ -230,7 +230,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(602, 71); this.txtUpdownP2.Location = new System.Drawing.Point(602, 74);
this.txtUpdownP2.MaxLength = 20; this.txtUpdownP2.MaxLength = 20;
this.txtUpdownP2.Name = "txtUpdownP2"; this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -245,7 +245,7 @@ namespace OnlineStore.DUOStore ...@@ -245,7 +245,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(222, 119); this.txtMiddleP1.Location = new System.Drawing.Point(228, 115);
this.txtMiddleP1.MaxLength = 20; this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -260,7 +260,7 @@ namespace OnlineStore.DUOStore ...@@ -260,7 +260,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBatchP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBatchP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP1.Location = new System.Drawing.Point(222, 34); this.txtBatchP1.Location = new System.Drawing.Point(228, 34);
this.txtBatchP1.MaxLength = 20; this.txtBatchP1.MaxLength = 20;
this.txtBatchP1.Name = "txtBatchP1"; this.txtBatchP1.Name = "txtBatchP1";
this.txtBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -275,7 +275,7 @@ namespace OnlineStore.DUOStore ...@@ -275,7 +275,7 @@ namespace OnlineStore.DUOStore
this.txtBatchP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtBatchP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtBatchP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP2.Location = new System.Drawing.Point(222, 73); this.txtBatchP2.Location = new System.Drawing.Point(228, 73);
this.txtBatchP2.MaxLength = 20; this.txtBatchP2.MaxLength = 20;
this.txtBatchP2.Name = "txtBatchP2"; this.txtBatchP2.Name = "txtBatchP2";
this.txtBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -290,7 +290,7 @@ namespace OnlineStore.DUOStore ...@@ -290,7 +290,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(222, 158); this.txtMiddleP2.Location = new System.Drawing.Point(228, 154);
this.txtMiddleP2.MaxLength = 20; this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -326,7 +326,7 @@ namespace OnlineStore.DUOStore ...@@ -326,7 +326,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.Green; this.btnUpdownP2.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(382, 66); this.btnUpdownP2.Location = new System.Drawing.Point(382, 69);
this.btnUpdownP2.Name = "btnUpdownP2"; this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(205, 33); this.btnUpdownP2.Size = new System.Drawing.Size(205, 33);
...@@ -345,7 +345,7 @@ namespace OnlineStore.DUOStore ...@@ -345,7 +345,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(15, 113); this.btnMiddleP1.Location = new System.Drawing.Point(21, 109);
this.btnMiddleP1.Name = "btnMiddleP1"; this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(193, 33); this.btnMiddleP1.Size = new System.Drawing.Size(193, 33);
...@@ -364,7 +364,7 @@ namespace OnlineStore.DUOStore ...@@ -364,7 +364,7 @@ namespace OnlineStore.DUOStore
this.btnBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP1.ForeColor = System.Drawing.Color.Red; this.btnBatchP1.ForeColor = System.Drawing.Color.Red;
this.btnBatchP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnBatchP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP1.Location = new System.Drawing.Point(15, 28); this.btnBatchP1.Location = new System.Drawing.Point(21, 28);
this.btnBatchP1.Name = "btnBatchP1"; this.btnBatchP1.Name = "btnBatchP1";
this.btnBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP1.Size = new System.Drawing.Size(193, 33); this.btnBatchP1.Size = new System.Drawing.Size(193, 33);
...@@ -383,7 +383,7 @@ namespace OnlineStore.DUOStore ...@@ -383,7 +383,7 @@ namespace OnlineStore.DUOStore
this.btnBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP2.ForeColor = System.Drawing.Color.Red; this.btnBatchP2.ForeColor = System.Drawing.Color.Red;
this.btnBatchP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnBatchP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.Location = new System.Drawing.Point(15, 67); this.btnBatchP2.Location = new System.Drawing.Point(21, 67);
this.btnBatchP2.Name = "btnBatchP2"; this.btnBatchP2.Name = "btnBatchP2";
this.btnBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP2.Size = new System.Drawing.Size(193, 33); this.btnBatchP2.Size = new System.Drawing.Size(193, 33);
...@@ -401,7 +401,7 @@ namespace OnlineStore.DUOStore ...@@ -401,7 +401,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(15, 152); this.btnMiddleP2.Location = new System.Drawing.Point(21, 148);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(193, 33); this.btnMiddleP2.Size = new System.Drawing.Size(193, 33);
...@@ -418,7 +418,7 @@ namespace OnlineStore.DUOStore ...@@ -418,7 +418,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP3.Location = new System.Drawing.Point(602, 109); this.txtUpdownP3.Location = new System.Drawing.Point(602, 115);
this.txtUpdownP3.MaxLength = 0; this.txtUpdownP3.MaxLength = 0;
this.txtUpdownP3.Name = "txtUpdownP3"; this.txtUpdownP3.Name = "txtUpdownP3";
this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -435,7 +435,7 @@ namespace OnlineStore.DUOStore ...@@ -435,7 +435,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP3.ForeColor = System.Drawing.Color.Green; this.btnUpdownP3.ForeColor = System.Drawing.Color.Green;
this.btnUpdownP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP3.Location = new System.Drawing.Point(382, 104); this.btnUpdownP3.Location = new System.Drawing.Point(382, 110);
this.btnUpdownP3.Name = "btnUpdownP3"; this.btnUpdownP3.Name = "btnUpdownP3";
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(205, 33); this.btnUpdownP3.Size = new System.Drawing.Size(205, 33);
...@@ -452,7 +452,7 @@ namespace OnlineStore.DUOStore ...@@ -452,7 +452,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP3.Location = new System.Drawing.Point(222, 197); this.txtMiddleP3.Location = new System.Drawing.Point(228, 193);
this.txtMiddleP3.MaxLength = 0; this.txtMiddleP3.MaxLength = 0;
this.txtMiddleP3.Name = "txtMiddleP3"; this.txtMiddleP3.Name = "txtMiddleP3";
this.txtMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -469,7 +469,7 @@ namespace OnlineStore.DUOStore ...@@ -469,7 +469,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.Location = new System.Drawing.Point(15, 191); this.btnMiddleP3.Location = new System.Drawing.Point(21, 187);
this.btnMiddleP3.Name = "btnMiddleP3"; this.btnMiddleP3.Name = "btnMiddleP3";
this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP3.Size = new System.Drawing.Size(193, 33); this.btnMiddleP3.Size = new System.Drawing.Size(193, 33);
...@@ -479,14 +479,6 @@ namespace OnlineStore.DUOStore ...@@ -479,14 +479,6 @@ namespace OnlineStore.DUOStore
this.btnMiddleP3.UseVisualStyleBackColor = false; this.btnMiddleP3.UseVisualStyleBackColor = false;
this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click); this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click);
// //
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 312);
this.axisMoveControl1.TabIndex = 274;
//
// btnAxisOff // btnAxisOff
// //
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -509,6 +501,14 @@ namespace OnlineStore.DUOStore ...@@ -509,6 +501,14 @@ namespace OnlineStore.DUOStore
this.btnAxisOn.UseVisualStyleBackColor = true; this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.btnAxisOn_Click); this.btnAxisOn.Click += new System.EventHandler(this.btnAxisOn_Click);
// //
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 312);
this.axisMoveControl1.TabIndex = 274;
//
// FrmAxisMove // FrmAxisMove
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/DUOStore/FrmBox.Designer.cs
...@@ -27,15 +27,16 @@ namespace OnlineStore.DUOStore ...@@ -27,15 +27,16 @@ namespace OnlineStore.DUOStore
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBox)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBox));
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnUpdown = new System.Windows.Forms.Button(); this.chbDebug = new System.Windows.Forms.CheckBox();
this.btnAxisOff = new System.Windows.Forms.Button(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.btnAxisOn = new System.Windows.Forms.Button(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.btnAxisP = new System.Windows.Forms.Button(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.btnStoreStart = new System.Windows.Forms.Button(); this.lblTemp = new System.Windows.Forms.Label();
this.btnStoreStop = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnSotreReset = new System.Windows.Forms.Button(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.btnAxisP = new System.Windows.Forms.Button();
this.btnDoorDown = new System.Windows.Forms.Button(); this.btnDoorDown = new System.Windows.Forms.Button();
this.btnDoorUp = new System.Windows.Forms.Button(); this.btnDoorUp = new System.Windows.Forms.Button();
this.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
...@@ -86,6 +87,7 @@ namespace OnlineStore.DUOStore ...@@ -86,6 +87,7 @@ namespace OnlineStore.DUOStore
this.btnInStore = new System.Windows.Forms.Button(); this.btnInStore = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button(); this.btnOutStore = new System.Windows.Forms.Button();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnUpdown = new System.Windows.Forms.Button();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnSelTemp = new System.Windows.Forms.Button(); this.btnSelTemp = new System.Windows.Forms.Button();
this.txtHum = new System.Windows.Forms.TextBox(); this.txtHum = new System.Windows.Forms.TextBox();
...@@ -96,25 +98,23 @@ namespace OnlineStore.DUOStore ...@@ -96,25 +98,23 @@ namespace OnlineStore.DUOStore
this.label27 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label();
this.btnTempClose = new System.Windows.Forms.Button(); this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.btnTempInit = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl(); this.btnAxisOff = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox(); this.btnAxisOn = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTemp = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblMoveEquipInfo = new System.Windows.Forms.Label(); this.lblMoveEquipInfo = new System.Windows.Forms.Label();
this.btnSotreReset = new System.Windows.Forms.Button();
this.btnStoreStop = new System.Windows.Forms.Button();
this.btnStoreStart = new System.Windows.Forms.Button();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label(); this.lblThisSta = new System.Windows.Forms.Label();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -123,82 +123,92 @@ namespace OnlineStore.DUOStore ...@@ -123,82 +123,92 @@ namespace OnlineStore.DUOStore
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// btnUpdown // chbDebug
// //
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdown.Location = new System.Drawing.Point(555, 416); this.chbDebug.AutoSize = true;
this.btnUpdown.Name = "btnUpdown"; this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdown.Size = new System.Drawing.Size(128, 39); this.chbDebug.Location = new System.Drawing.Point(14, 568);
this.btnUpdown.TabIndex = 273; this.chbDebug.Name = "chbDebug";
this.btnUpdown.Text = "升降轴位置调试"; this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.btnUpdown.UseVisualStyleBackColor = true; this.chbDebug.TabIndex = 271;
this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click); this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
// //
// btnAxisOff // lblMoveInfo
// //
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.lblMoveInfo.AutoSize = true;
this.btnAxisOff.Location = new System.Drawing.Point(555, 371); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOff.Name = "btnAxisOff"; this.lblMoveInfo.Location = new System.Drawing.Point(13, 399);
this.btnAxisOff.Size = new System.Drawing.Size(128, 39); this.lblMoveInfo.Name = "lblMoveInfo";
this.btnAxisOff.TabIndex = 11; this.lblMoveInfo.Size = new System.Drawing.Size(56, 17);
this.btnAxisOff.Text = "关闭所有伺服"; this.lblMoveInfo.TabIndex = 269;
this.btnAxisOff.UseVisualStyleBackColor = true; this.lblMoveInfo.Text = "运转状态";
this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
// //
// btnAxisOn // groupBox4
// //
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.btnAxisOn.Location = new System.Drawing.Point(555, 326); this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOn.Name = "btnAxisOn"; this.groupBox4.Location = new System.Drawing.Point(8, 112);
this.btnAxisOn.Size = new System.Drawing.Size(128, 39); this.groupBox4.Name = "groupBox4";
this.btnAxisOn.TabIndex = 10; this.groupBox4.Size = new System.Drawing.Size(225, 193);
this.btnAxisOn.Text = "打开所有伺服"; this.groupBox4.TabIndex = 270;
this.btnAxisOn.UseVisualStyleBackColor = true; this.groupBox4.TabStop = false;
this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click); this.groupBox4.Text = "DO列表";
// //
// btnAxisP // tableLayoutPanel2
// //
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.btnAxisP.Location = new System.Drawing.Point(229, 420); | System.Windows.Forms.AnchorStyles.Left)
this.btnAxisP.Name = "btnAxisP"; | System.Windows.Forms.AnchorStyles.Right)));
this.btnAxisP.Size = new System.Drawing.Size(128, 39); this.tableLayoutPanel2.ColumnCount = 1;
this.btnAxisP.TabIndex = 8; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.btnAxisP.Text = "轴卡点动"; this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.btnAxisP.UseVisualStyleBackColor = true; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.btnAxisP.Click += new System.EventHandler(this.btnAxisP_Click); this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel2.TabIndex = 103;
// //
// btnStoreStart // lblTemp
// //
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.lblTemp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStoreStart.Location = new System.Drawing.Point(9, 25); this.lblTemp.AutoSize = true;
this.btnStoreStart.Name = "btnStoreStart"; this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStart.Size = new System.Drawing.Size(128, 39); this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.btnStoreStart.TabIndex = 0; this.lblTemp.Location = new System.Drawing.Point(-154, 593);
this.btnStoreStart.Text = "启动调试"; this.lblTemp.Name = "lblTemp";
this.btnStoreStart.UseVisualStyleBackColor = true; this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.btnStoreStart.Click += new System.EventHandler(this.btnStoreStart_Click); this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--";
// //
// btnStoreStop // groupBox1
// //
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.btnStoreStop.Location = new System.Drawing.Point(141, 25); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStop.Name = "btnStoreStop"; this.groupBox1.Location = new System.Drawing.Point(8, 311);
this.btnStoreStop.Size = new System.Drawing.Size(128, 39); this.groupBox1.Name = "groupBox1";
this.btnStoreStop.TabIndex = 1; this.groupBox1.Size = new System.Drawing.Size(225, 193);
this.btnStoreStop.Text = "停止"; this.groupBox1.TabIndex = 269;
this.btnStoreStop.UseVisualStyleBackColor = true; this.groupBox1.TabStop = false;
this.btnStoreStop.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click); this.groupBox1.Text = "DI列表";
// //
// btnSotreReset // tableLayoutPanel1
// //
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.btnSotreReset.Location = new System.Drawing.Point(273, 25); | System.Windows.Forms.AnchorStyles.Left)
this.btnSotreReset.Name = "btnSotreReset"; | System.Windows.Forms.AnchorStyles.Right)));
this.btnSotreReset.Size = new System.Drawing.Size(128, 39); this.tableLayoutPanel1.ColumnCount = 1;
this.btnSotreReset.TabIndex = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.btnSotreReset.Text = "复位"; this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.btnSotreReset.UseVisualStyleBackColor = true; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.btnSotreReset.Click += new System.EventHandler(this.btnSotreReset_Click); this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel1.TabIndex = 102;
// //
// tabControl1 // tabControl1
// //
...@@ -215,9 +225,7 @@ namespace OnlineStore.DUOStore ...@@ -215,9 +225,7 @@ namespace OnlineStore.DUOStore
// //
// tabPage4 // tabPage4
// //
this.tabPage4.Controls.Add(this.btnAxisP); this.tabPage4.Controls.Add(this.lblMoveInfo);
this.tabPage4.Controls.Add(this.btnDoorDown);
this.tabPage4.Controls.Add(this.btnDoorUp);
this.tabPage4.Controls.Add(this.groupInout); this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Location = new System.Drawing.Point(4, 29); this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
...@@ -226,11 +234,22 @@ namespace OnlineStore.DUOStore ...@@ -226,11 +234,22 @@ namespace OnlineStore.DUOStore
this.tabPage4.Text = " 库位信息 "; this.tabPage4.Text = " 库位信息 ";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
// //
// btnAxisP
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(538, 321);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(128, 39);
this.btnAxisP.TabIndex = 8;
this.btnAxisP.Text = "轴卡点动";
this.btnAxisP.UseVisualStyleBackColor = true;
this.btnAxisP.Click += new System.EventHandler(this.btnAxisP_Click);
//
// btnDoorDown // btnDoorDown
// //
this.btnDoorDown.BackColor = System.Drawing.Color.White; this.btnDoorDown.BackColor = System.Drawing.Color.White;
this.btnDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorDown.Location = new System.Drawing.Point(116, 420); this.btnDoorDown.Location = new System.Drawing.Point(121, 510);
this.btnDoorDown.Name = "btnDoorDown"; this.btnDoorDown.Name = "btnDoorDown";
this.btnDoorDown.Size = new System.Drawing.Size(107, 39); this.btnDoorDown.Size = new System.Drawing.Size(107, 39);
this.btnDoorDown.TabIndex = 272; this.btnDoorDown.TabIndex = 272;
...@@ -242,7 +261,7 @@ namespace OnlineStore.DUOStore ...@@ -242,7 +261,7 @@ namespace OnlineStore.DUOStore
// //
this.btnDoorUp.BackColor = System.Drawing.Color.White; this.btnDoorUp.BackColor = System.Drawing.Color.White;
this.btnDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorUp.Location = new System.Drawing.Point(3, 420); this.btnDoorUp.Location = new System.Drawing.Point(13, 510);
this.btnDoorUp.Name = "btnDoorUp"; this.btnDoorUp.Name = "btnDoorUp";
this.btnDoorUp.Size = new System.Drawing.Size(107, 39); this.btnDoorUp.Size = new System.Drawing.Size(107, 39);
this.btnDoorUp.TabIndex = 271; this.btnDoorUp.TabIndex = 271;
...@@ -254,6 +273,7 @@ namespace OnlineStore.DUOStore ...@@ -254,6 +273,7 @@ namespace OnlineStore.DUOStore
// //
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupInout.Controls.Add(this.btnAxisP);
this.groupInout.Controls.Add(this.btnSingleOut); this.groupInout.Controls.Add(this.btnSingleOut);
this.groupInout.Controls.Add(this.txtComP1); this.groupInout.Controls.Add(this.txtComP1);
this.groupInout.Controls.Add(this.txtInOutP2); this.groupInout.Controls.Add(this.txtInOutP2);
...@@ -303,7 +323,7 @@ namespace OnlineStore.DUOStore ...@@ -303,7 +323,7 @@ namespace OnlineStore.DUOStore
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(6, 3); this.groupInout.Location = new System.Drawing.Point(6, 3);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(822, 404); this.groupInout.Size = new System.Drawing.Size(822, 390);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -327,7 +347,7 @@ namespace OnlineStore.DUOStore ...@@ -327,7 +347,7 @@ namespace OnlineStore.DUOStore
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(392, 267); this.txtComP1.Location = new System.Drawing.Point(398, 267);
this.txtComP1.MaxLength = 20; this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -372,7 +392,7 @@ namespace OnlineStore.DUOStore ...@@ -372,7 +392,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(150, 267); this.txtMiddleP1.Location = new System.Drawing.Point(156, 267);
this.txtMiddleP1.MaxLength = 20; this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -387,7 +407,7 @@ namespace OnlineStore.DUOStore ...@@ -387,7 +407,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(150, 112); this.txtUpDownP1.Location = new System.Drawing.Point(156, 112);
this.txtUpDownP1.MaxLength = 20; this.txtUpDownP1.MaxLength = 20;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -402,7 +422,7 @@ namespace OnlineStore.DUOStore ...@@ -402,7 +422,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP2.Location = new System.Drawing.Point(150, 149); this.txtUpDownP2.Location = new System.Drawing.Point(156, 149);
this.txtUpDownP2.MaxLength = 20; this.txtUpDownP2.MaxLength = 20;
this.txtUpDownP2.Name = "txtUpDownP2"; this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -417,7 +437,7 @@ namespace OnlineStore.DUOStore ...@@ -417,7 +437,7 @@ namespace OnlineStore.DUOStore
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(391, 342); this.txtComP3.Location = new System.Drawing.Point(397, 342);
this.txtComP3.MaxLength = 20; this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -432,7 +452,7 @@ namespace OnlineStore.DUOStore ...@@ -432,7 +452,7 @@ namespace OnlineStore.DUOStore
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(391, 305); this.txtComP2.Location = new System.Drawing.Point(397, 305);
this.txtComP2.MaxLength = 20; this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -462,7 +482,7 @@ namespace OnlineStore.DUOStore ...@@ -462,7 +482,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(149, 306); this.txtMiddleP2.Location = new System.Drawing.Point(155, 306);
this.txtMiddleP2.MaxLength = 20; this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -477,7 +497,7 @@ namespace OnlineStore.DUOStore ...@@ -477,7 +497,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(391, 186); this.txtUpDownP5.Location = new System.Drawing.Point(397, 186);
this.txtUpDownP5.MaxLength = 20; this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -492,7 +512,7 @@ namespace OnlineStore.DUOStore ...@@ -492,7 +512,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(391, 223); this.txtUpDownP6.Location = new System.Drawing.Point(397, 223);
this.txtUpDownP6.MaxLength = 20; this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -507,7 +527,7 @@ namespace OnlineStore.DUOStore ...@@ -507,7 +527,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(391, 112); this.txtUpDownP3.Location = new System.Drawing.Point(397, 112);
this.txtUpDownP3.MaxLength = 20; this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -522,7 +542,7 @@ namespace OnlineStore.DUOStore ...@@ -522,7 +542,7 @@ namespace OnlineStore.DUOStore
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(391, 149); this.txtUpDownP4.Location = new System.Drawing.Point(397, 149);
this.txtUpDownP4.MaxLength = 20; this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -539,7 +559,7 @@ namespace OnlineStore.DUOStore ...@@ -539,7 +559,7 @@ namespace OnlineStore.DUOStore
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple; this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(248, 262); this.btnComP1.Location = new System.Drawing.Point(254, 262);
this.btnComP1.Name = "btnComP1"; this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(140, 33); this.btnComP1.Size = new System.Drawing.Size(140, 33);
...@@ -596,7 +616,7 @@ namespace OnlineStore.DUOStore ...@@ -596,7 +616,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(6, 262); this.btnMiddleP1.Location = new System.Drawing.Point(12, 262);
this.btnMiddleP1.Name = "btnMiddleP1"; this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 33); this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
...@@ -615,7 +635,7 @@ namespace OnlineStore.DUOStore ...@@ -615,7 +635,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red; this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(6, 107); this.btnUpDownP1.Location = new System.Drawing.Point(12, 107);
this.btnUpDownP1.Name = "btnUpDownP1"; this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(140, 33); this.btnUpDownP1.Size = new System.Drawing.Size(140, 33);
...@@ -634,7 +654,7 @@ namespace OnlineStore.DUOStore ...@@ -634,7 +654,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red; this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(6, 144); this.btnUpDownP2.Location = new System.Drawing.Point(12, 144);
this.btnUpDownP2.Name = "btnUpDownP2"; this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(140, 33); this.btnUpDownP2.Size = new System.Drawing.Size(140, 33);
...@@ -652,7 +672,7 @@ namespace OnlineStore.DUOStore ...@@ -652,7 +672,7 @@ namespace OnlineStore.DUOStore
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple; this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(248, 337); this.btnComP3.Location = new System.Drawing.Point(254, 337);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(140, 33); this.btnComP3.Size = new System.Drawing.Size(140, 33);
...@@ -670,7 +690,7 @@ namespace OnlineStore.DUOStore ...@@ -670,7 +690,7 @@ namespace OnlineStore.DUOStore
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple; this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(248, 300); this.btnComP2.Location = new System.Drawing.Point(254, 300);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(140, 33); this.btnComP2.Size = new System.Drawing.Size(140, 33);
...@@ -706,7 +726,7 @@ namespace OnlineStore.DUOStore ...@@ -706,7 +726,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(6, 301); this.btnMiddleP2.Location = new System.Drawing.Point(12, 301);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33); this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
...@@ -724,7 +744,7 @@ namespace OnlineStore.DUOStore ...@@ -724,7 +744,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red; this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(248, 181); this.btnUpDownP5.Location = new System.Drawing.Point(254, 181);
this.btnUpDownP5.Name = "btnUpDownP5"; this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(140, 33); this.btnUpDownP5.Size = new System.Drawing.Size(140, 33);
...@@ -742,7 +762,7 @@ namespace OnlineStore.DUOStore ...@@ -742,7 +762,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red; this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(248, 218); this.btnUpDownP6.Location = new System.Drawing.Point(254, 218);
this.btnUpDownP6.Name = "btnUpDownP6"; this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(140, 33); this.btnUpDownP6.Size = new System.Drawing.Size(140, 33);
...@@ -760,7 +780,7 @@ namespace OnlineStore.DUOStore ...@@ -760,7 +780,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red; this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(248, 107); this.btnUpDownP3.Location = new System.Drawing.Point(254, 107);
this.btnUpDownP3.Name = "btnUpDownP3"; this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(140, 33); this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
...@@ -778,7 +798,7 @@ namespace OnlineStore.DUOStore ...@@ -778,7 +798,7 @@ namespace OnlineStore.DUOStore
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red; this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(248, 144); this.btnUpDownP4.Location = new System.Drawing.Point(254, 144);
this.btnUpDownP4.Name = "btnUpDownP4"; this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(140, 33); this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
...@@ -805,7 +825,7 @@ namespace OnlineStore.DUOStore ...@@ -805,7 +825,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP11.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP11.Location = new System.Drawing.Point(150, 186); this.txtUpdownP11.Location = new System.Drawing.Point(156, 186);
this.txtUpdownP11.MaxLength = 0; this.txtUpdownP11.MaxLength = 0;
this.txtUpdownP11.Name = "txtUpdownP11"; this.txtUpdownP11.Name = "txtUpdownP11";
this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -820,7 +840,7 @@ namespace OnlineStore.DUOStore ...@@ -820,7 +840,7 @@ namespace OnlineStore.DUOStore
this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP12.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(150, 223); this.txtUpdownP12.Location = new System.Drawing.Point(156, 223);
this.txtUpdownP12.MaxLength = 0; this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12"; this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -871,7 +891,7 @@ namespace OnlineStore.DUOStore ...@@ -871,7 +891,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP12.ForeColor = System.Drawing.Color.Red; this.btnUpdownP12.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.Location = new System.Drawing.Point(6, 218); this.btnUpdownP12.Location = new System.Drawing.Point(12, 218);
this.btnUpdownP12.Name = "btnUpdownP12"; this.btnUpdownP12.Name = "btnUpdownP12";
this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP12.Size = new System.Drawing.Size(140, 33); this.btnUpdownP12.Size = new System.Drawing.Size(140, 33);
...@@ -888,7 +908,7 @@ namespace OnlineStore.DUOStore ...@@ -888,7 +908,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP11.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(149, 345); this.txtMiddleP11.Location = new System.Drawing.Point(155, 345);
this.txtMiddleP11.MaxLength = 0; this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11"; this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -905,7 +925,7 @@ namespace OnlineStore.DUOStore ...@@ -905,7 +925,7 @@ namespace OnlineStore.DUOStore
this.btnUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP11.ForeColor = System.Drawing.Color.Red; this.btnUpdownP11.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.Location = new System.Drawing.Point(6, 181); this.btnUpdownP11.Location = new System.Drawing.Point(12, 181);
this.btnUpdownP11.Name = "btnUpdownP11"; this.btnUpdownP11.Name = "btnUpdownP11";
this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP11.Size = new System.Drawing.Size(140, 33); this.btnUpdownP11.Size = new System.Drawing.Size(140, 33);
...@@ -924,7 +944,7 @@ namespace OnlineStore.DUOStore ...@@ -924,7 +944,7 @@ namespace OnlineStore.DUOStore
this.btnMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(6, 340); this.btnMiddleP11.Location = new System.Drawing.Point(12, 340);
this.btnMiddleP11.Name = "btnMiddleP11"; this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(140, 33); this.btnMiddleP11.Size = new System.Drawing.Size(140, 33);
...@@ -1030,9 +1050,9 @@ namespace OnlineStore.DUOStore ...@@ -1030,9 +1050,9 @@ namespace OnlineStore.DUOStore
// //
this.tabPage1.Controls.Add(this.btnUpdown); this.tabPage1.Controls.Add(this.btnUpdown);
this.tabPage1.Controls.Add(this.groupBox7); this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Controls.Add(this.btnAxisOff); this.tabPage1.Controls.Add(this.btnAxisOff);
this.tabPage1.Controls.Add(this.btnAxisOn); this.tabPage1.Controls.Add(this.btnAxisOn);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
...@@ -1041,6 +1061,17 @@ namespace OnlineStore.DUOStore ...@@ -1041,6 +1061,17 @@ namespace OnlineStore.DUOStore
this.tabPage1.Text = " 伺服/温湿度 "; this.tabPage1.Text = " 伺服/温湿度 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// btnUpdown
//
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(555, 416);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(128, 39);
this.btnUpdown.TabIndex = 273;
this.btnUpdown.Text = "升降轴位置调试";
this.btnUpdown.UseVisualStyleBackColor = true;
this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click);
//
// groupBox7 // groupBox7
// //
this.groupBox7.Controls.Add(this.btnSelTemp); this.groupBox7.Controls.Add(this.btnSelTemp);
...@@ -1155,100 +1186,27 @@ namespace OnlineStore.DUOStore ...@@ -1155,100 +1186,27 @@ namespace OnlineStore.DUOStore
this.btnTempInit.UseVisualStyleBackColor = true; this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click); this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
// //
// axisMoveControl1 // btnAxisOff
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(7, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.TabIndex = 0;
//
// chbDebug
//
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(143, 510);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(20, 531);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(56, 17);
this.lblMoveInfo.TabIndex = 269;
this.lblMoveInfo.Text = "运转状态";
//
// lblTemp
//
this.lblTemp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(-154, 593);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--";
//
// groupBox4
//
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(8, 112);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(225, 193);
this.groupBox4.TabIndex = 270;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox1
// //
this.groupBox1.Controls.Add(this.tableLayoutPanel1); this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisOff.Location = new System.Drawing.Point(555, 371);
this.groupBox1.Location = new System.Drawing.Point(8, 311); this.btnAxisOff.Name = "btnAxisOff";
this.groupBox1.Name = "groupBox1"; this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.groupBox1.Size = new System.Drawing.Size(225, 193); this.btnAxisOff.TabIndex = 11;
this.groupBox1.TabIndex = 269; this.btnAxisOff.Text = "关闭所有伺服";
this.groupBox1.TabStop = false; this.btnAxisOff.UseVisualStyleBackColor = true;
this.groupBox1.Text = "DI列表"; this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
// //
// tableLayoutPanel1 // btnAxisOn
// //
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
| System.Windows.Forms.AnchorStyles.Left) this.btnAxisOn.Location = new System.Drawing.Point(555, 326);
| System.Windows.Forms.AnchorStyles.Right))); this.btnAxisOn.Name = "btnAxisOn";
this.tableLayoutPanel1.ColumnCount = 1; this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.btnAxisOn.TabIndex = 10;
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14); this.btnAxisOn.Text = "打开所有伺服";
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.btnAxisOn.UseVisualStyleBackColor = true;
this.tableLayoutPanel1.RowCount = 2; this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(214, 173);
this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox3 // groupBox3
// //
...@@ -1272,12 +1230,45 @@ namespace OnlineStore.DUOStore ...@@ -1272,12 +1230,45 @@ namespace OnlineStore.DUOStore
this.lblMoveEquipInfo.AutoSize = true; this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Blue;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(138, 75); this.lblMoveEquipInfo.Location = new System.Drawing.Point(270, 73);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(56, 17); this.lblMoveEquipInfo.Size = new System.Drawing.Size(56, 17);
this.lblMoveEquipInfo.TabIndex = 272; this.lblMoveEquipInfo.TabIndex = 272;
this.lblMoveEquipInfo.Text = "移栽状态"; this.lblMoveEquipInfo.Text = "移栽状态";
// //
// btnSotreReset
//
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSotreReset.Location = new System.Drawing.Point(273, 25);
this.btnSotreReset.Name = "btnSotreReset";
this.btnSotreReset.Size = new System.Drawing.Size(128, 39);
this.btnSotreReset.TabIndex = 2;
this.btnSotreReset.Text = "复位";
this.btnSotreReset.UseVisualStyleBackColor = true;
this.btnSotreReset.Click += new System.EventHandler(this.btnSotreReset_Click);
//
// btnStoreStop
//
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Location = new System.Drawing.Point(141, 25);
this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(128, 39);
this.btnStoreStop.TabIndex = 1;
this.btnStoreStop.Text = "停止";
this.btnStoreStop.UseVisualStyleBackColor = true;
this.btnStoreStop.Click += new System.EventHandler(this.停止ToolStripMenuItem_Click);
//
// btnStoreStart
//
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Location = new System.Drawing.Point(9, 25);
this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(128, 39);
this.btnStoreStart.TabIndex = 0;
this.btnStoreStart.Text = "启动调试";
this.btnStoreStart.UseVisualStyleBackColor = true;
this.btnStoreStart.Click += new System.EventHandler(this.btnStoreStart_Click);
//
// lblWarnMsg // lblWarnMsg
// //
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -1295,22 +1286,31 @@ namespace OnlineStore.DUOStore ...@@ -1295,22 +1286,31 @@ namespace OnlineStore.DUOStore
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(6, 75); this.lblThisSta.Location = new System.Drawing.Point(138, 72);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19); this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
// //
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(7, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.TabIndex = 0;
//
// FrmBox // FrmBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1084, 623); this.ClientSize = new System.Drawing.Size(1084, 623);
this.Controls.Add(this.chbDebug);
this.Controls.Add(this.lblMoveInfo);
this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox4);
this.Controls.Add(this.chbDebug);
this.Controls.Add(this.lblTemp); this.Controls.Add(this.lblTemp);
this.Controls.Add(this.btnDoorDown);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnDoorUp);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -1321,15 +1321,16 @@ namespace OnlineStore.DUOStore ...@@ -1321,15 +1321,16 @@ namespace OnlineStore.DUOStore
this.Text = "AC_SA_料仓"; this.Text = "AC_SA_料仓";
this.Load += new System.EventHandler(this.FrmTest_Load); this.Load += new System.EventHandler(this.FrmTest_Load);
this.Shown += new System.EventHandler(this.FrmStoreBox_Shown); this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
this.groupBox4.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false); this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.groupInout.ResumeLayout(false); this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout(); this.groupInout.PerformLayout();
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout(); this.groupBox3.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
......
source/DUOStore/FrmBox.cs
...@@ -117,7 +117,7 @@ namespace OnlineStore.DUOStore ...@@ -117,7 +117,7 @@ namespace OnlineStore.DUOStore
} }
// lblTemp.Text = BoxBean.humBean.currTempStr; // lblTemp.Text = BoxBean.humBean.currTempStr;
lblWarnMsg.Text = BoxBean.GetWarnMsg(); lblWarnMsg.Text = BoxBean.WarnMsg;
lblMoveInfo.Text = BoxBean.GetMoveStr(); lblMoveInfo.Text = BoxBean.GetMoveStr();
if (BoxBean.MoveInfo.MoveType.Equals(MoveType.InStore)) if (BoxBean.MoveInfo.MoveType.Equals(MoveType.InStore))
{ {
...@@ -545,21 +545,21 @@ namespace OnlineStore.DUOStore ...@@ -545,21 +545,21 @@ namespace OnlineStore.DUOStore
} }
else else
{ {
//DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo); DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo);
//if (res.Equals(DialogResult.Yes) && cmbPosition.SelectedIndex >= 0) if (res.Equals(DialogResult.Yes) && cmbPosition.SelectedIndex >= 0)
//{ {
// int jiange = FormUtil.GetIntValue(txtJiange); int jiange = FormUtil.GetIntValue(txtJiange);
// int currIndex = cmbPosition.SelectedIndex; int currIndex = cmbPosition.SelectedIndex;
// BoxBean.AutoInout.StartAuto(jiange, currIndex, cmbShelfPosition.Text); BoxBean.AutoInout.StartAuto(jiange, currIndex);
// string poText = cmbPosition.Text; string poText = cmbPosition.Text;
// BoxBean.AutoInout.autoMsg = "自动出库：" + poText; BoxBean.AutoInout.autoMsg = "自动出库：" + poText;
// LogUtil.info(BoxBean.Name + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！"); LogUtil.info(BoxBean.Name + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
// //BoxBean.StartOutStoreMove(new InOutStoreParam("", poText)); //BoxBean.StartOutStoreMove(new InOutStoreParam("", poText));
// BoxBean.StartInStoreMove(new InOutParam("", poText, cmbShelfPosition.Text)); BoxBean.StartInStoreMove(new InOutParam("", poText));
// btnStartAuTo.Text = "停止自动出入库"; btnStartAuTo.Text = "停止自动出入库";
//} }
} }
} }
else else
......
source/DUOStore/FrmIOStatus.Designer.cs
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnCloseAll = new System.Windows.Forms.Button(); this.btnCloseAll = new System.Windows.Forms.Button();
this.btnRDoorDown = new System.Windows.Forms.Button();
this.btnRDoorUp = new System.Windows.Forms.Button();
this.btnLDoorDown = new System.Windows.Forms.Button();
this.btnLDoorUp = new System.Windows.Forms.Button();
this.btnRelax = new System.Windows.Forms.Button(); this.btnRelax = new System.Windows.Forms.Button();
this.btnClamp = new System.Windows.Forms.Button(); this.btnClamp = new System.Windows.Forms.Button();
this.btnLineStop = new System.Windows.Forms.Button(); this.btnLineStop = new System.Windows.Forms.Button();
...@@ -74,10 +70,6 @@ ...@@ -74,10 +70,6 @@
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnCloseAll); this.groupBox1.Controls.Add(this.btnCloseAll);
this.groupBox1.Controls.Add(this.btnRDoorDown);
this.groupBox1.Controls.Add(this.btnRDoorUp);
this.groupBox1.Controls.Add(this.btnLDoorDown);
this.groupBox1.Controls.Add(this.btnLDoorUp);
this.groupBox1.Controls.Add(this.btnRelax); this.groupBox1.Controls.Add(this.btnRelax);
this.groupBox1.Controls.Add(this.btnClamp); this.groupBox1.Controls.Add(this.btnClamp);
this.groupBox1.Controls.Add(this.btnLineStop); this.groupBox1.Controls.Add(this.btnLineStop);
...@@ -109,7 +101,7 @@ ...@@ -109,7 +101,7 @@
// //
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(168, 448); this.btnCloseAll.Location = new System.Drawing.Point(168, 358);
this.btnCloseAll.Name = "btnCloseAll"; this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(125, 34); this.btnCloseAll.Size = new System.Drawing.Size(125, 34);
this.btnCloseAll.TabIndex = 302; this.btnCloseAll.TabIndex = 302;
...@@ -117,54 +109,6 @@ ...@@ -117,54 +109,6 @@
this.btnCloseAll.UseVisualStyleBackColor = false; this.btnCloseAll.UseVisualStyleBackColor = false;
this.btnCloseAll.Click += new System.EventHandler(this.btnCloseCyDo_Click); this.btnCloseAll.Click += new System.EventHandler(this.btnCloseCyDo_Click);
// //
// btnRDoorDown
//
this.btnRDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRDoorDown.Location = new System.Drawing.Point(168, 394);
this.btnRDoorDown.Name = "btnRDoorDown";
this.btnRDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnRDoorDown.TabIndex = 301;
this.btnRDoorDown.Text = "右侧出料口门下降";
this.btnRDoorDown.UseVisualStyleBackColor = true;
this.btnRDoorDown.Visible = false;
this.btnRDoorDown.Click += new System.EventHandler(this.btnRDoorDown_Click);
//
// btnRDoorUp
//
this.btnRDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRDoorUp.Location = new System.Drawing.Point(168, 354);
this.btnRDoorUp.Name = "btnRDoorUp";
this.btnRDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnRDoorUp.TabIndex = 300;
this.btnRDoorUp.Text = "右侧出料口门上升";
this.btnRDoorUp.UseVisualStyleBackColor = true;
this.btnRDoorUp.Visible = false;
this.btnRDoorUp.Click += new System.EventHandler(this.btnRDoorUp_Click);
//
// btnLDoorDown
//
this.btnLDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLDoorDown.Location = new System.Drawing.Point(14, 394);
this.btnLDoorDown.Name = "btnLDoorDown";
this.btnLDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnLDoorDown.TabIndex = 299;
this.btnLDoorDown.Text = "左侧出料口门下降";
this.btnLDoorDown.UseVisualStyleBackColor = true;
this.btnLDoorDown.Visible = false;
this.btnLDoorDown.Click += new System.EventHandler(this.btnLDoorDown_Click);
//
// btnLDoorUp
//
this.btnLDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLDoorUp.Location = new System.Drawing.Point(14, 354);
this.btnLDoorUp.Name = "btnLDoorUp";
this.btnLDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnLDoorUp.TabIndex = 298;
this.btnLDoorUp.Text = "左侧出料口门上升";
this.btnLDoorUp.UseVisualStyleBackColor = true;
this.btnLDoorUp.Visible = false;
this.btnLDoorUp.Click += new System.EventHandler(this.btnLDoorUp_Click);
//
// btnRelax // btnRelax
// //
this.btnRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -217,7 +161,7 @@ ...@@ -217,7 +161,7 @@
// //
this.btnDeviceLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDeviceLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnDeviceLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDeviceLed.Location = new System.Drawing.Point(14, 488); this.btnDeviceLed.Location = new System.Drawing.Point(14, 398);
this.btnDeviceLed.Name = "btnDeviceLed"; this.btnDeviceLed.Name = "btnDeviceLed";
this.btnDeviceLed.Size = new System.Drawing.Size(125, 34); this.btnDeviceLed.Size = new System.Drawing.Size(125, 34);
this.btnDeviceLed.TabIndex = 293; this.btnDeviceLed.TabIndex = 293;
...@@ -229,7 +173,7 @@ ...@@ -229,7 +173,7 @@
// //
this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamerLed.Location = new System.Drawing.Point(14, 448); this.btnCamerLed.Location = new System.Drawing.Point(14, 358);
this.btnCamerLed.Name = "btnCamerLed"; this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34); this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290; this.btnCamerLed.TabIndex = 290;
...@@ -351,7 +295,6 @@ ...@@ -351,7 +295,6 @@
this.btnBack.TabIndex = 251; this.btnBack.TabIndex = 251;
this.btnBack.Text = "提升机构后退"; this.btnBack.Text = "提升机构后退";
this.btnBack.UseVisualStyleBackColor = false; this.btnBack.UseVisualStyleBackColor = false;
this.btnBack.Visible = false;
this.btnBack.Click += new System.EventHandler(this.btnLocationDown_Click); this.btnBack.Click += new System.EventHandler(this.btnLocationDown_Click);
// //
// label5 // label5
...@@ -376,7 +319,6 @@ ...@@ -376,7 +319,6 @@
this.btnFoward.TabIndex = 250; this.btnFoward.TabIndex = 250;
this.btnFoward.Text = "提升机构前进"; this.btnFoward.Text = "提升机构前进";
this.btnFoward.UseVisualStyleBackColor = false; this.btnFoward.UseVisualStyleBackColor = false;
this.btnFoward.Visible = false;
this.btnFoward.Click += new System.EventHandler(this.btnLocationUp_Click); this.btnFoward.Click += new System.EventHandler(this.btnLocationUp_Click);
// //
// cmbWriteIO // cmbWriteIO
...@@ -502,10 +444,6 @@ ...@@ -502,10 +444,6 @@
private System.Windows.Forms.Button btnLineRun; private System.Windows.Forms.Button btnLineRun;
private System.Windows.Forms.Button btnRelax; private System.Windows.Forms.Button btnRelax;
private System.Windows.Forms.Button btnClamp; private System.Windows.Forms.Button btnClamp;
private System.Windows.Forms.Button btnRDoorDown;
private System.Windows.Forms.Button btnRDoorUp;
private System.Windows.Forms.Button btnLDoorDown;
private System.Windows.Forms.Button btnLDoorUp;
private System.Windows.Forms.Button btnCloseAll; private System.Windows.Forms.Button btnCloseAll;
} }
} }
......
source/DUOStore/FrmStore.Designer.cs
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.lblServerMsg = new System.Windows.Forms.Label(); this.lblServerMsg = new System.Windows.Forms.Label();
this.chbDoorCanMove = new System.Windows.Forms.CheckBox();
this.chbUseBuzzer = new System.Windows.Forms.CheckBox(); this.chbUseBuzzer = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox(); this.chkDebug = new System.Windows.Forms.CheckBox();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
...@@ -93,7 +92,6 @@ ...@@ -93,7 +92,6 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.lblServerMsg); this.tabPage1.Controls.Add(this.lblServerMsg);
this.tabPage1.Controls.Add(this.chbDoorCanMove);
this.tabPage1.Controls.Add(this.chbUseBuzzer); this.tabPage1.Controls.Add(this.chbUseBuzzer);
this.tabPage1.Controls.Add(this.chkDebug); this.tabPage1.Controls.Add(this.chkDebug);
this.tabPage1.Controls.Add(this.chbAutoRun); this.tabPage1.Controls.Add(this.chbAutoRun);
...@@ -116,25 +114,12 @@ ...@@ -116,25 +114,12 @@
this.lblServerMsg.Size = new System.Drawing.Size(0, 17); this.lblServerMsg.Size = new System.Drawing.Size(0, 17);
this.lblServerMsg.TabIndex = 201; this.lblServerMsg.TabIndex = 201;
// //
// chbDoorCanMove
//
this.chbDoorCanMove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDoorCanMove.AutoSize = true;
this.chbDoorCanMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDoorCanMove.Location = new System.Drawing.Point(1132, 101);
this.chbDoorCanMove.Name = "chbDoorCanMove";
this.chbDoorCanMove.Size = new System.Drawing.Size(126, 24);
this.chbDoorCanMove.TabIndex = 197;
this.chbDoorCanMove.Text = "启用入料口移门";
this.chbDoorCanMove.UseVisualStyleBackColor = true;
this.chbDoorCanMove.CheckedChanged += new System.EventHandler(this.chbDoorCanMove_CheckedChanged);
//
// chbUseBuzzer // chbUseBuzzer
// //
this.chbUseBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbUseBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbUseBuzzer.AutoSize = true; this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(1132, 54); this.chbUseBuzzer.Location = new System.Drawing.Point(1132, 55);
this.chbUseBuzzer.Name = "chbUseBuzzer"; this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24); this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195; this.chbUseBuzzer.TabIndex = 195;
...@@ -147,7 +132,7 @@ ...@@ -147,7 +132,7 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(1132, 151); this.chkDebug.Location = new System.Drawing.Point(1132, 97);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24); this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -173,7 +158,7 @@ ...@@ -173,7 +158,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White; this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(1132, 202); this.btnCopyLog.Location = new System.Drawing.Point(1132, 139);
this.btnCopyLog.Name = "btnCopyLog"; this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35); this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191; this.btnCopyLog.TabIndex = 191;
...@@ -186,7 +171,7 @@ ...@@ -186,7 +171,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(1132, 243); this.btnClearLog.Location = new System.Drawing.Point(1132, 192);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -320,38 +305,38 @@ ...@@ -320,38 +305,38 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26);
this.toolStripMenuItem2.Text = "启用调试"; this.toolStripMenuItem2.Text = "启用调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6);
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6);
// //
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
// //
// 帮助ToolStripMenuItem // 帮助ToolStripMenuItem
// //
...@@ -475,7 +460,6 @@ ...@@ -475,7 +460,6 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
private System.Windows.Forms.CheckBox chbUseBuzzer; private System.Windows.Forms.CheckBox chbUseBuzzer;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.CheckBox chbDoorCanMove;
private System.Windows.Forms.Label lblServerMsg; private System.Windows.Forms.Label lblServerMsg;
private System.Windows.Forms.ToolStripMenuItem 扫码测试ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 扫码测试ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
......
source/DUOStore/FrmStore.cs
...@@ -58,7 +58,6 @@ namespace OnlineStore.DUOStore ...@@ -58,7 +58,6 @@ namespace OnlineStore.DUOStore
chbAutoRun.Checked = store.UseBuzzer; chbAutoRun.Checked = store.UseBuzzer;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
chbAutoRun.Checked = (ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1)); chbAutoRun.Checked = (ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1));
chbDoorCanMove.Checked = (ConfigAppSettings.GetIntValue(Setting_Init.UseDoor).Equals(1));
// LogUtil.logBox = this.logBox; // LogUtil.logBox = this.logBox;
// HideForm(); // HideForm();
LoadOk = true; LoadOk = true;
...@@ -344,7 +343,7 @@ namespace OnlineStore.DUOStore ...@@ -344,7 +343,7 @@ namespace OnlineStore.DUOStore
string msg = ""; string msg = "";
foreach(BoxBean box in StoreManager.Store.BoxMap.Values) foreach(BoxBean box in StoreManager.Store.BoxMap.Values)
{ {
string s = box.GetWarnMsg(); string s = box.WarnMsg;
if (!s.Equals("")) if (!s.Equals(""))
{ {
msg += box.Name+"："+s+ "\r" ; msg += box.Name+"："+s+ "\r" ;
...@@ -523,28 +522,6 @@ namespace OnlineStore.DUOStore ...@@ -523,28 +522,6 @@ namespace OnlineStore.DUOStore
} }
} }
} }
private void chbDoorCanMove_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (chbDoorCanMove.Checked)
{
// store.AutoShelfInstore = true;
ConfigAppSettings.SaveValue(Setting_Init.UseDoor, 1);
LogUtil.info("勾选：启用入料口移门");
}
else
{
// store.AutoShelfInstore = false;
ConfigAppSettings.SaveValue(Setting_Init.UseDoor, 0);
LogUtil.info("去掉：启用入料口移门");
}
}
private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e) private void 扫码测试ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
store.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH); store.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
......
source/DUOStore/useControl/AxisMoveControl.cs
...@@ -59,7 +59,7 @@ namespace OnlineStore.DUOStore ...@@ -59,7 +59,7 @@ namespace OnlineStore.DUOStore
if (boxBean.Config.UpDown_Axis.IsSameAxis(PortName, SlvAddr) if (boxBean.Config.UpDown_Axis.IsSameAxis(PortName, SlvAddr)
|| (boxBean.Config.Middle_Axis.IsSameAxis(PortName, SlvAddr))) || (boxBean.Config.Middle_Axis.IsSameAxis(PortName, SlvAddr)))
{ {
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InoutDefaultPosition); int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
int currValue = boxBean.InoutAxis.GetAclPosition(); int currValue = boxBean.InoutAxis.GetAclPosition();
if (currValue <= InOutDefaultPosition) if (currValue <= InOutDefaultPosition)
{ {
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -4,11 +4,11 @@ AXIS,,T2_取料机构旋转轴,T2_Middle_Axis,2,COM3,,1000,1000,1000,200,500,500,10,100 ...@@ -4,11 +4,11 @@ AXIS,,T2_取料机构旋转轴,T2_Middle_Axis,2,COM3,,1000,1000,1000,200,500,500,10,100
AXIS,,T3_取料机构上下轴,T3_Updown_Axis,3,COM3,,800,1000,1000,200,500,500,10,1000,0,0 AXIS,,T3_取料机构上下轴,T3_Updown_Axis,3,COM3,,800,1000,1000,200,500,500,10,1000,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,IO模块对应的DI数量,IO_DILength,192.168.201.21#16;192.168.201.22#16;192.168.201.23#8,,,,,,,,,,,, PRO,,IO模块对应的DI数量,IO_DILength,192.168.201.21#16;192.168.201.22#16;192.168.200.23#8,,,,,,,,,,,,
PRO,,IO模块对应的DO数量,IO_DOLength,192.168.201.21#16;192.168.201.22#16;192.168.201.23#8,,,,,,,,,,,, PRO,,IO模块对应的DO数量,IO_DOLength,192.168.201.21#16;192.168.201.22#16;192.168.200.23#8,,,,,,,,,,,,
PRO,,第一块IO模块IP,PRO_AIO_IP_1,192.168.201.21,,,,,,,,,,,, PRO,,第一块IO模块IP,PRO_AIO_IP_1,192.168.200.21,,,,,,,,,,,,
PRO,,第二块IO模块IP,PRO_AIO_IP_2,192.168.201.22,,,,,,,,,,,, PRO,,第二块IO模块IP,PRO_AIO_IP_2,192.168.200.22,,,,,,,,,,,,
PRO,,第三块IO模块IP,PRO_AIO_IP_3,192.168.201.23,,,,,,,,,,,, PRO,,第三块IO模块IP,PRO_AIO_IP_3,192.168.200.23,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AIO_IP_1,X01,,,,,,,,,, DI,0,急停,SuddenStop_BTN,0,PRO_AIO_IP_1,X01,,,,,,,,,,
......
source/DeviceLibrary/StoreConfig/linePositions_1.csv
位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3 位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3
4D1901AA0001,259,32,15,1,306200,1290614,1299614,1299614,1290614,140800 1#AC1_1_1_4,259,32,15,1,306200,1290614,1299614,1299614,1290614,140800
4D1901AA0002,258,32,15,1,306200,1334970,1343970,1343970,1334970,140800 1#AC1_1_1_5,258,32,15,1,306200,1334970,1343970,1343970,1334970,140800
4D1901AA0003,257,32,15,1,306200,1381622,1392122,1392122,1381622,140800 1#AC1_1_1_6,257,32,15,1,306200,1381622,1392122,1392122,1381622,140800
4D1901AA0004,256,32,15,1,306200,1424390,1433390,1433390,1424390,140800 1#AC1_1_1_7,256,32,15,1,306200,1424390,1433390,1433390,1424390,140800
4D1901AA0005,255,32,15,1,306200,1471088,1481488,1481488,1471088,140800 1#AC1_1_1_8,255,32,15,1,306200,1471088,1481488,1481488,1471088,140800
4D1901AA0006,254,32,15,1,306200,1514627,1525627,1525627,1514627,140800 1#AC1_1_1_9,254,32,15,1,306200,1514627,1525627,1525627,1514627,140800
4D1901AA0007,253,32,15,1,306200,1561503,1570503,1570503,1561503,140800 1#AC1_1_1_10,253,32,15,1,306200,1561503,1570503,1570503,1561503,140800
4D1901AA0008,252,32,15,1,306200,1603404,1612404,1612404,1603404,140800 1#AC1_1_1_11,252,32,15,1,306200,1603404,1612404,1612404,1603404,140800
4D1901AA0009,251,32,15,1,306200,1650000,1660593,1660593,1650000,140800 1#AC1_1_1_12,251,32,15,1,306200,1650000,1660593,1660593,1650000,140800
4D1901AA0010,250,32,15,1,306200,1693078,1702078,1702078,1693078,140800 1#AC1_1_1_13,250,32,15,1,306200,1693078,1702078,1702078,1693078,140800
4D1901AA0011,249,32,15,1,306200,1738576,1747576,1747576,1738576,140800 1#AC1_1_1_14,249,32,15,1,306200,1738576,1747576,1747576,1738576,140800
4D1901AA0012,248,32,15,1,306200,1785295,1794295,1794295,1785295,140800 1#AC1_1_1_15,248,32,15,1,306200,1785295,1794295,1794295,1785295,140800
4D1902AA0002,247,12,15,1,436077,9671,20171,20171,9671,140800 1#AC1_1_1_16,247,12,15,1,436077,9671,20171,20171,9671,140800
4D1902AA0003,246,12,15,1,436077,39893,50393,50393,39893,140800 1#AC1_1_1_17,246,12,15,1,436077,39893,50393,50393,39893,140800
4D1902AA0004,245,12,15,1,436077,70661,81161,81161,70661,140800 1#AC1_1_1_18,245,12,15,1,436077,70661,81161,81161,70661,140800
4D1902AA0005,244,12,15,1,436077,98713,109213,109213,98713,140800 1#AC1_1_1_19,244,12,15,1,436077,98713,109213,109213,98713,140800
4D1902AA0006,243,12,15,1,436077,128728,139228,139228,128728,140800 1#AC1_1_1_20,243,12,15,1,436077,128728,139228,139228,128728,140800
4D1902AA0007,242,12,15,1,436077,159195,169695,169695,159195,140800 1#AC1_1_1_21,242,12,15,1,436077,159195,169695,169695,159195,140800
4D1902AA0008,241,12,15,1,436077,189134,199634,199634,189134,140800 1#AC1_1_2_4,241,12,15,1,436077,189134,199634,199634,189134,140800
4D1902AA0009,240,12,15,1,436077,219845,230345,230345,219845,140800 1#AC1_1_2_5,240,12,15,1,436077,219845,230345,230345,219845,140800
4D1902AA0010,239,12,15,1,436077,252000,262500,262500,252000,140800 1#AC1_1_2_6,239,12,15,1,436077,252000,262500,262500,252000,140800
4D1902AA0011,238,12,15,1,436077,280421,290921,290921,280421,140800 1#AC1_1_2_7,238,12,15,1,436077,280421,290921,290921,280421,140800
4D1902AA0012,237,12,15,1,436077,312224,322724,322724,312224,140800 1#AC1_1_2_8,237,12,15,1,436077,312224,322724,322724,312224,140800
4D1902AA0013,236,12,15,1,436077,342256,352756,352756,342256,140800 1#AC1_1_2_9,236,12,15,1,436077,342256,352756,352756,342256,140800
4D1902AA0014,235,12,15,1,436077,369382,379882,379882,369382,140800 1#AC1_1_2_10,235,12,15,1,436077,369382,379882,379882,369382,140800
4D1902AA0015,234,12,15,1,436077,399751,410251,410251,399751,140800 1#AC1_1_2_11,234,12,15,1,436077,399751,410251,410251,399751,140800
4D1902BB0001,233,12,15,1,436200,430923,441423,441423,430923,140800 1#AC1_1_2_12,233,12,15,1,436200,430923,441423,441423,430923,140800
4D1902BB0002,232,12,15,1,436157,459859,470359,470359,459859,140800 1#AC1_1_2_13,232,12,15,1,436157,459859,470359,470359,459859,140800
4D1902BB0003,231,12,15,1,436214,489685,500185,500185,489685,140800 1#AC1_1_2_14,231,12,15,1,436214,489685,500185,500185,489685,140800
4D1902BB0004,230,12,15,1,436271,522581,533081,533081,522581,140800 1#AC1_1_2_15,230,12,15,1,436271,522581,533081,533081,522581,140800
4D1902BB0005,229,12,15,1,435628,550105,560605,560605,550105,140800 1#AC1_1_2_16,229,12,15,1,435628,550105,560605,560605,550105,140800
4D1902BB0006,228,12,15,1,435585,583474,593974,593974,583474,140800 1#AC1_1_2_17,228,12,15,1,435585,583474,593974,593974,583474,140800
4D1902BB0007,227,12,15,1,435542,612943,623443,623443,612943,140800 1#AC1_1_2_18,227,12,15,1,435542,612943,623443,623443,612943,140800
4D1902BB0008,226,12,15,1,435499,642389,652889,652889,642389,140800 1#AC1_1_2_19,226,12,15,1,435499,642389,652889,652889,642389,140800
4D1902BB0009,225,12,15,1,435456,670221,680721,680721,670221,140800 1#AC1_1_2_20,225,12,15,1,435456,670221,680721,680721,670221,140800
4D1902BB0010,224,12,15,1,435413,700236,713736,713736,700236,140800 1#AC1_1_2_21,224,12,15,1,435413,700236,713736,713736,700236,140800
4D1902BB0011,223,12,15,1,435370,730260,740760,740760,730260,140800
4D1902BB0012,222,12,15,1,435327,760979,771479,771479,760979,140800
4D1902BB0013,221,12,15,1,435284,793252,803752,803752,793252,140800
4D1902BB0014,220,12,15,1,435241,820576,831076,831076,820576,140800
4D1902BB0015,219,12,15,1,435200,851263,861763,861763,851263,140800
4D1902CC0001,218,12,15,1,435000,878255,888755,888755,878255,140800
4D1902CC0002,217,12,15,1,434979,910934,921434,921434,910934,140800
4D1902CC0003,216,12,15,1,434958,940299,950799,950799,940299,140800
4D1902CC0004,215,12,15,1,434937,970225,980725,980725,970225,140800
4D1902CC0005,214,12,15,1,434916,1001617,1012117,1012117,1001617,140800
4D1902CC0006,213,12,15,1,434895,1031321,1041821,1041821,1031321,140800
4D1902CC0007,212,12,15,1,434874,1063022,1073522,1073522,1063022,140800
4D1902CC0008,211,12,15,1,434853,1092956,1103456,1103456,1092956,140800
4D1902CC0009,210,12,15,1,434832,1120810,1131310,1131310,1120810,140800
4D1902CC0010,209,12,15,1,434811,1151008,1161508,1161508,1151008,140800
4D1902CC0011,208,12,15,1,434790,1183294,1193794,1193794,1183294,140800
4D1902CC0012,207,12,15,1,434769,1210807,1221307,1221307,1210807,140800
4D1902CC0013,206,12,15,1,434748,1241516,1252016,1252016,1241516,140800
4D1902CC0014,205,12,15,1,434727,1273793,1284293,1284293,1273793,140800
4D1902CC0015,204,12,15,1,434700,1303815,1314315,1314315,1303815,140800
4D1902DD0001,203,12,15,1,434700,1333925,1344425,1344425,1333925,140800
4D1902DD0002,202,12,15,1,434679,1362830,1373330,1373330,1362830,140800
4D1902DD0003,201,12,15,1,434658,1393135,1403635,1403635,1393135,140800
4D1902DD0004,200,12,15,1,434637,1422089,1432589,1432589,1422089,140800
4D1902DD0005,199,12,15,1,434616,1454366,1464866,1464866,1454366,140800
4D1902DD0006,198,12,15,1,434595,1485136,1495636,1495636,1485136,140800
4D1902DD0007,197,12,15,1,434574,1514371,1524871,1524871,1514371,140800
4D1902DD0008,196,12,15,1,434553,1544150,1554650,1554650,1544150,140800
4D1902DD0009,195,12,15,1,434532,1574348,1584848,1584848,1574348,140800
4D1902DD0010,194,12,15,1,434511,1602719,1613219,1613219,1602719,140800
4D1902DD0011,193,12,15,1,434490,1632276,1642776,1642776,1632276,140800
4D1902DD0012,192,12,15,1,434469,1664346,1674846,1674846,1664346,140800
4D1902DD0013,191,12,15,1,434448,1694368,1704868,1704868,1694368,140800
4D1902DD0014,190,12,15,1,434427,1725003,1735503,1735503,1725003,140800
4D1902DD0015,189,12,15,1,434400,1751523,1762023,1762023,1751523,140800
4D1903AA0002,188,16,15,1,564700,11249,25749,25749,11249,140800
4D1903AA0003,187,16,15,1,564667,46904,58404,58404,46904,140800
4D1903AA0004,186,16,15,1,564634,77968,89468,89468,77968,140800
4D1903AA0005,185,16,15,1,564601,113788,125288,125288,113788,140800
4D1903AA0006,184,16,15,1,564568,145227,156727,156727,145227,140800
4D1903AA0007,183,16,15,1,564535,180329,191829,191829,180329,140800
4D1903AA0008,182,16,15,1,564502,212759,224259,224259,212759,140800
4D1903AA0009,181,16,15,1,564469,245998,257498,257498,245998,140800
4D1903AA0010,180,16,15,1,564436,279317,290817,290817,279317,140800
4D1903AA0011,179,16,15,1,564403,312832,324332,324332,312832,140800
4D1903AA0012,178,16,15,1,564370,348232,359732,359732,348232,140800
4D1903AA0013,177,16,15,1,564337,382441,393941,393941,382441,140800
4D1903AA0014,176,16,15,1,564300,414237,425737,425737,414237,140800
4D1903BB0001,175,16,15,1,564200,445155,456655,456655,445155,140800
4D1903BB0002,174,16,15,1,564185,482833,494333,494333,482833,140800
4D1903BB0003,173,16,15,1,564170,514245,525745,525745,514245,140800
4D1903BB0004,172,16,15,1,564155,550420,561920,561920,550420,140800
4D1903BB0005,171,16,15,1,564140,580809,592309,592309,580809,140800
4D1903BB0006,170,16,15,1,564125,617393,628893,628893,617393,140800
4D1903BB0007,169,16,15,1,564110,650201,661701,661701,650201,140800
4D1903BB0008,168,16,15,1,564095,684122,695622,695622,684122,140800
4D1903BB0009,167,16,15,1,564080,717384,728884,728884,717384,140800
4D1903BB0010,166,16,15,1,564065,748842,760342,760342,748842,140800
4D1903BB0011,165,16,15,1,564050,784030,795530,795530,784030,140800
4D1903BB0012,164,16,15,1,564035,818058,829558,829558,818058,140800
4D1903BB0013,163,16,15,1,564020,848452,859952,859952,848452,140800
4D1903BB0014,162,16,15,1,564000,881299,892799,892799,881299,140800
4D1903CC0001,161,16,15,1,563700,914726,926226,926226,914726,140800
4D1903CC0002,160,16,15,1,563669,952353,963853,963853,952353,140800
4D1903CC0003,159,16,15,1,563638,982748,997248,997248,982748,140800
4D1903CC0004,158,16,15,1,563607,1018561,1030061,1030061,1018561,140800
4D1903CC0005,157,16,15,1,563576,1052305,1063805,1063805,1052305,140800
4D1903CC0006,156,16,15,1,563545,1083269,1096769,1096769,1083269,140800
4D1903CC0007,155,16,15,1,563514,1118618,1130118,1130118,1118618,140800
4D1903CC0008,154,16,15,1,563483,1150059,1166559,1166559,1150059,140800
4D1903CC0009,153,16,15,1,563452,1185931,1197431,1197431,1185931,140800
4D1903CC0010,152,16,15,1,563421,1216729,1228229,1228229,1216729,140800
4D1903CC0011,151,16,15,1,563390,1253410,1264910,1264910,1253410,140800
4D1903CC0012,150,16,15,1,563359,1283512,1295012,1295012,1283512,140800
4D1903CC0013,149,16,15,1,563328,1319228,1330728,1330728,1319228,140800
4D1903CC0014,148,16,15,1,563300,1351682,1363182,1363182,1351682,140800
4D1903DD0001,147,16,15,1,563262,1384795,1398295,1398295,1384795,140800
4D1903DD0002,146,16,15,1,563224,1419313,1430813,1430813,1419313,140800
4D1903DD0003,145,16,15,1,563186,1453359,1464859,1464859,1453359,140800
4D1903DD0004,144,16,15,1,563148,1486774,1498274,1498274,1486774,140800
4D1903DD0005,143,16,15,1,563110,1518414,1529914,1529914,1518414,140800
4D1903DD0006,142,16,15,1,563072,1551393,1562893,1562893,1551393,140800
4D1903DD0007,141,16,15,1,563034,1587425,1598925,1598925,1587425,140800
4D1903DD0008,140,16,15,1,562996,1621065,1632565,1632565,1621065,140800
4D1903DD0009,139,16,15,1,562958,1653958,1665458,1665458,1653958,140800
4D1903DD0010,138,16,15,1,562920,1686799,1698299,1698299,1686799,140800
4D1903DD0011,137,16,15,1,562882,1719026,1732526,1732526,1719026,140800
4D1903DD0012,136,16,15,1,562844,1750433,1763933,1763933,1750433,140800
4D1903DD0013,135,16,15,1,562806,1783926,1798426,1798426,1783926,140800
4D1904AA0002,134,12,15,1,693400,17876,29376,29376,17876,140800
4D1904AA0003,133,12,15,1,693392,54412,65912,65912,54412,140800
4D1904AA0004,132,12,15,1,693384,94892,106392,106392,94892,140800
4D1904AA0005,131,12,15,1,693376,132183,143683,143683,132183,140800
4D1904AA0006,130,12,15,1,693368,169721,181221,181221,169721,140800
4D1904AA0007,129,12,15,1,693360,208821,220321,220321,208821,140800
4D1904AA0008,128,12,15,1,693352,245340,256840,256840,245340,140800
4D1904AA0009,127,12,15,1,693344,283202,294702,294702,283202,140800
4D1904AA0010,126,12,15,1,693336,323362,334862,334862,323362,140800
4D1904AA0011,125,12,15,1,693328,359200,370700,370700,359200,140800
4D1904AA0012,124,12,15,1,693320,399369,410869,410869,399369,140800
4D1904AA0013,123,12,15,1,693312,435436,446936,446936,435436,140800
4D1904AA0014,122,12,15,1,693304,474762,486262,486262,474762,140800
4D1904AA0015,121,12,15,1,693300,512522,524022,524022,512522,140800
4D1904BB0001,120,16,15,1,693200,552264,562064,562064,552264,140800
4D1904BB0002,119,16,15,1,693154,586056,595956,595956,586056,140800
4D1904BB0003,118,16,15,1,693108,618837,627337,627337,618837,140800
4D1904BB0004,117,16,15,1,693062,653097,662897,662897,653097,140800
4D1904BB0005,116,16,15,1,693016,687412,695912,695912,687412,140800
4D1904BB0006,115,16,15,1,692970,719714,728214,728214,719714,140800
4D1904BB0007,114,16,15,1,692924,752776,761276,761276,752776,140800
4D1904BB0008,113,16,15,1,692878,785978,794478,794478,785978,140800
4D1904BB0009,112,16,15,1,692832,819789,830289,830289,819789,140800
4D1904BB0010,111,16,15,1,692786,852760,861260,861260,852760,140800
4D1904BB0011,110,16,15,1,692740,884176,894676,894676,884176,140800
4D1904BB0012,109,16,15,1,692700,919975,928475,928475,919975,140800
4D1904CC0001,108,16,15,1,692600,954239,963739,963739,954239,140800
4D1904CC0002,107,16,15,1,692555,987631,997131,997131,987631,140800
4D1904CC0003,106,16,15,1,692510,1022246,1031746,1031746,1022246,140800
4D1904CC0004,105,16,15,1,692465,1055623,1065123,1065123,1055623,140800
4D1904CC0005,104,16,15,1,692420,1089492,1098992,1098992,1089492,140800
4D1904CC0006,103,16,15,1,692375,1121622,1131122,1131122,1121622,140800
4D1904CC0007,102,16,15,1,692330,1155026,1165826,1165826,1155026,140800
4D1904CC0008,101,16,15,1,692285,1188492,1197992,1197992,1188492,140800
4D1904CC0009,100,16,15,1,692240,1221810,1231310,1231310,1221810,140800
4D1904CC0010,99,16,15,1,692195,1256704,1266204,1266204,1256704,140800
4D1904CC0011,98,16,15,1,692150,1288436,1297936,1297936,1288436,140800
4D1904CC0012,97,16,15,1,692100,1322695,1332195,1332195,1322695,140800
4D1904DD0001,96,24,15,1,692100,1351924,1363424,1363424,1351924,140800
4D1904DD0002,95,24,15,1,692071,1381801,1393301,1393301,1381801,140800
4D1904DD0003,94,24,15,1,692042,1414398,1425898,1425898,1414398,140800
4D1904DD0004,93,24,15,1,692013,1444736,1456236,1456236,1444736,140800
4D1904DD0005,92,24,15,1,691984,1471983,1483483,1483483,1471983,140800
4D1904DD0006,91,24,15,1,691955,1502499,1513999,1513999,1502499,140800
4D1904DD0007,90,24,15,1,691926,1531924,1543424,1543424,1531924,140800
4D1904DD0008,89,24,15,1,691897,1563001,1576001,1576001,1563001,140800
4D1904DD0009,88,24,15,1,691868,1592387,1604387,1604387,1592387,140800
4D1904DD0010,87,24,15,1,691839,1625011,1636511,1636511,1625011,140800
4D1904DD0011,86,24,15,1,691810,1652417,1663917,1663917,1652417,140800
4D1904DD0012,85,24,15,1,691781,1682596,1694096,1694096,1682596,140800
4D1904DD0013,84,24,15,1,691752,1712586,1724086,1724086,1712586,140800
4D1904DD0014,83,24,15,1,691723,1742628,1754128,1754128,1742628,140800
4D1904DD0015,82,24,15,1,691700,1771671,1783171,1783171,1771671,140800
4D1905AA0002,81,12,7,1,192400,20,11020,11020,20,140800
4D1905AA0003,80,12,7,1,192371,22097,33097,33097,22097,140800
4D1905AA0004,79,12,7,1,192342,44738,55738,55738,44738,140800
4D1905AA0005,78,12,7,1,192313,65821,76821,76821,65821,140800
4D1905AA0006,77,12,7,1,192284,87818,98818,98818,87818,140800
4D1905AA0007,76,12,7,1,192255,111328,122328,122328,111328,140800
4D1905AA0008,75,12,7,1,192226,132918,143918,143918,132918,140800
4D1905AA0009,74,12,7,1,192197,154042,165042,165042,154042,140800
4D1905AA0010,73,12,7,1,192168,176468,187468,187468,176468,140800
4D1905AA0011,72,12,7,1,192139,198968,209968,209968,198968,140800
4D1905AA0012,71,12,7,1,192110,220898,231898,231898,220898,140800
4D1905AA0013,70,12,7,1,192081,242608,253608,253608,242608,140800
4D1905AA0014,69,12,7,1,192052,265636,276636,276636,265636,140800
4D1905AA0015,68,12,7,1,192023,287655,298655,298655,287655,140800
4D1905AA0016,67,12,7,1,191994,310089,321089,321089,310089,140800
4D1905AA0017,66,12,7,1,191965,331322,342322,342322,331322,140800
4D1905AA0018,65,12,7,1,191936,354339,365339,365339,354339,140800
4D1905AA0019,64,12,7,1,191907,375660,386660,386660,375660,140800
4D1905AA0020,63,12,7,1,191878,398470,409470,409470,398470,140800
4D1905AA0021,62,12,7,1,191849,420071,431071,431071,420071,140800
4D1905AA0022,61,12,7,1,191820,442556,453556,453556,442556,140800
4D1905AA0023,60,12,7,1,191800,464682,475682,475682,464682,140800
4D1905BB0001,59,12,7,1,191400,486069,497069,497069,486069,140800
4D1905BB0002,58,12,7,1,191400,508105,519105,519105,508105,140800
4D1905BB0003,57,12,7,1,191400,530591,541591,541591,530591,140800
4D1905BB0004,56,12,7,1,191400,553455,564455,564455,553455,140800
4D1905BB0005,55,12,7,1,191400,575811,586000,586000,575811,140800
4D1905BB0006,54,12,7,1,191400,597169,608169,608169,597169,140800
4D1905BB0007,53,12,7,1,191400,619849,630849,630849,619849,140800
4D1905BB0008,52,12,7,1,191400,641324,652324,652324,641324,140800
4D1905BB0009,51,12,7,1,191400,664173,675173,675173,664173,140800
4D1905BB0010,50,12,7,1,191400,685795,696795,696795,685795,140800
4D1905BB0011,49,12,7,1,191400,707814,718814,718814,707814,140800
4D1905BB0012,48,12,7,1,191400,730509,741509,741509,730509,140800
4D1905BB0013,47,12,7,1,191400,752532,763532,763532,752532,140800
4D1905BB0014,46,12,7,1,191400,774611,785611,785611,774611,140800
4D1905BB0015,45,12,7,1,191400,795993,806993,806993,795993,140800
4D1905BB0016,44,12,7,1,191400,819167,830167,830167,819167,140800
4D1905BB0017,43,12,7,1,191400,840450,851450,851450,840450,140800
4D1905BB0018,42,12,7,1,191400,862926,873926,873926,862926,140800
4D1905BB0019,41,12,7,1,191400,884400,895400,895400,884400,140800
4D1905BB0020,40,12,7,1,191400,906630,917630,917630,906630,140800
4D1905BB0021,39,12,7,1,191400,928723,939723,939723,928723,140800
4D1905BB0022,38,12,7,1,191400,950753,961753,961753,950753,140800
4D1905BB0023,37,12,7,1,191400,972567,983567,983567,972567,140800
4D1905CC0001,36,12,7,1,191100,995665,1006665,1006665,995665,140800
4D1905CC0002,35,12,7,1,191073,1017971,1028971,1028971,1017971,140800
4D1905CC0003,34,12,7,1,191046,1039594,1050594,1050594,1039594,140800
4D1905CC0004,33,12,7,1,191019,1062467,1073467,1073467,1062467,140800
4D1905CC0005,32,12,7,1,190992,1083900,1094900,1094900,1083900,140800
4D1905CC0006,31,12,7,1,190965,1107018,1118018,1118018,1107018,140800
4D1905CC0007,30,12,7,1,190938,1127722,1138722,1138722,1127722,140800
4D1905CC0008,29,12,7,1,190911,1151248,1162248,1162248,1151248,140800
4D1905CC0009,28,12,7,1,190884,1172652,1183652,1183652,1172652,140800
4D1905CC0010,27,12,7,1,190857,1195234,1206234,1206234,1195234,140800
4D1905CC0011,26,12,7,1,190830,1217688,1228688,1228688,1217688,140800
4D1905CC0012,25,12,7,1,190803,1239278,1250278,1250278,1239278,140800
4D1905CC0013,24,12,7,1,190776,1261915,1272915,1272915,1261915,140800
4D1905CC0014,23,12,7,1,190749,1283939,1294939,1294939,1283939,140800
4D1905CC0015,22,12,7,1,190722,1305187,1316187,1316187,1305187,140800
4D1905CC0016,21,12,7,1,190695,1328282,1339282,1339282,1328282,140800
4D1905CC0017,20,12,7,1,190668,1349346,1360346,1360346,1349346,140800
4D1905CC0018,19,12,7,1,190641,1371906,1382906,1382906,1371906,140800
4D1905CC0019,18,12,7,1,190614,1393675,1404675,1404675,1393675,140800
4D1905CC0020,17,12,7,1,190587,1415367,1426367,1426367,1415367,140800
4D1905CC0021,16,12,7,1,190560,1437494,1448494,1448494,1437494,140800
4D1905CC0022,15,12,7,1,190533,1461267,1472267,1472267,1461267,140800
4D1905CC0023,14,12,7,1,190500,1481154,1492154,1492154,1481154,140800
4D1905DD0001,13,16,7,1,190500,1504019,1515019,1515019,1504019,140800
4D1905DD0002,12,16,7,1,190500,1528263,1539263,1539263,1528263,140800
4D1905DD0003,11,16,7,1,190500,1552808,1563808,1563808,1552808,140800
4D1905DD0004,10,16,7,1,190500,1578065,1589065,1589065,1578065,140800
4D1905DD0005,9,16,7,1,190500,1602312,1613312,1613312,1602312,140800
4D1905DD0006,8,16,7,1,190500,1626084,1637084,1637084,1626084,140800
4D1905DD0007,7,16,7,1,190500,1650156,1661156,1661156,1650156,140800
4D1905DD0008,6,16,7,1,190500,1675361,1686361,1686361,1675361,140800
4D1905DD0009,5,20,7,1,190500,1700035,1711035,1711035,1700035,140800
4D1905DD0010,4,20,7,1,190500,1725503,1736503,1736503,1725503,140800
4D1905DD0011,3,20,7,1,190500,1753249,1764249,1764249,1753249,140800
4D1905DD0012,2,20,7,1,190500,1779933,1790933,1790933,1779933,140800
4D1905DD0013,1,20,7,1,190500,1805655,1816655,1816655,1805655,140800
source/DeviceLibrary/StoreConfig/linePositions_2.csv
位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3 位置,优先级,高度,宽度,料仓ID,旋转轴库位点P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3
4D2001AA0001,313,32,15,2,306700,1288338,1299338,1299338,1288338,140000 2#AC2_1_1_4,259,32,15,1,306200,1290614,1299614,1299614,1290614,1408002#AC2
4D2001AA0002,312,32,15,2,306691,1331097,1342097,1342097,1331097,140000 2#AC2_1_1_5,258,32,15,1,306200,1334970,1343970,1343970,1334970,140800
4D2001AA0003,311,32,15,2,306682,1375972,1386972,1386972,1375972,140000 2#AC2_1_1_6,257,32,15,1,306200,1381622,1392122,1392122,1381622,140800
4D2001AA0004,310,32,15,2,306673,1423732,1434732,1434732,1423732,140000 2#AC2_1_1_7,256,32,15,1,306200,1424390,1433390,1433390,1424390,140800
4D2001AA0005,309,32,15,2,306664,1465777,1476777,1476777,1465777,140000 2#AC2_1_1_8,255,32,15,1,306200,1471088,1481488,1481488,1471088,140800
4D2001AA0006,308,32,15,2,306655,1513005,1524005,1524005,1513005,140000 2#AC2_1_1_9,254,32,15,1,306200,1514627,1525627,1525627,1514627,140800
4D2001AA0007,307,32,15,2,306646,1555169,1566169,1566169,1555169,140000 2#AC2_1_1_10,253,32,15,1,306200,1561503,1570503,1570503,1561503,140800
4D2001AA0008,306,32,15,2,306637,1600561,1611561,1611561,1600561,140000 2#AC2_1_1_11,252,32,15,1,306200,1603404,1612404,1612404,1603404,140800
4D2001AA0009,305,32,15,2,306628,1647328,1658328,1658328,1647328,140000 2#AC2_1_1_12,251,32,15,1,306200,1650000,1660593,1660593,1650000,140800
4D2001AA0010,304,32,15,2,306619,1690143,1701143,1701143,1690143,140000 2#AC2_1_1_13,250,32,15,1,306200,1693078,1702078,1702078,1693078,140800
4D2001AA0011,303,32,15,2,306610,1737045,1748045,1748045,1737045,140000 2#AC2_1_1_14,249,32,15,1,306200,1738576,1747576,1747576,1738576,140800
4D2001AA0012,302,32,15,2,306600,1781598,1792598,1792598,1781598,140000 2#AC2_1_1_15,248,32,15,1,306200,1785295,1794295,1794295,1785295,140800
4D2002AA0002,301,12,7,2,421500,-6334,4666,4666,-6334,140000 2#AC2_1_1_16,247,12,15,1,436077,9671,20171,20171,9671,140800
4D2002AA0003,300,12,7,2,421500,15771,26771,26771,15771,140000 2#AC2_1_1_17,246,12,15,1,436077,39893,50393,50393,39893,140800
4D2002AA0004,299,12,7,2,421500,38636,49636,49636,38636,140000 2#AC2_1_1_18,245,12,15,1,436077,70661,81161,81161,70661,140800
4D2002AA0005,298,12,7,2,421500,59984,70984,70984,59984,140000 2#AC2_1_1_19,244,12,15,1,436077,98713,109213,109213,98713,140800
4D2002AA0006,297,12,7,2,421500,83351,94351,94351,83351,140000 2#AC2_1_1_20,243,12,15,1,436077,128728,139228,139228,128728,140800
4D2002AA0007,296,12,7,2,421500,104552,115552,115552,104552,140000 2#AC2_1_1_21,242,12,15,1,436077,159195,169695,169695,159195,140800
4D2002AA0008,295,12,7,2,421500,126920,137920,137920,126920,140000 2#AC2_1_2_4,241,12,15,1,436077,189134,199634,199634,189134,140800
4D2002AA0009,294,12,7,2,421500,148727,159727,159727,148727,140000 2#AC2_1_2_5,240,12,15,1,436077,219845,230345,230345,219845,140800
4D2002AA0010,293,12,7,2,421500,171845,182845,182845,171845,140000 2#AC2_1_2_6,239,12,15,1,436077,252000,262500,262500,252000,140800
4D2002AA0011,292,12,7,2,421500,192978,203978,203978,192978,140000 2#AC2_1_2_7,238,12,15,1,436077,280421,290921,290921,280421,140800
4D2002AA0012,291,12,7,2,421500,215562,226562,226562,215562,140000 2#AC2_1_2_8,237,12,15,1,436077,312224,322724,322724,312224,140800
4D2002AA0013,290,12,7,2,421500,236876,247876,247876,236876,140000 2#AC2_1_2_9,236,12,15,1,436077,342256,352756,352756,342256,140800
4D2002AA0014,289,12,7,2,421500,259746,270746,270746,259746,140000 2#AC2_1_2_10,235,12,15,1,436077,369382,379882,379882,369382,140800
4D2002AA0015,288,12,7,2,421500,280590,291590,291590,280590,140000 2#AC2_1_2_11,234,12,15,1,436077,399751,410251,410251,399751,140800
4D2002AA0016,287,12,7,2,421500,302695,313695,313695,302695,140000 2#AC2_1_2_12,233,12,15,1,436200,430923,441423,441423,430923,140800
4D2002AA0017,286,12,7,2,421500,324817,335817,335817,324817,140000 2#AC2_1_2_13,232,12,15,1,436157,459859,470359,470359,459859,140800
4D2002AA0018,285,12,7,2,421500,347928,358928,358928,347928,140000 2#AC2_1_2_14,231,12,15,1,436214,489685,500185,500185,489685,140800
4D2002AA0019,284,12,7,2,421500,370657,381657,381657,370657,140000 2#AC2_1_2_15,230,12,15,1,436271,522581,533081,533081,522581,140800
4D2002AA0020,283,12,7,2,421500,391931,402931,402931,391931,140000 2#AC2_1_2_16,229,12,15,1,435628,550105,560605,560605,550105,140800
4D2002AA0021,282,12,7,2,421500,414716,425716,425716,414716,140000 2#AC2_1_2_17,228,12,15,1,435585,583474,593974,593974,583474,140800
4D2002AA0022,281,12,7,2,421500,436055,447055,447055,436055,140000 2#AC2_1_2_18,227,12,15,1,435542,612943,623443,623443,612943,140800
4D2002AA0023,280,12,7,2,421500,458788,469788,469788,458788,140000 2#AC2_1_2_19,226,12,15,1,435499,642389,652889,652889,642389,140800
4D2002BB0001,279,12,7,2,421300,481794,492794,492794,481794,140000 2#AC2_1_2_20,225,12,15,1,435456,670221,680721,680721,670221,140800
4D2002BB0002,278,12,7,2,421300,502681,513681,513681,502681,140000 2#AC2_1_2_21,224,12,15,1,435413,700236,713736,713736,700236,140800
4D2002BB0003,277,12,7,2,421300,525374,536374,536374,525374,140000
4D2002BB0004,276,12,7,2,421300,547806,558806,558806,547806,140000
4D2002BB0005,275,12,7,2,421300,569156,580156,580156,569156,140000
4D2002BB0006,274,12,7,2,421300,591554,602554,602554,591554,140000
4D2002BB0007,273,12,7,2,421300,612973,623973,623973,612973,140000
4D2002BB0008,272,12,7,2,421300,634890,645890,645890,634890,140000
4D2002BB0009,271,12,7,2,421300,656866,667866,667866,656866,140000
4D2002BB0010,270,12,7,2,421300,678835,689835,689835,678835,140000
4D2002BB0011,269,12,7,2,421300,701900,712900,712900,701900,140000
4D2002BB0012,268,12,7,2,421300,723972,734972,734972,723972,140000
4D2002BB0013,267,12,7,2,421300,745313,756313,756313,745313,140000
4D2002BB0014,266,12,7,2,421300,769039,780039,780039,769039,140000
4D2002BB0015,265,12,7,2,421300,790267,801267,801267,790267,140000
4D2002BB0016,264,12,7,2,421300,812713,823713,823713,812713,140000
4D2002BB0017,263,12,7,2,421300,834143,845143,845143,834143,140000
4D2002BB0018,262,12,7,2,421300,856925,867925,867925,856925,140000
4D2002BB0019,261,12,7,2,421300,878511,889511,889511,878511,140000
4D2002BB0020,260,12,7,2,421300,901326,912326,912326,901326,140000
4D2002BB0021,259,12,7,2,421300,923342,934342,934342,923342,140000
4D2002BB0022,258,12,7,2,421300,946170,957170,957170,946170,140000
4D2002BB0023,257,12,7,2,421300,967873,978873,978873,967873,140000
4D2002CC0001,256,12,7,2,420500,990668,1001668,1001668,990668,140000
4D2002CC0002,255,12,7,2,420500,1012112,1023112,1023112,1012112,140000
4D2002CC0003,254,12,7,2,420500,1034496,1045496,1045496,1034496,140000
4D2002CC0004,253,12,7,2,420500,1056940,1067940,1067940,1056940,140000
4D2002CC0005,252,12,7,2,420500,1078160,1089160,1089160,1078160,140000
4D2002CC0006,251,12,7,2,420500,1100920,1111920,1111920,1100920,140000
4D2002CC0007,250,12,7,2,420500,1123041,1134041,1134041,1123041,140000
4D2002CC0008,249,12,7,2,420500,1145280,1156280,1156280,1145280,140000
4D2002CC0009,248,12,7,2,420500,1167756,1178756,1178756,1167756,140000
4D2002CC0010,247,12,7,2,420500,1188725,1199725,1199725,1188725,140000
4D2002CC0011,246,12,7,2,420000,1211787,1222787,1222787,1211787,140000
4D2002CC0012,245,12,7,2,420000,1233672,1244672,1244672,1233672,140000
4D2002CC0013,244,12,7,2,420000,1256082,1267082,1267082,1256082,140000
4D2002CC0014,243,12,7,2,420000,1277753,1288753,1288753,1277753,140000
4D2002CC0015,242,12,7,2,420000,1299466,1310466,1310466,1299466,140000
4D2002CC0016,241,12,7,2,420000,1321432,1332432,1332432,1321432,140000
4D2002CC0017,240,12,7,2,420000,1344125,1355125,1355125,1344125,140000
4D2002CC0018,239,12,7,2,420000,1365773,1376773,1376773,1365773,140000
4D2002CC0019,238,12,7,2,420000,1388912,1399912,1399912,1388912,140000
4D2002CC0020,237,12,7,2,420000,1409861,1420861,1420861,1409861,140000
4D2002CC0021,236,12,7,2,420000,1432899,1443899,1443899,1432899,140000
4D2002CC0022,235,12,7,2,420000,1454198,1465198,1465198,1454198,140000
4D2002CC0023,234,12,7,2,420000,1476327,1487327,1487327,1476327,140000
4D2002DD0001,233,16,7,2,419000,1498696,1509696,1509696,1498696,140000
4D2002DD0002,232,16,7,2,419600,1523837,1534837,1534837,1523837,140000
4D2002DD0003,231,16,7,2,419600,1548521,1559521,1559521,1548521,140000
4D2002DD0004,230,16,7,2,419600,1572718,1583718,1583718,1572718,140000
4D2002DD0005,229,16,7,2,419600,1596246,1607246,1607246,1596246,140000
4D2002DD0006,228,16,7,2,419600,1621617,1632617,1632617,1621617,140000
4D2002DD0007,227,16,7,2,419600,1645886,1656886,1656886,1645886,140000
4D2002DD0008,226,16,7,2,419600,1669426,1680426,1680426,1669426,140000
4D2002DD0009,225,20,7,2,419600,1694737,1705737,1705737,1694737,140000
4D2002DD0010,224,20,7,2,419600,1720503,1731503,1731503,1720503,140000
4D2002DD0011,223,20,7,2,419600,1747141,1758141,1758141,1747141,140000
4D2002DD0012,222,20,7,2,419600,1773897,1784897,1784897,1773897,140000
4D2002DD0013,221,20,7,2,419600,1801071,1812071,1812071,1801071,140000
4D2003AA0002,220,12,15,2,536300,924,11924,11924,924,140000
4D2003AA0003,219,12,15,2,536300,31648,42648,42648,31648,140000
4D2003AA0004,218,12,15,2,536300,62085,73085,73085,62085,140000
4D2003AA0005,217,12,15,2,536300,94882,105882,105882,94882,140000
4D2003AA0006,216,12,15,2,536300,125286,136286,136286,125286,140000
4D2003AA0007,215,12,15,2,536300,152340,163340,163340,152340,140000
4D2003AA0008,214,12,15,2,536300,182749,193749,193749,182749,140000
4D2003AA0009,213,12,15,2,536300,212461,223461,223461,212461,140000
4D2003AA0010,212,12,15,2,536300,242093,253093,253093,242093,140000
4D2003AA0011,211,12,15,2,536300,272797,283797,283797,272797,140000
4D2003AA0012,210,12,15,2,536300,302352,313352,313352,302352,140000
4D2003AA0013,209,12,15,2,536300,335146,346146,346146,335146,140000
4D2003AA0014,208,12,15,2,536300,362953,373953,373953,362953,140000
4D2003AA0015,207,12,15,2,536300,395323,406323,406323,395323,140000
4D2003BB0001,206,12,15,2,536300,423121,434121,434121,423121,140000
4D2003BB0002,205,12,15,2,536300,453523,464523,464523,453523,140000
4D2003BB0003,204,12,15,2,536300,486632,497632,497632,486632,140000
4D2003BB0004,203,12,15,2,536300,516496,527496,527496,516496,140000
4D2003BB0005,202,12,15,2,536300,543925,554925,554925,543925,140000
4D2003BB0006,201,12,15,2,536300,576632,587632,587632,576632,140000
4D2003BB0007,200,12,15,2,536300,603691,614691,614691,603691,140000
4D2003BB0008,199,12,15,2,536300,636334,647334,647334,636334,140000
4D2003BB0009,198,12,15,2,536300,666359,677359,677359,666359,140000
4D2003BB0010,197,12,15,2,536300,694162,705162,705162,694162,140000
4D2003BB0011,196,12,15,2,536300,727114,738114,738114,727114,140000
4D2003BB0012,195,12,15,2,536300,753858,764858,764858,753858,140000
4D2003BB0013,194,12,15,2,536300,783793,794793,794793,783793,140000
4D2003BB0014,193,12,15,2,536300,813330,824330,824330,813330,140000
4D2003BB0015,192,12,15,2,536300,843000,854000,854000,843000,140000
4D2003CC0001,191,12,15,2,536000,874157,882657,882657,874157,140000
4D2003CC0002,190,12,15,2,536000,904184,915184,915184,904184,140000
4D2003CC0003,189,12,15,2,536000,934250,945250,945250,934250,140000
4D2003CC0004,188,12,15,2,536000,964211,975211,975211,964211,140000
4D2003CC0005,187,12,15,2,536000,997457,1008457,1008457,997457,140000
4D2003CC0006,186,12,15,2,536000,1027136,1038136,1038136,1027136,140000
4D2003CC0007,185,12,15,2,536000,1057010,1068010,1068010,1057010,140000
4D2003CC0008,184,12,15,2,536000,1087036,1098036,1098036,1087036,140000
4D2003CC0009,183,12,15,2,536000,1117053,1128053,1128053,1117053,140000
4D2003CC0010,182,12,15,2,536000,1147271,1158271,1158271,1147271,140000
4D2003CC0011,181,12,15,2,536000,1177167,1188167,1188167,1177167,140000
4D2003CC0012,180,12,15,2,536000,1207397,1218397,1218397,1207397,140000
4D2003CC0013,179,12,15,2,536000,1235182,1246182,1246182,1235182,140000
4D2003CC0014,178,12,15,2,536000,1267086,1278086,1278086,1267086,140000
4D2003CC0015,177,12,15,2,536000,1296817,1307817,1307817,1296817,140000
4D2003DD0001,176,12,15,2,536000,1328611,1339611,1339611,1328611,140000
4D2003DD0002,175,12,15,2,534479,1358809,1369809,1369809,1358809,140000
4D2003DD0003,174,12,15,2,534458,1388804,1399804,1399804,1388804,140000
4D2003DD0004,173,12,15,2,534437,1419021,1430021,1430021,1419021,140000
4D2003DD0005,172,12,15,2,534416,1448857,1459857,1459857,1448857,140000
4D2003DD0006,171,12,15,2,534395,1476119,1487119,1487119,1476119,140000
4D2003DD0007,170,12,15,2,534374,1506634,1517634,1517634,1506634,140000
4D2003DD0008,169,12,15,2,534353,1538958,1549958,1549958,1538958,140000
4D2003DD0009,168,12,15,2,534332,1566857,1577857,1577857,1566857,140000
4D2003DD0010,167,12,15,2,534311,1598863,1609863,1609863,1598863,140000
4D2003DD0011,166,12,15,2,534290,1628282,1639282,1639282,1628282,140000
4D2003DD0012,165,12,15,2,534269,1659111,1670111,1670111,1659111,140000
4D2003DD0013,164,12,15,2,534248,1689805,1700805,1700805,1689805,140000
4D2003DD0014,163,12,15,2,534227,1718334,1729334,1729334,1718334,140000
4D2003DD0015,162,12,15,2,534200,1748315,1759315,1759315,1748315,140000
4D2004AA0002,161,12,15,2,664200,15333,26333,26333,15333,140000
4D2004AA0003,160,12,15,2,664108,51818,62818,62818,51818,140000
4D2004AA0004,159,12,15,2,664016,91971,102971,102971,91971,140000
4D2004AA0005,158,12,15,2,663924,130443,141443,141443,130443,140000
4D2004AA0006,157,12,15,2,663832,166669,177669,177669,166669,140000
4D2004AA0007,156,12,15,2,663740,204180,215180,215180,204180,140000
4D2004AA0008,155,12,15,2,663648,243600,254600,254600,243600,140000
4D2004AA0009,154,12,15,2,663556,280249,291249,291249,280249,140000
4D2004AA0010,153,12,15,2,663464,318686,329686,329686,318686,140000
4D2004AA0011,152,12,15,2,663372,358596,369596,369596,358596,140000
4D2004AA0012,151,12,15,2,663280,395752,406752,406752,395752,140000
4D2004AA0013,150,12,15,2,663188,434274,445274,445274,434274,140000
4D2004AA0014,149,12,15,2,663096,471341,482341,482341,471341,140000
4D2004AA0015,148,12,15,2,663000,508187,519187,519187,508187,140000
4D2004BB0001,147,16,15,2,663000,548035,559035,559035,548035,140000
4D2004BB0002,146,16,15,2,662964,582049,593049,593049,582049,140000
4D2004BB0003,145,16,15,2,662928,615059,626059,626059,615059,140000
4D2004BB0004,144,16,15,2,662892,647214,658214,658214,647214,140000
4D2004BB0005,143,16,15,2,662856,682622,693622,693622,682622,140000
4D2004BB0006,142,16,15,2,662820,715162,726162,726162,715162,140000
4D2004BB0007,141,16,15,2,662784,748564,759564,759564,748564,140000
4D2004BB0008,140,16,15,2,662748,780733,791733,791733,780733,140000
4D2004BB0009,139,16,15,2,662712,814104,825104,825104,814104,140000
4D2004BB0010,138,16,15,2,662676,848755,859755,859755,848755,140000
4D2004BB0011,137,16,15,2,662640,882310,893310,893310,882310,140000
4D2004BB0012,136,16,15,2,662600,916011,927011,927011,916011,140000
4D2004CC0001,135,16,15,2,662600,951052,962052,962052,951052,140000
4D2004CC0002,134,16,15,2,662564,983888,994888,994888,983888,140000
4D2004CC0003,133,16,15,2,662528,1017005,1028005,1028005,1017005,140000
4D2004CC0004,132,16,15,2,662492,1052547,1063547,1063547,1052547,140000
4D2004CC0005,131,16,15,2,662456,1084291,1095291,1095291,1084291,140000
4D2004CC0006,130,16,15,2,662420,1119497,1130497,1130497,1119497,140000
4D2004CC0007,129,16,15,2,662384,1152710,1163710,1163710,1152710,140000
4D2004CC0008,128,16,15,2,662348,1184717,1195717,1195717,1184717,140000
4D2004CC0009,127,16,15,2,662312,1219691,1230691,1230691,1219691,140000
4D2004CC0010,126,16,15,2,662276,1252063,1263063,1263063,1252063,140000
4D2004CC0011,125,16,15,2,662240,1285221,1296221,1296221,1285221,140000
4D2004CC0012,124,16,15,2,662200,1318227,1329227,1329227,1318227,140000
4D2004DD0001,123,24,15,2,662200,1347784,1358784,1358784,1347784,140000
4D2004DD0002,122,24,15,2,662200,1379072,1390072,1390072,1379072,140000
4D2004DD0003,121,24,15,2,662200,1410358,1421358,1421358,1410358,140000
4D2004DD0004,120,24,15,2,662200,1440346,1451346,1451346,1440346,140000
4D2004DD0005,119,24,15,2,662200,1470845,1481845,1481845,1470845,140000
4D2004DD0006,118,24,15,2,662200,1499369,1510369,1510369,1499369,140000
4D2004DD0007,117,24,15,2,662200,1529084,1540084,1540084,1529084,140000
4D2004DD0008,116,24,15,2,662200,1561270,1572270,1572270,1561270,140000
4D2004DD0009,115,24,15,2,662200,1590920,1601920,1601920,1590920,140000
4D2004DD0010,114,24,15,2,662200,1619190,1630190,1630190,1619190,140000
4D2004DD0011,113,24,15,2,662200,1651209,1662209,1662209,1651209,140000
4D2004DD0012,112,24,15,2,662200,1679106,1690106,1690106,1679106,140000
4D2004DD0013,111,24,15,2,662200,1709557,1720557,1720557,1709557,140000
4D2004DD0014,110,24,15,2,662200,1741032,1752032,1752032,1741032,140000
4D2004DD0015,109,24,15,2,662200,1769822,1780822,1780822,1769822,140000
4D2005AA0002,108,16,15,2,55900,9197,20197,20197,9197,140000
4D2005AA0003,107,16,15,2,55867,45445,56445,56445,45445,140000
4D2005AA0004,106,16,15,2,55834,76914,87914,87914,76914,140000
4D2005AA0005,105,16,15,2,55801,112643,123643,123643,112643,140000
4D2005AA0006,104,16,15,2,55768,146464,157464,157464,146464,140000
4D2005AA0007,103,16,15,2,55735,177079,188079,188079,177079,140000
4D2005AA0008,102,16,15,2,55702,210062,221062,221062,210062,140000
4D2005AA0009,101,16,15,2,55669,246998,257998,257998,246998,140000
4D2005AA0010,100,16,15,2,55636,278057,289057,289057,278057,140000
4D2005AA0011,99,16,15,2,55603,311100,322100,322100,311100,140000
4D2005AA0012,98,16,15,2,55570,347195,358195,358195,347195,140000
4D2005AA0013,97,16,15,2,55537,380239,391239,391239,380239,140000
4D2005AA0014,96,16,15,2,55500,410000,421000,421000,410000,140000
4D2005BB0001,95,16,15,2,55500,445084,456084,456084,445084,140000
4D2005BB0002,94,16,15,2,55469,481728,492728,492728,481728,140000
4D2005BB0003,93,16,15,2,55438,514902,525902,525902,514902,140000
4D2005BB0004,92,16,15,2,55407,546109,557109,557109,546109,140000
4D2005BB0005,91,16,15,2,55376,582562,593562,593562,582562,140000
4D2005BB0006,90,16,15,2,55345,615448,626448,626448,615448,140000
4D2005BB0007,89,16,15,2,55314,649447,660447,660447,649447,140000
4D2005BB0008,88,16,15,2,55283,682391,693391,693391,682391,140000
4D2005BB0009,87,16,15,2,55252,713583,724583,724583,713583,140000
4D2005BB0010,86,16,15,2,55221,747277,758277,758277,747277,140000
4D2005BB0011,85,16,15,2,55190,783546,794546,794546,783546,140000
4D2005BB0012,84,16,15,2,55159,816900,827900,827900,816900,140000
4D2005BB0013,83,16,15,2,55128,847237,858237,858237,847237,140000
4D2005BB0014,82,16,15,2,55100,879328,890328,890328,879328,140000
4D2005CC0001,81,16,15,2,55100,915693,926693,926693,915693,140000
4D2005CC0002,80,16,15,2,55046,949940,960940,960940,949940,140000
4D2005CC0003,79,16,15,2,54992,981194,992194,992194,981194,140000
4D2005CC0004,78,16,15,2,54938,1015154,1026154,1026154,1015154,140000
4D2005CC0005,77,16,15,2,54884,1048700,1059700,1059700,1048700,140000
4D2005CC0006,76,16,15,2,54830,1081951,1092951,1092951,1081951,140000
4D2005CC0007,75,16,15,2,54776,1118172,1129172,1129172,1118172,140000
4D2005CC0008,74,16,15,2,54722,1149003,1160003,1160003,1149003,140000
4D2005CC0009,73,16,15,2,54668,1184555,1195555,1195555,1184555,140000
4D2005CC0010,72,16,15,2,54614,1219152,1230152,1230152,1219152,140000
4D2005CC0011,71,16,15,2,54560,1251948,1262948,1262948,1251948,140000
4D2005CC0012,70,16,15,2,54506,1281915,1292915,1292915,1281915,140000
4D2005CC0013,69,16,15,2,54452,1319201,1330201,1330201,1319201,140000
4D2005CC0014,68,16,15,2,54400,1349799,1360799,1360799,1349799,140000
4D2005DD0001,67,16,15,2,54400,1382591,1393591,1393591,1382591,140000
4D2005DD0002,66,16,15,2,54400,1416167,1427167,1427167,1416167,140000
4D2005DD0003,65,16,15,2,54400,1449696,1460696,1460696,1449696,140000
4D2005DD0004,64,16,15,2,54400,1485863,1496863,1496863,1485863,140000
4D2005DD0005,63,16,15,2,54400,1519194,1530194,1530194,1519194,140000
4D2005DD0006,62,16,15,2,54400,1550296,1561296,1561296,1550296,140000
4D2005DD0007,61,16,15,2,54400,1583687,1594687,1594687,1583687,140000
4D2005DD0008,60,16,15,2,54400,1619837,1630837,1630837,1619837,140000
4D2005DD0009,59,16,15,2,54400,1650725,1661725,1661725,1650725,140000
4D2005DD0010,58,16,15,2,54400,1684384,1695384,1695384,1684384,140000
4D2005DD0011,57,16,15,2,54400,1717250,1728250,1728250,1717250,140000
4D2005DD0012,56,16,15,2,54400,1753580,1764580,1764580,1753580,140000
4D2005DD0013,55,16,15,2,54400,1787003,1798003,1798003,1787003,140000
4D2006AA0002,54,16,15,2,182200,12551,23551,23551,12551,140000
4D2006AA0003,53,16,15,2,182183,43278,54278,54278,43278,140000
4D2006AA0004,52,16,15,2,182166,76621,87621,87621,76621,140000
4D2006AA0005,51,16,15,2,182149,113111,124111,124111,113111,140000
4D2006AA0006,50,16,15,2,182132,143620,154620,154620,143620,140000
4D2006AA0007,49,16,15,2,182115,179909,190909,190909,179909,140000
4D2006AA0008,48,16,15,2,182098,213273,224273,224273,213273,140000
4D2006AA0009,47,16,15,2,182081,247167,258167,258167,247167,140000
4D2006AA0010,46,16,15,2,182064,278212,289212,289212,278212,140000
4D2006AA0011,45,16,15,2,182047,311597,322597,322597,311597,140000
4D2006AA0012,44,16,15,2,182030,348120,359120,359120,348120,140000
4D2006AA0013,43,16,15,2,182013,378554,389554,389554,378554,140000
4D2006AA0014,42,16,15,2,182000,410581,421581,421581,410581,140000
4D2006BB0001,41,16,15,2,182000,445059,456059,456059,445059,140000
4D2006BB0002,40,16,15,2,181977,481064,492064,492064,481064,140000
4D2006BB0003,39,16,15,2,181954,512728,523728,523728,512728,140000
4D2006BB0004,38,16,15,2,181931,545720,556720,556720,545720,140000
4D2006BB0005,37,16,15,2,181908,582307,593307,593307,582307,140000
4D2006BB0006,36,16,15,2,181885,614892,625892,625892,614892,140000
4D2006BB0007,35,16,15,2,181862,646276,657276,657276,646276,140000
4D2006BB0008,34,16,15,2,181839,679435,690435,690435,679435,140000
4D2006BB0009,33,16,15,2,181816,712661,723661,723661,712661,140000
4D2006BB0010,32,16,15,2,181793,749098,760098,760098,749098,140000
4D2006BB0011,31,16,15,2,181770,780053,791053,791053,780053,140000
4D2006BB0012,30,16,15,2,181747,813484,824484,824484,813484,140000
4D2006BB0013,29,16,15,2,181724,847062,858062,858062,847062,140000
4D2006BB0014,28,16,15,2,181700,879645,890645,890645,879645,140000
4D2006CC0001,27,16,15,2,181100,914052,925052,925052,914052,140000
4D2006CC0002,26,16,15,2,181062,949087,960087,960087,949087,140000
4D2006CC0003,25,16,15,2,181024,983738,994738,994738,983738,140000
4D2006CC0004,24,16,15,2,180986,1014920,1025920,1025920,1014920,140000
4D2006CC0005,23,16,15,2,180948,1050841,1061841,1061841,1050841,140000
4D2006CC0006,22,16,15,2,180910,1081964,1092964,1092964,1081964,140000
4D2006CC0007,21,16,15,2,180872,1115110,1126110,1126110,1115110,140000
4D2006CC0008,20,16,15,2,180834,1151300,1162300,1162300,1151300,140000
4D2006CC0009,19,16,15,2,180796,1181800,1192800,1192800,1181800,140000
4D2006CC0010,18,16,15,2,180758,1215467,1226467,1226467,1215467,140000
4D2006CC0011,17,16,15,2,180720,1249584,1260584,1260584,1249584,140000
4D2006CC0012,16,16,15,2,180682,1282831,1293831,1293831,1282831,140000
4D2006CC0013,15,16,15,2,180644,1315643,1326643,1326643,1315643,140000
4D2006CC0014,14,16,15,2,180600,1351954,1362954,1362954,1351954,140000
4D2006DD0001,13,16,15,2,180800,1383760,1394760,1394760,1383760,140000
4D2006DD0002,12,16,15,2,180775,1415096,1426096,1426096,1415096,140000
4D2006DD0003,11,16,15,2,180750,1449392,1460392,1460392,1449392,140000
4D2006DD0004,10,16,15,2,180725,1483071,1494071,1494071,1483071,140000
4D2006DD0005,9,16,15,2,180700,1518678,1529678,1529678,1518678,140000
4D2006DD0006,8,16,15,2,180675,1550269,1561269,1561269,1550269,140000
4D2006DD0007,7,16,15,2,180650,1585741,1596741,1596741,1585741,140000
4D2006DD0008,6,16,15,2,180625,1616184,1627184,1627184,1616184,140000
4D2006DD0009,5,16,15,2,180600,1652107,1663107,1663107,1652107,140000
4D2006DD0010,4,16,15,2,180575,1683040,1694040,1694040,1683040,140000
4D2006DD0011,3,16,15,2,180550,1718996,1729996,1729996,1718996,140000
4D2006DD0012,2,16,15,2,180525,1753004,1764004,1764004,1753004,140000
4D2006DD0013,1,16,15,2,180500,1783992,1794992,1794992,1783992,140000
source/DeviceLibrary/duoStore/BoxBean.cs
...@@ -176,29 +176,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -176,29 +176,11 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public string GetWarnMsg()
{
string msg = WarnMsg;
if (alarmType.Equals(AlarmType.None).Equals(false))
{
msg= LastAlarmTime.ToLongTimeString() + " " + WarnMsg + " ";
}
//if (IOValue(IO_Type.DoorLimit).Equals(IO_VALUE.LOW))
//{
// msg = msg + " 无门禁信号";
//}
if (humBean.TempOrHumidityIsAlarm)
{
msg = msg + " 温湿度报警[" + humBean.TempAlarmTime.ToLongTimeString() + "]";
}
return msg;
}
#region 原点返回和复位处理 #region 原点返回和复位处理
private void ReturnHome() private void ReturnHome()
{ {
CurrShelfID = "";
lastPosId = ""; lastPosId = "";
lastPosIdStatus = StoreStatus.ResetMove; lastPosIdStatus = StoreStatus.ResetMove;
AutoInout.ClearCount(); AutoInout.ClearCount();
...@@ -206,14 +188,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -206,14 +188,6 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NewMove(MoveType.ReturnHome); MoveInfo.NewMove(MoveType.ReturnHome);
InoutStartReset(); InoutStartReset();
} }
public void MoveToP1()
{
//压紧轴回原点，叉子回到P1,关闭门旋转轴和升降轴回到P1
MoveInfo.NewMove(MoveType.StoreReset);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H54_InOutToP1);
LogInfo("到待机状态，进出轴到P1，判断叉子没有料盘");
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
}
public override void Reset(bool isNeedClearAuto = true) public override void Reset(bool isNeedClearAuto = true)
{ {
...@@ -251,9 +225,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -251,9 +225,7 @@ namespace OnlineStore.DeviceLibrary
LineStop(); LineStop();
InoutAxis.HomeMove(MoveInfo); InoutAxis.HomeMove(MoveInfo);
} }
/// <summary>
/// 复位处理
/// </summary>
protected override void ResetProcess() protected override void ResetProcess()
{ {
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
...@@ -267,76 +239,47 @@ namespace OnlineStore.DeviceLibrary ...@@ -267,76 +239,47 @@ namespace OnlineStore.DeviceLibrary
switch (MoveInfo.MoveStep) switch (MoveInfo.MoveStep)
{ {
case StoreMoveStep.BOX_H01_InOutBack: case StoreMoveStep.BOX_H01_InOutBack:
Thread.Sleep(200); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_InoutToP1);
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H02_TopDown); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
LogInfo(MoveInfo.MoveType + ": ，进出轴到待机点P1，关闭仓们"); LogInfo(MoveInfo.MoveType + ": ，进出轴到待机点P1，关闭仓们");
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed); InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
CylinderMove(MoveInfo, IO_Type.OutDoor_Up, IO_Type.OutDoor_Down); CylinderMove(MoveInfo, IO_Type.OutDoor_Up, IO_Type.OutDoor_Down);
break; break;
//case StoreMoveStep.BOX_H02_TopDown:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_LineRun); case StoreMoveStep.BOX_H02_InoutToP1:
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH)) LineStop();
// { //如果此时轴三还在报警，需要提示错误并等待
// LogInfo(MoveInfo.MoveType + ":取料工位有料架，线体停止 "); if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0)
// LineStop(); {
// } LogUtil.error(Name + MoveInfo.MoveType + "复位失败: " + Config.InOut_Axis.Explain + "报警");
// else WarnMsg = Name + "复位失败: " + Config.InOut_Axis.Explain + "报警";
// { Alarm(AlarmType.AxisAlarm );
// LogInfo(MoveInfo.MoveType + ":取料工位无料架， 线体先正转3000或等待取料工位有料架"); return;
// LineRun(); }
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.HIGH)); LogInfo(MoveInfo.MoveType + ": ， 压紧轴，旋转轴，上下轴开始 原点返回");
// MoveInfo.OneWaitCanEndStep = true; MoveInfo.NextMoveStep(StoreMoveStep.BOX_H03_OtherAxisHome);
// } MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
// break; ComAxis.HomeMove(MoveInfo);
MiddleAxis.HomeMove(MoveInfo);
//case StoreMoveStep.BOX_H03_LineRun: UpdownAxis.HomeMove(MoveInfo);
// LineStop(); break;
// //如果此时轴三还在报警，需要提示错误并等待 case StoreMoveStep.BOX_H03_OtherAxisHome:
// if (ACServerManager.GetAlarmStatus(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()) > 0) MoveInfo.NextMoveStep(StoreMoveStep.BOX_H04_OtherAxisBack);
// { MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
// LogUtil.error(Name + MoveInfo.MoveType + "复位失败: " + Config.InOut_Axis.Explain + "报警"); LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// WarnMsg = Name + "复位失败: " + Config.InOut_Axis.Explain + "报警"; MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// Alarm(StoreAlarmType.AxisAlarm, GetAlarmCodeByAxis(Config.InOut_Axis).ToString(), WarnMsg, StoreMoveType.None); UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// return; ComAxis.AbsMove(MoveInfo, Config.CompAxis_P1, Config.CompAxis_P1_Speed);
// } break;
// //复位和回原点要等轴3进出轴ORG亮了以后才能返回其他轴 case StoreMoveStep.BOX_H04_OtherAxisBack:
// LogInfo(MoveInfo.MoveType + ": 停止线体， 压紧轴，旋转轴，上下轴开始 原点返回"); LogInfo(MoveInfo.MoveType + ": 完成");
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H05_OtherAxisBack); MoveEndToRuningStatus();
// ACAxisHomeMove(Config.Comp_Axis); break;
// ACAxisHomeMove(Config.Middle_Axis);
// ACAxisHomeMove(Config.UpDown_Axis);
// break;
//case StoreMoveStep.BOX_H05_OtherAxisBack: default: break;
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H06_MiddleAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
//case StoreMoveStep.BOX_H06_MiddleAxisToP1:
// LogInfo(MoveInfo.MoveType + ": 完成");
// MoveEndToRuningStatus();
// break;
//case StoreMoveStep.BOX_H54_InOutToP1:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H55_CompHome);
// LogInfo("到待机状态，压紧轴回原点，关闭舱门");
// ACAxisHomeMove(Config.Comp_Axis);
// break;
//case StoreMoveStep.BOX_H55_CompHome:
// MoveInfo.NextMoveStep(StoreMoveStep.BOX_H56_OtherAxisToP1);
// LogInfo(MoveInfo.MoveType + ": 旋转轴运动到P1，上下轴走到P1，压紧轴到P1 ");
// MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxis_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_P1_Position, Config.CompAxis_P1_Speed);
// break;
//case StoreMoveStep.BOX_H56_OtherAxisToP1:
// LogInfo("到待机状态完成");
// MoveEndToRuningStatus();
// break;
//default: break;
} }
} }
...@@ -546,8 +489,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -546,8 +489,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (MoveInfo.MoveType.Equals(MoveType.None)) if (MoveInfo.MoveType.Equals(MoveType.None))
{ {
LogUtil.info(Name + "收到复位信号，当前无报警，且空闲中，只回到待机点"); LogUtil.info(Name + "收到复位信号，当前无报警，且空闲中，暂不处理");
MoveToP1();
} }
else else
{ {
...@@ -585,15 +527,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -585,15 +527,6 @@ namespace OnlineStore.DeviceLibrary
IOTimeOutProcess(); IOTimeOutProcess();
ShowTimeLog("IOTimeOutProcess"); ShowTimeLog("IOTimeOutProcess");
////如果入口有料架需要入库
//if (StoreManager.Store.AutoShelfInstore &&
// MoveInfo.MoveType.Equals(StoreMoveType.None) &&
// (IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH)))
//{
// LogUtil.info(Name + "AutoShelfInstore=true ，检测到料架，开始料架入库");
// StartShelfInStore();
//}
} }
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/duoStore/BoxBean_Partial.cs
...@@ -15,8 +15,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,8 +15,8 @@ namespace OnlineStore.DeviceLibrary
partial class BoxBean partial class BoxBean
{ {
public ConcurrentQueue<InOutParam> waitOutStoreList = new ConcurrentQueue<InOutParam>();
#region 出入库结果验证 #region 出入库结果验证
public bool CompressSigTimeOut = false;
private void CheckWait() private void CheckWait()
{ {
List<WaitResultInfo> list = MoveInfo.WaitList; List<WaitResultInfo> list = MoveInfo.WaitList;
...@@ -90,59 +90,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -90,59 +90,6 @@ namespace OnlineStore.DeviceLibrary
{ {
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds); wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
} }
else if (wait.WaitType.Equals(WaitEnum.W007_ReelHeight))
{
}
else if (wait.WaitType.Equals(WaitEnum.W009_ScanCode))
{
wait.IsEnd = (LastScanCodes.Count > 0);
}
else if (wait.WaitType.Equals(WaitEnum.W010_AgvStatus))
{
//if (wait.AgvAction.Equals((int)ClientAction.Ready))
//{
// //Ready时使用状态判断，arrive时需要判断料架号是否正确
// ClientAction agvA = AgvClient.GetAction(Config.AgvNodeName);
// wait.IsEnd = ((int)agvA).Equals(wait.AgvAction);
//}
//if (!wait.IsEnd && span.TotalSeconds > 10)
//{
// //如果是等待AGV到达，等待有料架信号也算结束
// if (wait.AgvAction.Equals((int)ClientAction.Arrive) && MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
// {
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
// {
// LogInfo("BI_01_ReadyShelf 等待agv到达Arrive，检测到 LineTake_Check 信号，结束等待");
// wait.IsEnd = true;
// }
// else if (IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.HIGH))
// {
// LogInfo("BI_01_ReadyShelf 等待agv到达Arrive，检测到 LineIn_Check 信号，结束等待");
// wait.IsEnd = true;
// }
// }
// else if (wait.AgvAction.Equals((int)ClientAction.Arrive) && MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitEmptyAgv))
// {
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.LOW))
// {
// LogInfo("BS_03_WaitArrive 等待agv到达Arrive，检测到 LineTake_Check和LineIn_Check都没有信号，结束等待");
// wait.IsEnd = true;
// }
// }
//}
}
else if (wait.WaitType.Equals(WaitEnum.W011_DoorCloseEvent))
{
//if (AgvClient.closeDoorTimeMap.ContainsKey(Config.AgvNodeName))
//{
// DateTime time = AgvClient.closeDoorTimeMap[Config.AgvNodeName];
// if (time >= MoveInfo.LastSetpTime)
// {
// wait.IsEnd = true;
// }
//}
}
if (wait.IsEnd) if (wait.IsEnd)
{ {
if (MoveInfo.OneWaitCanEndStep) if (MoveInfo.OneWaitCanEndStep)
...@@ -200,36 +147,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -200,36 +147,15 @@ namespace OnlineStore.DeviceLibrary
{ {
InoutAxis.AbsMove(MoveInfo, InOut_P1, Config.InOutAxis_P1_Speed); InoutAxis.AbsMove(MoveInfo, InOut_P1, Config.InOutAxis_P1_Speed);
} }
//StoreMove.WaitList.Add(WaitResultInfo.WaitAxisOrg(Config.InOut_Axis,IO_VALUE.HIGH));
} }
#endregion #endregion
public ConcurrentQueue<InOutParam> waitOutStoreList = new ConcurrentQueue<InOutParam>();
private List<string> LastScanCodes = new List<string>();
private int ComTargetPosition = 0;
private int LastWidth = 0;
private int LastHeight = 0;
private string CurrShelfID = "";
/// <summary>
/// 最后一次使用的料架号
/// </summary>
// private string LastRfidID = "";//服务器发送的出库rfid
//private InOutParam LastOutParam = new InOutParam();
#region 入库 #region 入库
private void ClearLastTrayInfo()
{
LastScanCodes = new List<string>();
ComTargetPosition = 0;
LastWidth = 0;
LastHeight = 0;
}
private DateTime startInStoreTime = DateTime.Now; private DateTime startInStoreTime = DateTime.Now;
/// <summary>
/// 开始单盘入库
/// </summary>
public override void StartInStoreMove(InOutParam param) public override void StartInStoreMove(InOutParam param)
{ {
startInStoreTime = DateTime.Now; startInStoreTime = DateTime.Now;
...@@ -257,107 +183,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -257,107 +183,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.SingleInstore = true; MoveInfo.SingleInstore = true;
InOutStoreLog("料架取料：" + MoveInfo.SLog + " 叉子后退到待机点P1, 重置盘信息"); InOutStoreLog("料架取料：" + MoveInfo.SLog + " 叉子后退到待机点P1, 重置盘信息");
InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed); InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1_Speed);
ClearLastTrayInfo();
//LastRfidID = "";
}
/// <summary>
/// 开始料架入库
/// </summary>
public void StartShelfInStore()
{
//bool canStart = (storeRunStatus.Equals(StoreRunStatus.Runing)
// && MoveInfo.MoveType.Equals(StoreMoveType.None));
//if (!canStart || isInSuddenDown || isNoAirCheck || (alarmType.Equals(StoreAlarmType.None).Equals(false)))
//{
// return;
//}
//storeRunStatus = StoreRunStatus.Busy;
//storeStatus = StoreStatus.InStoreExecute;
//// EmprtShelfList = new ConcurrentQueue<string>();
//if (IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.HIGH))
//{
// MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config);
// MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
// MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
// LogInfo(" 空闲中，检测到入料口有料架，启动料架入库 " + MoveInfo.SLog + "");
// // CylinderMove(MoveInfo, IO_Type.EntranceDoor_Close, IO_Type.EntranceDoor_Open);
// // DoorBean.StartOpen(MoveInfo);
//}
//else if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
//{
// MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config);
// MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
// MoveInfo.NextMoveStep(StoreMoveStep.BI_06_DoorClose);
// LogInfo(" 空闲中，检测到入料口有料架，启动料架入库 " + MoveInfo.SLog + "");
//}
//else
//{
// LogInfo(" 空闲中，需要料架入库，料架入库 " + MoveInfo.SLog + "：入料口移门打开，更新 WaitShelfEnter=false");
// WaitShelfEnter = false;
// MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
// MoveInfo.MoveParam.MoveP = new LineMoveP(Config);
// MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
// MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
// DoorBean.StartBack(MoveInfo);
//}
} }
private void UpdateShelfId()
{
}
private void GetPosId()
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam);
InOutStoreLog("不扫码 " + MoveInfo.SLog + ": 获取库位号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
if (MoveInfo.IsShelfLocked)
{
bool result = GetPosIdByCode();
if (!result)//获取库位失败
{
MoveInfo.MoveParam.PosID = "";
StartSendTray("锁定库位：获取入库库位失败");
}
else
{
MoveInfo.EndStepWait();
}
}
}
private void StartMoveToBag()
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_51_MoveToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
private void StartSendTray(string str = "扫码失败")
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴到NG门口高点P12，旋转轴到NG门口P11");
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
}
private void StartMoveTrayBack(string str = "料盘不属于该仓库")
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，走到料架位置，旋转轴至P101，升降轴至P102");
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.Middle_P101, Config.MiddleAxis_P11_Speed);
}
protected override void InStoreProcess() protected override void InStoreProcess()
{ {
LineMoveP moveP = MoveInfo.MoveParam.MoveP; LineMoveP moveP = MoveInfo.MoveParam.MoveP;
...@@ -370,383 +197,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -370,383 +197,9 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
#region 料架取料盘扫码获取POSID
//if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_10_StartGetTray))
//{
// if (MoveInfo.IsShelfLocked)
// {
// if (MoveInfo.NextLockedShelfPos())
// {
// //新的料架库位
// startInStoreTime = DateTime.Now;
// MoveInfo.SingleInstore = false;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到待机点P1, 重置盘信息");
// InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// ClearLastTrayInfo();
// }
// else
// {
// //所有料盘已取料完成，送出料架
// StartShelfOut();
// }
// }
// else
// {
// if (MoveInfo.NextShelfPos())
// {
// //新的料架库位
// startInStoreTime = DateTime.Now;
// MoveInfo.SingleInstore = false;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_11_InoutToP1);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到待机点P1, 重置盘信息");
// InoutAxis.AbsMove(MoveInfo, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
// ClearLastTrayInfo();
// }
// else
// {
// //所有料盘已取料完成，送出料架
// StartShelfOut();
// }
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_11_InoutToP1))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴到P101低点，旋转轴到P101点，压紧轴到压紧前点");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// ComAxis.AbsMove(MoveInfo, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子前进到P101点");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴上升到P102点");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102))
//{
// if (MoveInfo.SingleInstore)
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComDownMove);
// InOutStoreLog("单盘入库，料架取料 " + MoveInfo.SLog + "：压紧轴走到压紧点P2： " + MoveInfo.MoveParam.MoveP.ComPress_P2);
// ComAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_15_StartCompress);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：压紧轴开始缓慢压紧到P4 ：" + Config.CompAxis_P4_Position);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitComAxis(Config.Comp_Axis, Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed));
// Config.Comp_Axis.TargetPosition = Config.CompAxis_P4_Position;
// ACServerManager.AbsMove(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue(), Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed);
// ComAxisStartCheck();
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_15_StartCompress))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_16_ComDownMove);
// int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis.DeviceName,Config.Comp_Axis.GetAxisValue());
// ComTargetPosition = currPosition;
// int targetP = currPosition + Config.CompAxis_Down_Position;
// LastHeight = Config.GetComP2PlateH(targetP);
// MoveInfo.MoveParam.MoveP.ComPress_P2 = targetP;
// MoveInfo.MoveParam.MoveP.ComPress_P3 = targetP + Config.CompAxis_P3_P2_Value;
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：检测到Compress_Check，盘高【" + LastHeight + "】，向下压紧 [" + Config.CompAxis_Down_Position + "] 目标 [" + targetP +
// "]记录ComP2[" + targetP + "]ComP3[" + MoveInfo.MoveParam.MoveP.ComPress_P3 + "]");
// ComAxis.AbsMove(MoveInfo, targetP, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_16_ComDownMove))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_17_InoutBack);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子后退到扫码点");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_17_InoutBack))
//{
// if (MoveInfo.SingleInstore)
// {
// //单盘入库，不需要扫码
// StartMoveToBag();
// }
// else if(MoveInfo.IsShelfLocked)
// {
// //该料架已锁定库位，不需要扫码,直接查询服务器
// GetPosId();
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_21_ToScanPosition);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到P2,旋转轴到P1");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_21_ToScanPosition))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_22_InOutToP2);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_22_InOutToP2))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_23_PutTrayDown);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到扫码低点P1，压紧轴到压紧前点P3");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_23_PutTrayDown))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_24_InOutToP1);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回待机点P1");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.CompAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_24_InOutToP1))
//{
// LastWidth = 7;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_25_ScanCode);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：料盘识别 宽度【" + LastWidth + "】，开始扫码");
// MoveInfo.OneWaitCanEndStep = true;
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(12000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitCode());
// Task.Factory.StartNew(delegate
// {
// IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
// LastScanCodes = CodeManager.CameraScan(Config.GetCameraList(), Name);
// if (LastScanCodes.Count <= 0)
// {
// Thread.Sleep(1);
// LastScanCodes = CodeManager.CameraScan(Config.GetCameraList(), Name);
// }
// IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
// });
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_ScanCode))
//{
// if (LastScanCodes.Count <= 0 && LastWidth.Equals(0) && LastHeight.Equals(8))
// {
// storeStatus = StoreStatus.InStoreExecute;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "： 扫码失败，尺寸" + LastWidth + "*" + LastHeight + "，认为没拿到料盘，继续循环料架取料盘");
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴到P2");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_27_InoutToP2))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_28_GetScanPTray);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：升降轴到扫码高P2，压紧轴到压紧点P2");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_28_GetScanPTray))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_29_InoutBackP1);
// InOutStoreLog("扫码 " + MoveInfo.SLog + "：进出轴返回");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_29_InoutBackP1))
//{
// if (LastScanCodes.Count <= 0)
// {
// StartSendTray();
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam);
// InOutStoreLog("扫码 " + MoveInfo.SLog + ": 获取库位号");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
// bool result = GetPosIdByCode(MoveInfo.currShelfIndex, out CodeResultType codeResult);
// if (!result)//获取库位失败
// {
// if (codeResult == CodeResultType.NotFoundPos)//库位不在该料仓，将该料盘放回料架
// {
// //MoveInfo.MoveParam.PosID = "";
// StartMoveTrayBack("此料盘不属于该仓库,放回料架");
// }
// else//无法获取库位信息
// {
// MoveInfo.MoveParam.PosID = "";
// StartSendTray("获取入库库位失败");
// }
// }
// else
// {
// MoveInfo.EndStepWait();
// }
// }
//}
#endregion
#region 入库逻辑
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_30_SetInstoreParam))
{
StartMoveToBag();
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_51_MoveToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_52_DeviceToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子进入库位中，进出轴到库位P3");
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_52_DeviceToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_53_PutWareToBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：放下物品，升降轴到库位缓冲点P4，压紧轴到P3");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中，装置还未恢复原始状态)
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
lastPosId = posId;
lastPosIdStatus = StoreStatus.InStoreEnd;
storeStatus = StoreStatus.InStoreEnd;
//手动发给服务器状态，防止没有手动
//SendLineStatus(StoreID, posId, StoreStatus.InStoreEnd);
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_53_PutWareToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_54_DeviceBackFromBag);
InOutStoreLog("入库 " + MoveInfo.SLog + "：叉子从库位中返回，进出轴到P1");
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_54_DeviceBackFromBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_55_GoBack);
InOutStoreLog("入库 " + MoveInfo.SLog + "：返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始");
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_55_GoBack))
{
TimeSpan span = DateTime.Now - startInStoreTime;
if (MoveInfo.SingleInstore)
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
LogInfo(" 【" + posId + "】单盘入库结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
MoveEndToRuningStatus();
AutoInout.InOutEndProcess(this, MoveType.InStore);
}
else else
{ {
storeStatus = StoreStatus.InStoreExecute; LogInfo(" 入库，MoveInfo.MoveStep=" + MoveInfo.MoveStep + "，没有对应的处理！");
MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
InOutStoreLog("料架入库 " + MoveInfo.SLog + "：上一盘入库结束， 耗时【" + FormUtil.GetSpanStr(span) + "】继续循环料架取料盘");
}
}
#endregion
#region 把料盘送到NG逻辑
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_71_ToNGDoor))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_72_NGDoorUp);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：NG升降门上升");
// CylinderMove(MoveInfo, IO_Type.NGDoorCylinder_Down, IO_Type.NGDoowCylinder_Up);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_72_NGDoorUp))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_73_InoutToNGDoor);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：进出轴到NG料门口位置P11");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P11, Config.InOutAxis_P2_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_73_InoutToNGDoor))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_74_UpdownDown);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：升降轴到P11,压紧轴到P3，放下料盘");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P11, Config.UpDownAxis_P2_Speed);
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_74_UpdownDown))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_75_InoutToP1);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子后退到P1");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_75_InoutToP1))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_76_NGDoorDown);
// InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：关门NG料门，送出料盘结束");
// CylinderMove(MoveInfo, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_76_NGDoorDown))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_77_NGLineRun);
// InOutStoreLog("料架入库 " + MoveInfo.SLog + "：NG流水线转动3000");
// IOMove(IO_Type.NGLine_Run, IO_VALUE.HIGH);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_77_NGLineRun))
//{
// IOMove(IO_Type.NGLine_Run, IO_VALUE.LOW);
// MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
// InOutStoreLog("料架入库 " + MoveInfo.SLog + "：停止NG线体转动，继续循环料架取料盘");
//}
#endregion
#region 把料盘送回料架逻辑
else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_ToShelfPosition)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_PutReel)
{
MoveInfo.NextMoveStep(StoreMoveStep.SO_13_InoutBack);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子从出料口返回， 进出轴到P1 ");
InOutBackToP1(moveP.InOut_P1);
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_13_InoutBack)
{
MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
InOutStoreLog("送出料盘结束 " + MoveInfo.SLog + "： 升降轴返回，升降轴到P1，顶升下降,继续循环料架取料盘");
UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
}
#endregion
//料架进入逻辑
else if (MoveInfo.MoveStep < StoreMoveStep.BI_10_StartGetTray)
{
ShelfEnterProcess();
}
//料架送出逻辑
else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopDown)
{
ShelfOutProcess();
}
else
{
LogInfo(" 入库，MoveStep=" + MoveInfo.MoveStep + "，没有对应的处理！");
} }
} }
...@@ -767,9 +220,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -767,9 +220,6 @@ namespace OnlineStore.DeviceLibrary
waitOutStoreList.Enqueue(param); waitOutStoreList.Enqueue(param);
} }
} }
/// <summary>
/// 开始出库运动
/// </summary>
public override bool StartOutStoreMove(InOutParam param) public override bool StartOutStoreMove(InOutParam param)
{ {
startOutStoreTime = DateTime.Now; startOutStoreTime = DateTime.Now;
...@@ -820,263 +270,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -820,263 +270,16 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
#region 出入库步骤
//if (MoveInfo.MoveStep == StoreMoveStep.SO_01_InoutBack)
//{
// //判断是否需要送出料架，是否需要进入料架，是否可以直接开始
// if (MoveInfo.MoveParam.rfid.Equals(""))
// {
// SO_03_ToBagPosition();
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.SO_02_TopDown);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：顶升下降");
// CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
// }
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_02_TopDown)
//{
// if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
// {
// string LastRfidID = GetLastRfid();
// // if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid))
// if (MoveInfo.MoveParam.rfid.Equals(LastRfidID))
// {
// LogUtil.error("出库 【" + LastRfidID + "】 【" + MoveInfo.MoveParam.rfid + "，" + MoveInfo.MoveParam.realRfid + "】 同料架，开始取料");
// SO_03_ToBagPosition();
// return;
// }
// else
// {
// //重新记录
// LogInfo(" 执行出库【" + MoveInfo.MoveParam.ToStr() + "】失败，料架号不一致，加入等待队列");
// waitOutStoreList.Enqueue(MoveInfo.MoveParam);
// LogUtil.error(Name + "出库 【" + LastRfidID + "】 【" + MoveInfo.MoveParam.rfid + "，" + MoveInfo.MoveParam.realRfid + "】不同料架，送出当前料架，稍后重新出库");
// // MoveInfo.MoveParam.rfid = LastRfidID;
// MoveInfo.NewMove(StoreMoveType.OutStore, LastOutParam);
// //送出料架，并且记录出库信息，等会重新出库
// StartShelfOut();
// return;
// }
// }
// else if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && (!MoveInfo.MoveParam.rfid.Equals("")))
// {
// if (CurrShelfID.EndsWith("00"))
// {
// CurrShelfID = "";
// }
// string mark = GetMarkInfo();
// // string rfid = MoveInfo.MoveParam.rfid;
// MoveInfo.NextMoveStep(StoreMoveStep.BI_00_ReadyShelf);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： NeedEnter[" + mark + "][" + MoveInfo.MoveParam.rfid + "]，等待agv_Arrive 或有料架，进出轴到P1");
// InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
// //需要先叫agv到达
// MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
// }
// else
// {
// SO_03_ToBagPosition();
// }
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_03_ToPosition)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_04_ToPos);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进入库位中， 进出轴至P3(库位取放料点) ");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_04_ToPos)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_05_GetReel);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_05_GetReel)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_06_InoutBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从库位返回，进出轴至P1(待机点) ");
// //InoutAxis.AbsMove(MoveInfo, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// InOutBackToP1(moveP.InOut_P1);
// //把库位的物品放到取到叉子上之后是出仓完成
// string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
// lastPosId = posId;
// lastPosIdStatus = StoreStatus.OutStoreBoxEnd;
// storeStatus = StoreStatus.OutStoreBoxEnd;
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_06_InoutBack)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_07_CheckComSig);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：等待料叉压紧信号 ");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Compress_Check, IO_VALUE.HIGH));
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_07_CheckComSig)
//{
// if (IOValue(IO_Type.Compress_Check).Equals(IO_VALUE.HIGH) || IsIgnoreComSig)
// {
// IsIgnoreComSig = false;
// CompressSigTimeOut = false;
// MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 ");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
// MiddleAxis.AbsMove(MoveInfo, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// }
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_ToShelfPosition)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_10_WaitNoTray);
//}
////此处需要等待移栽没有工作，才能把盘放入出料口
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_09_LocationDown)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_10_WaitNoTray);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_10_WaitNoTray)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
// InoutAxis.AbsMove(MoveInfo, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
// ComAxis.AbsMove(MoveInfo, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// taskData = null;
// Task.Factory.StartNew(delegate
// {
// int posLoc = StoreManager.GetShelfPosIndex(MoveInfo.MoveParam.ShelfPosID, ShelfPosList);
// //分盘料和紧急料发PutFinished
// if (MoveInfo.MoveParam.cutReel || MoveInfo.MoveParam.urgentReel)
// {
// string msg = StoreManager.afterPutCut(Name, CurrShelfID, MoveInfo.MoveParam.WareCode, CID, posLoc, out taskData);
// if (String.IsNullOrEmpty(msg).Equals(false))
// {
// LogUtil.error(Name + "[" + MoveInfo.MoveParam.WareCode + "] [" + CurrShelfID + "_" + GetLastRfid() + "] [" + posLoc + "] afterPutCut 结果：" + msg);
// }
// }
// else
// {
// int newTaskCount = 0;
// string msg = StoreManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, CurrShelfID + "@" + posLoc.ToString(), out newTaskCount);
// if (String.IsNullOrEmpty(msg).Equals(false))
// {
// LogUtil.error(Name + "[" + MoveInfo.MoveParam.WareCode + "] [" + CurrShelfID + "_" + GetLastRfid() + "] [" + posLoc + "] UpdateTrayLoc 结果：" + msg);
// }
// if (newTaskCount > MoveInfo.MoveParam.taskCount)
// {
// InOutStoreLog("UpdateTrayLoc 返回 newTaskCount=" + newTaskCount + ",原有 taskCount=" + MoveInfo.MoveParam.taskCount + "，使用新数据");
// MoveInfo.MoveParam.taskCount = newTaskCount;
// }
// }
// });
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_PutReel)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_13_InoutBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从出料口返回， 进出轴到P1 ");
// InOutBackToP1(moveP.InOut_P1);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_13_InoutBack)
//{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_14_GoBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 升降轴返回，升降轴到P1，顶升下降");
// UpdownAxis.AbsMove(MoveInfo, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
// //发送消息给流水线
// // SendOutStoreEnd(MoveInfo);
// CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
//}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_14_GoBack)
//{
// //判断是否需要送出料架
// bool isNeedSend = false;
// string logName = "【" + CurrShelfID + "_" + GetLastRfid() + "】";
// //只有rfid不为空才需要送出料架
// if (String.IsNullOrEmpty(MoveInfo.MoveParam.rfid))
// {
// InOutStoreLog("出库完成，未设置rfid，不需要送出料架");
// isNeedSend = false;
// }
// else if (MoveInfo.MoveParam.cutReel)
// {
// if (taskData != null && taskData.cutPackageTask <= 0)
// {
// InOutStoreLog(logName + "分盘料出库完成，cutPackageTask=" + taskData.cutPackageTask + "，送出料架");
// isNeedSend = true;
// }
// else if (taskData == null)
// {
// InOutStoreLog(logName + "分盘料出库完成，taskData=null，送出料架");
// isNeedSend = true;
// }
// }
// else if (MoveInfo.MoveParam.urgentReel)
// {
// if (taskData != null && taskData.urgentPackageTask <= 0)
// {
// InOutStoreLog(logName + "紧急料出库完成，urgentPackageTask=" + taskData.urgentPackageTask + "，送出料架");
// isNeedSend = true;
// }
// else if (taskData == null)
// {
// InOutStoreLog(logName + "紧急料出库完成，taskData=null，送出料架");
// isNeedSend = true;
// }
// }
// else if (MoveInfo.MoveParam.taskCount <= 0)
// {
// InOutStoreLog(logName + "出库完成，taskCount=" + MoveInfo.MoveParam.taskCount + " 送出料架");
// isNeedSend = true;
// }
// if (isNeedSend)
// {
// StartShelfOut();
// }
// else
// {
// TimeSpan span = DateTime.Now - startOutStoreTime;
// string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
// storeStatus = StoreStatus.StoreOnline;
// LogInfo(" 【" + posId + "】 " + logName + " 出库结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
// if (!String.IsNullOrEmpty(MoveInfo.MoveParam.rfid))
// {
// if (StoreManager.Store.AutoShelfInstore)
// {
// LogInfo(" 料架" + logName + "还有出库任务，设置 AutoShelfInstore = false");
// ConfigAppSettings.SaveValue(Setting_Init.AutoShelfInstore, 0);
// StoreManager.Store.AutoShelfInstore = false;
// }
// }
// MoveEndToRuningStatus();
// AutoInout.InOutEndProcess(this, StoreMoveType.OutStore);
// }
//}
#endregion
else if (MoveInfo.MoveStep <= StoreMoveStep.SO_01_InoutBack) else if (MoveInfo.MoveStep <= StoreMoveStep.SO_01_InoutBack)
{ {
ShelfEnterProcess();
} }
else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopDown) else if (MoveInfo.MoveStep >= StoreMoveStep.BS_01_TopDown)
{ {
ShelfOutProcess();
} }
else else
{ {
LogUtil.error(Name + " 出库处理，moveStatus=" + MoveInfo.MoveStep + "，没有对应的处理！"); LogUtil.error(Name + " 出库处理，MoveInfo.MoveStep=" + MoveInfo.MoveStep + "，没有对应的处理！");
} }
} }
......
source/DeviceLibrary/duoStore/BoxBean_Shelf.cs
...@@ -14,370 +14,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,370 +14,8 @@ namespace OnlineStore.DeviceLibrary
{ {
public partial class BoxBean public partial class BoxBean
{ {
#region 料架进出料仓处理：出入库模块共用
private void BI_04_WaitTakeSingle(string moveName)
{
//MoveInfo.NextMoveStep(StoreMoveStep.BI_04_WaitTakeSingle);
//InOutStoreLog(moveName + MoveInfo.SLog + " 线体正转，等待LineIn_Check=Low, 信号LineTake_Check=High");
//LineRun();
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.LOW));
//MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.HIGH));
}
private void ShelfEnterProcess()
{
//string mark = GetMarkInfo();
//string moveName = "入库料架[" + CurrShelfID + "]";
//bool instoreShelf = true;
//if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
//{
// instoreShelf = false;
// moveName = "出库料架[" + CurrShelfID + "][" + mark + "]";
//}
//if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
//{
// if (IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.HIGH))
// {
// BI_04_WaitTakeSingle(moveName);
// }
// else if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.HIGH))
// {
// BI_04_WaitTakeSingle(moveName);
// }
// else
// {
// // MoveInfo.ShelfPositionList = new List<string>(ShelfPosList);
// InOutStoreLog(moveName + MoveInfo.SLog + " agv已到达，打开入料口移门");
// MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
// DoorBean.StartBack(MoveInfo);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_01_DoorOpen))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_03_LineRun);
// InOutStoreLog(moveName + MoveInfo.SLog + "调用AgvClient.MayEnter，线体正转，等待LineIn_Check 或LineTake_Check 信号");
// LineRun();
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.HIGH));
// MoveInfo.OneWaitCanEndStep = true;
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_03_LineRun))
//{
// BI_04_WaitTakeSingle(moveName);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_04_WaitTakeSingle))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_05_LineStop);
// InOutStoreLog(moveName + MoveInfo.SLog + " FinishEnter，取料位检测到信号，停止线体正转");
// LineStop();
// // AgvClient.SetStatus(Config.AgvNodeName, mark, "", ClientAction.FinishEnter, ClientLevel.High, true);
// if (!instoreShelf)
// {
// if (MoveInfo.MoveParam.ShelfPosID.Equals(""))
// {
// // MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[0]);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： ShelfPosID未设置，默认ShelfPosID=" + MoveInfo.MoveParam.ShelfPosID);
// }
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_05_LineStop))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_06_DoorClose);
// InOutStoreLog(moveName + MoveInfo.SLog + "入料口移门关闭 ");
// DoorBean.StartForward(MoveInfo);
// if (!instoreShelf)
// {
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
// ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
// ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
// ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_06_DoorClose))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_07_LineRun);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(7000));
// InOutStoreLog(moveName + MoveInfo.SLog + "继续转动 7000");
// LineRun();
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_07_LineRun))
//{
// LineStop();
// UpdateShelfId();
// //如果未读到料架号，将料架送出
// if (CurrShelfID.EndsWith("00") && MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
// {
// LogInfo(" 执行出库【" + MoveInfo.MoveParam.ToStr() + "】失败，料架号[" + CurrShelfID + "]无效，加入等待队列");
// waitOutStoreList.Enqueue(MoveInfo.MoveParam.NewParam());
// LogUtil.error(Name + "出库 料架号[" + CurrShelfID + "]无效，送出料架，稍后重新出库");
// MoveInfo.MoveParam.rfid = CurrShelfID;
// //送出料架，并且记录出库信息，等会重新出库
// StartShelfOut();
// return;
// }
// MoveInfo.NextMoveStep(StoreMoveStep.BI_08_LocationUp);
// InOutStoreLog(moveName + MoveInfo.SLog + "停止线体，读取料架" + CurrShelfID + "，设置" + Config.AgvNodeName + "=None");
// // AgvClient.SetStatus(Config.AgvNodeName);
// // CylinderMove(MoveInfo, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up);
// if (!instoreShelf)
// {
// if (MoveInfo.MoveParam.ShelfPosID.Equals(""))
// {
// // MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[0]);
// InOutStoreLog("出库 " + MoveInfo.SLog + "： ShelfPosID未设置，默认ShelfPosID=" + MoveInfo.MoveParam.ShelfPosID);
// }
// // LastRfidID = MoveInfo.MoveParam.rfid;
// LastOutParam = MoveInfo.MoveParam;
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进入库位中， 进出轴至P3(库位取放料点) ");
// ACAxisMove(Config.InOut_Axis, MoveInfo.MoveParam.MoveP.InOut_P3, Config.InOutAxis_P3_Speed);
// }
// else
// {
// LastOutParam = new InOutParam();
// // LastRfidID = "";
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_08_LocationUp))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_09_TopCylinderUp);
// InOutStoreLog(moveName + MoveInfo.SLog + "" + CurrShelfID + "顶升上升");
// CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
// if (!instoreShelf)
// {
// InOutStoreLog("出库 " + MoveInfo.SLog + "： 拿起物品，升降轴至P6(库位出料缓冲点)，压紧轴至P2(压紧点) ");
// ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
// ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
// }
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_09_TopCylinderUp))
//{
// if (instoreShelf)
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000));
// //获取料架的锁定状态
// bool lockState = StoreManager.GetShelfLockInfo(Name,CID, CurrShelfID, out MoveInfo.shelfLockDatas);
// if (lockState && MoveInfo.shelfLockDatas != null)
// {
// MoveInfo.IsShelfLocked = true;
// InOutStoreLog(moveName + MoveInfo.SLog + "开始到料架指定位置取料盘 ");
// }
// else
// {
// MoveInfo.IsShelfLocked = false;
// InOutStoreLog(moveName + MoveInfo.SLog + "开始循环料架取料盘 ");
// }
// MoveInfo.EndStepWait();
// }
// else
// {
// MoveInfo.NextMoveStep(StoreMoveStep.SO_06_InoutBack);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子从库位返回，进出轴至P1(待机点) ");
// //ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
// InOutBackToP1(MoveInfo.MoveParam.MoveP.InOut_P1);
// //把库位的物品放到取到叉子上之后是出仓完成
// string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
// lastPosId = posId;
// lastPosIdStatus = StoreStatus.OutStoreBoxEnd;
// storeStatus = StoreStatus.OutStoreBoxEnd;
// }
//}
}
private void StartShelfOut()
{
//MoveInfo.NextMoveStep(StoreMoveStep.BS_01_TopDown);
//if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
//{
// string mark = GetMarkInfo();
// InOutStoreLog("送出[" + CurrShelfID + "][" + mark + "]：顶升下降,调用 NeedLeave[" + mark + "][" + CurrShelfID + "] ");
// AgvClient.NeedLeave(Config.AgvNodeName, mark, CurrShelfID);
//}
//else
//{
// InOutStoreLog("送出空料架[" + CurrShelfID + "]：顶升下降,调用 NeedLeave[0][" + CurrShelfID + "]，clearPutInRfid[" + CurrShelfID + "]");
// AgvClient.NeedLeave(Config.AgvNodeName, "0", CurrShelfID);
// StoreManager.clearPutInRfid(Name, CurrShelfID);
//}
//CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
}
private string GetMarkInfo(string defualtMark = "0")
{
string mark = defualtMark;
////如果料架号是空，需要送到VMI线
//if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
//{
// if (CurrShelfID.EndsWith("00"))
// {
// mark = defualtMark;
// }
// //包装料会发往分盘区, 紧急料区, 包装线区
// // urgentReel 这个为true是紧急料 出到紧急料区
// // cutReel 为true是分盘料,AGV会拉到到分盘区
// //料串会发到分盘区和紧急料区
// //两个都为false 包装料默认拉到包装线体, 料串默认拉到紧急料区
// else if (MoveInfo.MoveParam.urgentReel)
// {
// //紧急料，需要到紧急料区
// mark = MoveInfo.MoveParam.rfid + ",urgent";
// }
// else if (MoveInfo.MoveParam.cutReel)
// {
// //cutReel 为true是分盘料,AGV会拉到到分盘区
// mark = MoveInfo.MoveParam.rfid + ",cut";
// }
// else
// {
// mark = MoveInfo.MoveParam.rfid + ",pack";
// }
//}
return mark;
}
private void ShelfOutProcess()
{
string mark = GetMarkInfo();
string moveName = "送出空料架[" + CurrShelfID + "]";
if (MoveInfo.MoveType.Equals(MoveType.OutStore))
{
moveName = "送出[" + CurrShelfID + "][" + mark + "]";
}
// LogCPU();
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_01_TopDown))
{
MoveInfo.NextMoveStep(StoreMoveStep.BS_02_LocatinDown);
InOutStoreLog(moveName + MoveInfo.SLog + " ：定位气缸下降");
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_02_LocatinDown))
{
//MoveInfo.NextMoveStep(StoreMoveStep.BS_03_WaitEmptyAgv);
//MoveInfo.TimeOutSeconds = 600;
////MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
////等待agv到达
//MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Arrive));
//InOutStoreLog(moveName + MoveInfo.SLog + "：再次调用 NeedLeave[" + mark + "][" + CurrShelfID + "]，等待Agv " + Config.AgvNodeName + " Arrive ,最多等待1200秒");
////AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitEmptyAgv))
{
//agv到达
/// if (AgvClient.GetAction(Config.AgvNodeName).Equals(ClientAction.Arrive))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_04_DoorOpen);
// InOutStoreLog(moveName + MoveInfo.SLog + "：agv到达,打开入料口移门");
// DoorBean.StartOpen(MoveInfo);
// }
// else
// {
// //如果料架已被拉出，也算结束
// if (IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_06_LineBackRun);
// AgvClient.SetToNone(Config.AgvNodeName);
// //如果agv未到达，直接结束
// MoveEndToRuningStatus();
// //EmprtShelfList = new ConcurrentQueue<string>();
// InOutStoreLog(moveName + MoveInfo.SLog + "：等待Agv " + Config.AgvNodeName + " Arrive超时，检测不到料架信号，认为料架已离开，出库结束，设置" + Config.AgvNodeName + "=None");
// }
// else
// {
// TimeSpan span = DateTime.Now - MoveInfo.LastSetpTime;
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime((int)span.TotalMilliseconds + 30000));
// InOutStoreLog(moveName + MoveInfo.SLog + "：等待Agv " + Config.AgvNodeName + " Arrive超时，再等待30秒");
// }
// }
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_04_DoorOpen))
{
//MoveInfo.NextMoveStep(StoreMoveStep.BS_05_WaitReady);
//MoveInfo.TimeOutSeconds = 120;
//InOutStoreLog(moveName + MoveInfo.SLog + "：移门已打开，调用 MayLeave [" + mark + "][" + CurrShelfID + "]，等待agv " + Config.AgvNodeName + " Ready");
//AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.MayLeave, ClientLevel.High, true);
////等待agv到达
//MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction((int)ClientAction.Ready));
}
// else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_05_WaitReady))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_06_LineBackRun);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
// InOutStoreLog(moveName + MoveInfo.SLog + "：收到agv " + Config.AgvNodeName + " Ready ，线体开始反转");
// LineBackRun();
// }
// else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_06_LineBackRun))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_07_WaitShelfOut);
// InOutStoreLog(moveName + MoveInfo.SLog + "：等待取料工位无信号 ");
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
// // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
// }
// else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_07_WaitShelfOut))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_08_WaitLineIn);
// InOutStoreLog(moveName + MoveInfo.SLog + "：等待 入料口有信号，最多等待30秒");
// // MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
// MoveInfo.OneWaitCanEndStep = true;
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.HIGH));
// }
// else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_08_WaitLineIn))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_09_WaitTime);
// InOutStoreLog(moveName + MoveInfo.SLog + "：再转动1000 ， 等待入料口无信号，清理RFID");
//// RFIDManager.ReadRFID(Config.RFID_IP, true);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineIn_Check, IO_VALUE.LOW));
// }
// else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_09_WaitTime))
// {
// MoveInfo.NextMoveStep(StoreMoveStep.BS_10_WaitAGVLeave);
// MoveInfo.TimeOutSeconds = 180;
// InOutStoreLog(moveName + MoveInfo.SLog + "：等待DoorClose事件,最多等待180000 ");
// MoveInfo.OneWaitCanEndStep = true;
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(180000));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitDoorClose());
// //MoveInfo.WaitList.Add(WaitResultInfo.WaitAgvAction(action.FinishOut));
// }
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_10_WaitAGVLeave))
//{
// MoveInfo.NextMoveStep(StoreMoveStep.BS_11_CloseDoor);
// InOutStoreLog(moveName + MoveInfo.SLog + "：停止线体转动，关闭仓门 ，发送FinishLeave ,等待最少5000");
// AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.FinishLeave, ClientLevel.High, true);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
// LineStop();
// DoorBean.StartClose(MoveInfo);
//}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_11_CloseDoor))
//{
// //结束
// MoveEndToRuningStatus();
// AgvClient.SetStatus(Config.AgvNodeName);
// //EmprtShelfList = new ConcurrentQueue<string>();
// InOutStoreLog(moveName + MoveInfo.SLog + "：料架" + CurrShelfID + "已离开 ，设置" + Config.AgvNodeName + "=None，清理rfid");
// RFIDManager.ReadRFID(Config.RFID_IP, true);
// CurrShelfID = "";
// LastOutParam = new InOutParam();
// //LastRfidID = "";
//}
}
#endregion
#region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作 #region 与服务器通信定时器
private string CodeMsg = ""; private string CodeMsg = "";
private bool isInProcess = false; private bool isInProcess = false;
...@@ -622,10 +260,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -622,10 +260,7 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
if (LastWidth <= 0)
{
LastWidth = 7;
}
//string message = StoreManager.ProcessCode(LastWidth, LastHeight, LastScanCodes); //string message = StoreManager.ProcessCode(LastWidth, LastHeight, LastScanCodes);
string message = MoveInfo.shelfLockDatas[MoveInfo.currShelfIndex].barcode; string message = MoveInfo.shelfLockDatas[MoveInfo.currShelfIndex].barcode;
if (message.Equals("") || string.IsNullOrEmpty(message)) if (message.Equals("") || string.IsNullOrEmpty(message))
...@@ -645,7 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -645,7 +280,7 @@ namespace OnlineStore.DeviceLibrary
//发送扫码内容到服务器进行入库操作 //发送扫码内容到服务器进行入库操作
Operation operation = getLineBoxStatus(); Operation operation = getLineBoxStatus();
operation.op = 1; operation.op = 1;
operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID }}; // operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID }};
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false); Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
if (resultOperation == null) if (resultOperation == null)
...@@ -683,7 +318,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -683,7 +318,7 @@ namespace OnlineStore.DeviceLibrary
} }
LogInfo(" 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】设置入库参数 ， 开始入库！"); LogInfo(" 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】设置入库参数 ， 开始入库！");
int p3 = Config.CompAxis_P3; int p3 = Config.CompAxis_P3;
MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition, p3); // MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition, p3);
return true; return true;
} }
} }
...@@ -725,8 +360,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -725,8 +360,9 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
/// <param name="codeResultType">扫码结果</param> /// <param name="codeResultType">扫码结果</param>
/// <returns></returns> /// <returns></returns>
private bool GetPosIdByCode(int rfidLoc, out CodeResultType codeResultType) private bool GetPosIdByCode (int LastWidth,int LastHeight,List<string> LastScanCodes, int rfidLoc, out CodeResultType codeResultType)
{ {
string CurrShelfID = "";
try try
{ {
if (LastWidth <= 0) if (LastWidth <= 0)
...@@ -804,7 +440,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -804,7 +440,7 @@ namespace OnlineStore.DeviceLibrary
} }
LogInfo(" 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】设置入库参数 ， 开始入库！"); LogInfo(" 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】设置入库参数 ， 开始入库！");
int p3 = Config.CompAxis_P3; int p3 = Config.CompAxis_P3;
MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition, p3); //MoveInfo.MoveParam.UpdatePosId(message, posId, plateW, plateH, ComTargetPosition, p3);
codeResultType = CodeResultType.Success; codeResultType = CodeResultType.Success;
return true; return true;
} }
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
...@@ -23,7 +23,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -23,7 +23,6 @@ namespace OnlineStore.DeviceLibrary
public Store_Config Config { get; set; } public Store_Config Config { get; set; }
public bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
public bool AutoShelfInstore = ConfigAppSettings.GetIntValue(Setting_Init.AutoShelfInstore).Equals(1);
public HoisterCylinder hoisterCylinder = new HoisterCylinder(0); public HoisterCylinder hoisterCylinder = new HoisterCylinder(0);
public AxisBean T1_BatchAxis = null; public AxisBean T1_BatchAxis = null;
......
source/DeviceLibrary/duoStore/HoisterCylinder.cs
...@@ -103,11 +103,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,11 +103,6 @@ namespace OnlineStore.DeviceLibrary
public bool StartBack(StoreMoveInfo moveInfo) public bool StartBack(StoreMoveInfo moveInfo)
{ {
bool UseDoor = ConfigAppSettings.GetIntValue(Setting_Init.UseDoor).Equals(1);
if (!UseDoor)
{
return false;
}
//如果门已打开直接返回 //如果门已打开直接返回
if (IOManager.IOValue(IO_Type.Hoister_Back, subType).Equals(IO_VALUE.HIGH) && if (IOManager.IOValue(IO_Type.Hoister_Back, subType).Equals(IO_VALUE.HIGH) &&
...@@ -126,11 +121,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -126,11 +121,6 @@ namespace OnlineStore.DeviceLibrary
} }
public bool StartForward(StoreMoveInfo moveInfo) public bool StartForward(StoreMoveInfo moveInfo)
{ {
bool UseDoor = ConfigAppSettings.GetIntValue(Setting_Init.UseDoor).Equals(1);
if (!UseDoor)
{
return false;
}
//如果门已关闭直接返回 //如果门已关闭直接返回
if (IOManager.IOValue(IO_Type.Hoister_Forward, subType).Equals(IO_VALUE.HIGH) && if (IOManager.IOValue(IO_Type.Hoister_Forward, subType).Equals(IO_VALUE.HIGH) &&
......
source/DeviceLibrary/store/AutoInoutInfo.cs
...@@ -20,7 +20,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -20,7 +20,6 @@ namespace OnlineStore.DeviceLibrary
private int positionIndex = 0; private int positionIndex = 0;
public string autoMsg = ""; public string autoMsg = "";
private int startIndex = -1; private int startIndex = -1;
private string shelfPosId = "";
#region 出入库参数 #region 出入库参数
/// <summary> /// <summary>
/// 当前出入库的次数，超过配置的数量时，需要自动重置一下，再进行出入库 /// 当前出入库的次数，超过配置的数量时，需要自动重置一下，再进行出入库
...@@ -31,13 +30,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -31,13 +30,12 @@ namespace OnlineStore.DeviceLibrary
public void StartAuto(int jiange, int currIndex, string shelfPosId) public void StartAuto(int jiange, int currIndex )
{ {
autoNext = true; autoNext = true;
Jiange = jiange; Jiange = jiange;
positionIndex = currIndex; positionIndex = currIndex;
startIndex = currIndex; startIndex = currIndex;
this.shelfPosId = shelfPosId;
} }
public void StopAuto() public void StopAuto()
{ {
...@@ -77,7 +75,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -77,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
positionIndex = newIndex; positionIndex = newIndex;
string posid = boxBean.PositionNumList[positionIndex]; string posid = boxBean.PositionNumList[positionIndex];
InOutParam param = new InOutParam("AAAA", posid, shelfPosId); InOutParam param = new InOutParam("AutoOut", posid);
//param.NeedOutShelf = false; //param.NeedOutShelf = false;
//param.NeedEnterShelf = false; //param.NeedEnterShelf = false;
//判断是否需要重置 //判断是否需要重置
...@@ -116,7 +114,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -116,7 +114,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
string posid = boxBean.PositionNumList[newIndex]; string posid = boxBean.PositionNumList[newIndex];
InOutParam param = new InOutParam("AAAA", posid, shelfPosId); InOutParam param = new InOutParam("AutoIn", posid);
// param.NeedOutShelf = false; // param.NeedOutShelf = false;
//判断是否需要重置 //判断是否需要重置
if (CurrInOutACount >= StoreManager.Config.Box_ResetACount) if (CurrInOutACount >= StoreManager.Config.Box_ResetACount)
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -115,48 +115,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -115,48 +115,27 @@ namespace OnlineStore.DeviceLibrary
/// 无操作，等待状态 /// 无操作，等待状态
/// </summary> /// </summary>
Wait = 0, Wait = 0,
#region 料仓原点返回和重置步骤 0010开始 #region 料仓复位
/// <summary> /// <summary>
/// BOX复位：轴三进出轴先返回原点 /// BOX复位：进出轴回原点
/// </summary> /// </summary>
BOX_H01_InOutBack = 011, BOX_H01_InOutBack = 011,
/// <summary> /// <summary>
/// 顶升下降 /// BOX复位：进出轴回原点
/// </summary> /// </summary>
BOX_H02_TopDown = 012, BOX_H02_InoutToP1 ,
/// <summary>
/// BOX复位：线体停止， ，流水线先转动3000
/// </summary>
BOX_H03_LineRun = 013,
///// <summary>
///// BOX复位：轴三返回P1点，入料门关闭NG门下降
///// </summary>
//BOX_H04_InOutToP1 = 014,
/// <summary> /// <summary>
/// BOX复位：升降轴，旋转轴，压紧轴原点返回 /// BOX复位：其他轴回原点
/// </summary> /// </summary>
BOX_H05_OtherAxisBack = 015, BOX_H03_OtherAxisHome ,
/// <summary>
///BOX复位： 旋转轴返回P1
/// </summary>
BOX_H06_MiddleAxisToP1 = 016,
/// <summary> /// <summary>
/// BOX回待机点：叉子走到P1 /// BOX复位：升降轴，旋转轴，压紧轴原点返回
/// </summary>
BOX_H54_InOutToP1 = 54,
/// <summary>
/// BOX回待机点：压紧轴回原点
/// </summary>
BOX_H55_CompHome = 55,
/// <summary>
///BOX回待机点： 关闭门，旋转轴到P1,升降轴到P1
/// </summary> /// </summary>
BOX_H56_OtherAxisToP1 = 56, BOX_H04_OtherAxisBack ,
#endregion #endregion
#region 料架进入料仓步骤 1000开始 #region 料架进入料仓步骤 1000开始
...@@ -464,6 +443,150 @@ namespace OnlineStore.DeviceLibrary ...@@ -464,6 +443,150 @@ namespace OnlineStore.DeviceLibrary
BS_11_CloseDoor = 4011, BS_11_CloseDoor = 4011,
#endregion #endregion
#region 料仓内部出库步骤
/// <summary>
///料仓出库，，定位气缸下降
/// </summary>
SO_01_LocationCylinderDown = 101,
/// <summary>
///料仓出库：叉子先运动到P1
/// </summary>
SO_02_DeviceBack = 102,
/// <summary>
/// 料仓出库，，所有轴运行到库位， 轴4（ 压紧） 至P3(压紧前点) ,轴1（ 转盘） 至P2（ 库位点）,轴2(上下） 至P5(库位出库前点）
/// </summary>
SO_03_ToBagPosition = 103,
/// <summary>
/// 料仓出库，，叉子进入库位中， 轴3（ 叉子） 至P3(库位取放料点）
/// </summary>
SO_04_DeviceToBag = 104,
/// <summary>
///料仓出库，， 库位的物品放入叉子上，轴2（ 上下） 至P6（ 库位出料缓冲点），轴4（ 压紧） 至P2(压紧点)
/// </summary>
SO_05_BagWareToDevice = 105,
/// <summary>
///料仓出库，，叉子从 库位返回，轴3（ 叉子） 至P1（ 待机点）
/// </summary>
SO_06_BagDeviceBack = 106,
/// <summary>
/// 料仓出库，等待检测到料盘信号
/// </summary>
SO_07_CheckTray = 107,
/// <summary>
/// 料仓出库，，所有设备运行到门，，轴1（ 转盘） 至P1（ 待机点）轴2（ 上下） 至P2（ 进料口出料前点）
/// </summary>
SO_08_ToDoorPosition = 108,
/// <summary>
/// 料仓出库，定位气缸退回（有压紧轴的不需要此步骤），，定位气缸退回(Y104-1/PCI5O1-84) (Y104-2/PCI5O1-91) (Y104-2/PCI5O1-96) 退回到位
/// </summary>
SO_09_LocationCylinder_Down = 109,
/// <summary>
/// 等待门口无料盘
/// </summary>
SO_091_WaitNoTray = 120,
/// <summary>
/// 料仓出库，，叉子进出料口，，轴3（ 叉子） 至P2（ 进料口取料点）
/// /// </summary>
SO_10_DeviceToDoor = 110,
/// <summary>
/// 料仓出库，，把物品放下，，轴2（ 上下） 至P8（ 进料口出料缓冲点）轴4（ 压紧） 至P1（ 待机点)
/// </summary>
SO_11_DevicePutWare = 111,
/// <summary>
/// 料仓出库，，叉子从出料口返回，，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
SO_12_DeviceOutFromDoor = 112,
/// <summary>
/// 料仓出库：等待叉子无料盘
/// </summary>
SO_13_CheckTray = 113,
/// <summary>
/// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
/// </summary>
SO_14_aGoBack = 114,
/// <summary>
/// 等待拿走物品
/// </summary>
SO_15_WaitTake = 115,
#endregion
#region 料仓内部入库步骤
/// <summary>
/// 入库检测
/// </summary>
SI_00_TrayCheck = 200,
/// <summary>
/// 入库，。定位气缸下降
/// </summary>
SI_01_LocationCylinderDown = 201,
/// <summary>
/// 入库。。进出轴（叉子）先返回P1
/// </summary>
SI_02_InOutAxisHome = 202,
/// <summary>
/// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary>
SI_03_ReturnHome = 203,
/// <summary>
/// 入库。。压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点)
/// </summary>
SI_04_CompressWare = 204,
/// <summary>
/// 入库。。叉子进入入料口，轴3（ 叉子） 至P2（ 进料口取料点）
/// </summary>
SI_05_DeviceToDoor = 205,
/// <summary>
/// 入库。。把物品放入叉子上，轴2（ 上下） 至P7（ 进料口取料缓冲点）,压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P2(压紧点)
/// </summary>
SI_06_DoorWarToDevice = 206,
/// <summary>
/// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点）
/// </summary>
SI_07_DeviceBackFromDoor = 207,
/// <summary>
/// 入库。。，验证是否检测到料盘信号
/// </summary>
SI_08_CheckTray = 208,
/// <summary>
/// 入库。。移动到库位点，轴1（ 转盘） 至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
/// </summary>
SI_09_MoveToBag = 209,
/// <summary>
/// 入库。。定位气缸退回 （有压紧轴的不需要此步骤）
/// </summary>
SI_10_LocationCylinder_Down = 210,
/// <summary>
/// 入库。。叉子进入库位中，轴3（ 叉子） 至P3(库位取放料点）
/// </summary>
SI_11_DeviceToBag = 211,
/// <summary>
/// 入库。。放下物品，轴2（ 上下） 至P4（ 库位入料缓冲点）轴4（ 压紧） 至P3（ 压紧前点）
/// </summary>
SI_12_PutWareToBag = 212,
/// <summary>
/// 入库。。叉子从库位中返回，轴3（ 叉子） 动作至P1（ 待机点）
/// </summary>
SI_13_DeviceBackFromBag = 213,
/// <summary>
/// 入库。。检测叉子是否还有物料
/// </summary>
SI_14_CheckTray = 214,
/// <summary>
/// 入库。。返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary>
SI_15_GoBack = 215,
#endregion
} }
public enum AlarmType public enum AlarmType
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -170,10 +170,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -170,10 +170,10 @@ namespace OnlineStore.DeviceLibrary
/// 入库时，料架已锁定库位的位置，无需扫码 /// 入库时，料架已锁定库位的位置，无需扫码
/// </summary> /// </summary>
public bool IsShelfLocked = false;//料架是否锁定 public bool IsShelfLocked = false;//料架是否锁定
/// <summary> /// <summary>
/// 料架锁定位置的料 /// 料架锁定位置的料
/// </summary> /// </summary>
public List<ShelfLockData> shelfLockDatas =null; public List<ShelfLockData> shelfLockDatas = null;
public bool NextLockedShelfPos() public bool NextLockedShelfPos()
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!