Merge branch 'SO00075(SO1164)扫码贴标机' of http://106.15.194.121:8083/liutao/SO827-A…

…utoScanAndLabel into SO00075(SO1164)扫码贴标机

AutoScanAndLabel/AxisControl.cs

@@ -30,10 +30,6 @@ namespace AutoScanAndLabel
 
 
         }
         }
 
 
-
-
-
-
         private void AxisControl_Load(object sender, EventArgs e)
         private void AxisControl_Load(object sender, EventArgs e)
         {
         {
 
 

AutoScanAndLabel/Form1.Designer.cs

@@ -171,10 +171,10 @@ namespace AutoScanAndLabel
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tabControl1.Location = new System.Drawing.Point(0, 90);
+            this.tabControl1.Location = new System.Drawing.Point(0, 113);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1008, 599);
+            this.tabControl1.Size = new System.Drawing.Size(1008, 576);
             this.tabControl1.TabIndex = 1;
             this.tabControl1.TabIndex = 1;
             // 
             // 
             // tabPage1
             // tabPage1
@@ -190,7 +190,7 @@ namespace AutoScanAndLabel
             this.tabPage1.Controls.Add(this.groupBox1);
             this.tabPage1.Controls.Add(this.groupBox1);
             this.tabPage1.Location = new System.Drawing.Point(4, 30);
             this.tabPage1.Location = new System.Drawing.Point(4, 30);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(1000, 565);
+            this.tabPage1.Size = new System.Drawing.Size(1000, 542);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "信息";
             this.tabPage1.Text = "信息";
             this.tabPage1.UseVisualStyleBackColor = true;
             this.tabPage1.UseVisualStyleBackColor = true;

AutoScanAndLabel/IOControl.cs

@@ -203,7 +203,7 @@ namespace AutoScanAndLabel
             if (cmbWriteIO.Items.Count > e.Index)
             if (cmbWriteIO.Items.Count > e.Index)
             {
             {
                 ConfigIO io = (ConfigIO)cmbWriteIO.Items[e.Index];
                 ConfigIO io = (ConfigIO)cmbWriteIO.Items[e.Index];
-                e.Graphics.DrawString(io.DisplayStr, e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 3);
+                e.Graphics.DrawString(io.ElectricalDefinition + "_" + crc.GetString(io.ProName, io.Explain), e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 3);
             }
             }
         }
         }
 
 

AutoScanAndLabel/UC/ConfigControl.cs

@@ -33,6 +33,12 @@ namespace AutoScanAndLabel
         public ConfigControl()
         public ConfigControl()
         {
         {
             InitializeComponent();
             InitializeComponent();
+            crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
+        }
+
+        private void Crc_LanguageChangeEvent(object sender, EventArgs e)
+        {
+            LoadPosList();
         }
         }
 
 
         void LoadPosList()
         void LoadPosList()

DeviceLibrary/userControl/AxisMoveControl.cs

@@ -33,6 +33,7 @@ namespace DeviceLibrary
         }
         }
         private void Crc_LanguageChangeEvent(object sender, EventArgs e)
         private void Crc_LanguageChangeEvent(object sender, EventArgs e)
         {
         {
+            LoadData(boxBean);
             crc.LanguageProcess(this);
             crc.LanguageProcess(this);
         }
         }
         public void LoadData(IRobot equipBase, bool isHc = true)
         public void LoadData(IRobot equipBase, bool isHc = true)
@@ -45,7 +46,7 @@ namespace DeviceLibrary
                 cmbAxis.Items.Clear();
                 cmbAxis.Items.Clear();
                 foreach (ConfigMoveAxis a in axisList)
                 foreach (ConfigMoveAxis a in axisList)
                 {
                 {
-                    cmbAxis.Items.Add(a.Explain);
+                    cmbAxis.Items.Add(crc.GetString(a.ProName, a.Explain));
                 }
                 }
                 cmbAxis.SelectedIndex = 0;
                 cmbAxis.SelectedIndex = 0;