1

source/DeviceLibrary/LineConfig/VMILineConfig.csv

@@ -38,5 +38,5 @@ DO,进料线入口阻挡,InL_InStopDown,9,PRO_AOI_IP_1,0,进料线入口阻挡,Y730,DO-02,0,
 PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
 PRO,出空料架流水线AGV节点名称,OutL_AgvName,A2,,,,,,,
 PRO,入料架流水线AGV节点名称,InL_AgvName,A1,,,,,,,
-PRO,入料架流水线入口RFIDIP,InL_In_RFIDIP,192.168.102.107,,,,,, ,
-PRO,入料架流水线出口RFIDIP,InL_Out_RFIDIP,192.168.102.108,,,,,, ,
+PRO,入料架流水线入口RFIDIP,InL_In_RFIDIP,192.168.102.108,,,,,, ,
+PRO,入料架流水线出口RFIDIP,InL_Out_RFIDIP,192.168.102.107,,,,,, ,

source/DeviceLibrary/acVmiLine/VMILineBean.cs

@@ -256,10 +256,11 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         private void OutLineTimerProcess()
         {
+            
             TimeSpan span = DateTime.Now - ol_lastSendShelfTime;
             //如果出口无料架，持续1000以上，放开阻挡放出一个料架
             //每次放料架时间间隔3秒
-            if (IOManager.IOValue(IO_Type.OutL_OutStopCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3)
+            if (IOManager.IOValue(IO_Type.OutL_InStopCheck).Equals(IO_VALUE.HIGH)&&IOManager.IOValue(IO_Type.OutL_OutStopCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3)
             {
                 //如果出料线体出口无料架，放一个料架到出口
                 if (LineManager.checkWatch(ol_noshelfWatch, 1000))

source/VMILineClient/FrmVMIClient.Designer.cs

@@ -503,17 +503,17 @@
             // txtname
             // 
             this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtname.Location = new System.Drawing.Point(299, 29);
+            this.txtname.Location = new System.Drawing.Point(299, 31);
             this.txtname.MaxLength = 4;
             this.txtname.Name = "txtname";
             this.txtname.Size = new System.Drawing.Size(53, 26);
             this.txtname.TabIndex = 5;
-            this.txtname.Text = "A1";
+            this.txtname.Text = "C2";
             // 
             // btnNeedEntry
             // 
             this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNeedEntry.Location = new System.Drawing.Point(496, 22);
+            this.btnNeedEntry.Location = new System.Drawing.Point(496, 24);
             this.btnNeedEntry.Name = "btnNeedEntry";
             this.btnNeedEntry.Size = new System.Drawing.Size(132, 39);
             this.btnNeedEntry.TabIndex = 4;
@@ -524,7 +524,7 @@
             // btnNeedLeave
             // 
             this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNeedLeave.Location = new System.Drawing.Point(358, 22);
+            this.btnNeedLeave.Location = new System.Drawing.Point(358, 24);
             this.btnNeedLeave.Name = "btnNeedLeave";
             this.btnNeedLeave.Size = new System.Drawing.Size(132, 39);
             this.btnNeedLeave.TabIndex = 3;
@@ -535,7 +535,7 @@
             // btnDis
             // 
             this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDis.Location = new System.Drawing.Point(161, 22);
+            this.btnDis.Location = new System.Drawing.Point(161, 24);
             this.btnDis.Name = "btnDis";
             this.btnDis.Size = new System.Drawing.Size(132, 39);
             this.btnDis.TabIndex = 2;
@@ -546,7 +546,7 @@
             // btnInit
             // 
             this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnInit.Location = new System.Drawing.Point(23, 22);
+            this.btnInit.Location = new System.Drawing.Point(23, 24);
             this.btnInit.Name = "btnInit";
             this.btnInit.Size = new System.Drawing.Size(132, 39);
             this.btnInit.TabIndex = 1;

source/VMILineClient/FrmVMIClient.cs

@@ -51,7 +51,7 @@ namespace OnlineStore.VMILineClient
             chbDebug.Checked = vmiLine.IsDebug;
             this.ShowInTaskbar = true;
             LoadIOList();
-            txtname.Name = vmiLine.Config.InL_AgvName;
+            txtname.Text = vmiLine.Config.InL_AgvName;
             notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
             HideForm();
             this.Opacity = 1;