Просмотр исходного кода

1、生成的配置清单时,限速值设定上限调整为120km/h;
2、推行测试和参数检验工位测试时增加检测打标信息和选择的配置文件型号是否一致功能。

dail 3 лет назад
Родитель
Сommit
62924f3548

BIN
.vs/MOTINOVA_Motor_Factory_Set/v17/.suo


+ 22 - 0
CheckForm.cs

@@ -1591,6 +1591,28 @@ namespace MOTINOVA_Motor_Factory_Set
             }
             #endregion
 
+            #region 检查产品型号和配置文件是否一致
+            do
+            {
+                string cfg_mode = "", pd_mode = "";
+                cfg_mode = comboBox_File.Text.Split('_')[0];
+                if (textBox_PDinfo.Text.Contains("  "))
+                {
+                    pd_mode = textBox_PDinfo.Text.Split(new string[] { "  " }, StringSplitOptions.None)[0];
+                }
+                else if (textBox_PDinfo.Text.Contains("%#"))
+                {
+                    pd_mode = textBox_PDinfo.Text.Split(new string[] { "%#" }, StringSplitOptions.None)[0];
+                }
+                if (pd_mode != cfg_mode)
+                {
+                    label_Step.Text = "打标信息与配置文件不一致!";
+                    label_Step.ForeColor = Color.Red;
+                    return;
+                }
+            } while (false);
+            #endregion
+
             //连接串口
             if (portsettings_form.openPort() == false)
             {

+ 4 - 4
ExportForm.cs

@@ -282,9 +282,9 @@ namespace MOTINOVA_Motor_Factory_Set
                     return false;
                 }
                 Params1.Add("限速值", Convert.ToUInt16(textBox_SpeedLimit.Text));
-                if (Params1["限速值"] < 5 || Params1["限速值"] > 80)
+                if (Params1["限速值"] < 5 || Params1["限速值"] > 120)
                 {
-                    MessageBox.Show("限速值有效值:5~80 !", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    MessageBox.Show("限速值有效值:5~120 !", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     return false;
                 }
                 Params1.Add("下降速度", Convert.ToUInt16(textBox_Dec.Text));
@@ -326,9 +326,9 @@ namespace MOTINOVA_Motor_Factory_Set
                     MessageBox.Show("请检查无码表设置!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
                 Params1.Add("轮胎周长", Convert.ToUInt16(textBox_WheelSize.Text));
-                if (Params1["轮胎周长"] < 100 || Params1["轮胎周长"] > 250)
+                if (Params1["轮胎周长"] < 80 || Params1["轮胎周长"] > 250)
                 {
-                    MessageBox.Show("轮胎周长有效值:100~250 !", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    MessageBox.Show("轮胎周长有效值:80~250 !", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     return false;
                 }
                 Params1.Add("系列号", Convert.ToUInt16(textBox_Serial.Text));

+ 23 - 1
ImportForm.cs

@@ -2836,7 +2836,29 @@ namespace MOTINOVA_Motor_Factory_Set
                 label_Step.ForeColor = Color.Red;
                 return;
             }
-#endregion
+            #endregion
+
+            #region 检查产品型号和配置文件是否一致
+            do
+            {
+                string cfg_mode = "", pd_mode = "";
+                cfg_mode = comboBox_File.Text.Split('_')[0];
+                if (textBox_PDinfo.Text.Contains("  "))
+                {
+                    pd_mode = textBox_PDinfo.Text.Split(new string[] { "  " }, StringSplitOptions.None)[0];
+                }
+                else if (textBox_PDinfo.Text.Contains("%#"))
+                {
+                    pd_mode = textBox_PDinfo.Text.Split(new string[] { "%#" }, StringSplitOptions.None)[0];
+                }
+                if (pd_mode != cfg_mode)
+                {
+                    label_Step.Text = "打标信息与配置文件不一致!";
+                    label_Step.ForeColor = Color.Red;
+                    return;
+                }
+            } while (false);
+            #endregion
 
             //连接串口
             if (portsettings_form.openPort() == false)

+ 1 - 1
StartForm.Designer.cs

@@ -118,7 +118,7 @@
             this.label_Ver.Name = "label_Ver";
             this.label_Ver.Size = new System.Drawing.Size(316, 21);
             this.label_Ver.TabIndex = 2;
-            this.label_Ver.Text = "Ver: V1.4.2 Build Time: 2022-06-30 10:26";
+            this.label_Ver.Text = "Ver: V1.4.3 Build Time: 2022-07-01 11:26";
             // 
             // label_NetStatus
             // 

+ 1 - 1
bin/Debug/CheckSerialNum

@@ -1,4 +1,4 @@
 流水号:
-23
+25
 合格计数:
 8

+ 1 - 1
bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1DkTo53O9IyhM4LxEQA6hspCXZZRtzzJ7yiGFb6+F6s=</dsig:DigestValue>
+        <dsig:DigestValue>cxfz0W3/Ve/wgpuoQddCfzysEBmNUSk1XUJkKYwPSuI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 2 - 2
bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -78,14 +78,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="711680">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="712192">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AcIKVji5GOXrfG5uGGBYOdsmmecfUv3GlxB/9OVMhUU=</dsig:DigestValue>
+        <dsig:DigestValue>zm3Tfc/spe2YIo3dJRnvz2aUlMi6dXX9hIjG5jweULU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


+ 1 - 1
bin/Debug/TestSerialNum

@@ -1,4 +1,4 @@
 流水号:
-16
+18
 合格计数:
 4

BIN
bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>1DkTo53O9IyhM4LxEQA6hspCXZZRtzzJ7yiGFb6+F6s=</dsig:DigestValue>
+        <dsig:DigestValue>cxfz0W3/Ve/wgpuoQddCfzysEBmNUSk1XUJkKYwPSuI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 2 - 2
obj/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -78,14 +78,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="711680">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="712192">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AcIKVji5GOXrfG5uGGBYOdsmmecfUv3GlxB/9OVMhUU=</dsig:DigestValue>
+        <dsig:DigestValue>zm3Tfc/spe2YIo3dJRnvz2aUlMi6dXX9hIjG5jweULU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb