1

source/DeviceLibrary/acVerticalStore/VerticalStoreBean.cs

@@ -501,12 +501,12 @@ namespace OnlineStore.DeviceLibrary
                     Alarm(StoreAlarmType.AxisAlarm, axisInfo.ProName, WarnMsg, MoveType.None);
                     isInAlarm = true;
                 }
-                else if (!AxisACodeMap[deviceName].Equals(alarmIo))
+                else if (!AxisACodeMap[axisInfo.GetNameStr()].Equals(alarmIo))
                 {
                     LogUtil.error(Name + "  运动轴  " + axisInfo.Explain + "，报警已解除！");
                 }
 
-                AxisACodeMap[deviceName] = alarmIo;
+                AxisACodeMap[axisInfo.GetNameStr()] = alarmIo;
             }
             return isInAlarm;
         }

source/VerticalStoreClinet/FrmStoreBox.Designer.cs

@@ -792,7 +792,7 @@
             this.panel1.Controls.Add(this.btnStoreExit);
             this.panel1.Controls.Add(this.btnStoreStop);
             this.panel1.Controls.Add(this.btnClearL);
-            this.panel1.Location = new System.Drawing.Point(9, 25);
+            this.panel1.Location = new System.Drawing.Point(9, 20);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(1152, 48);
             this.panel1.TabIndex = 274;
@@ -801,9 +801,9 @@
             // 
             this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
-            this.lblWarnMsg.Location = new System.Drawing.Point(13, 114);
+            this.lblWarnMsg.Location = new System.Drawing.Point(13, 105);
             this.lblWarnMsg.Name = "lblWarnMsg";
-            this.lblWarnMsg.Size = new System.Drawing.Size(938, 56);
+            this.lblWarnMsg.Size = new System.Drawing.Size(938, 64);
             this.lblWarnMsg.TabIndex = 224;
             this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -812,7 +812,7 @@
             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.ForeColor = System.Drawing.Color.Green;
-            this.lblThisSta.Location = new System.Drawing.Point(10, 84);
+            this.lblThisSta.Location = new System.Drawing.Point(10, 78);
             this.lblThisSta.Name = "lblThisSta";
             this.lblThisSta.Size = new System.Drawing.Size(65, 19);
             this.lblThisSta.TabIndex = 216;