添加分隔符分割字符串

UAS-MES/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -41,6 +41,7 @@
             this.MinWindow1 = new System.Windows.Forms.PictureBox();
             this.CloseWindow = new System.Windows.Forms.PictureBox();
             this.GetRelation = new System.Windows.Forms.CheckBox();
+            this.SplitStr = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.changepwdicon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Change_psw)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.logouticon)).BeginInit();
@@ -149,11 +150,21 @@
             this.GetRelation.UseVisualStyleBackColor = false;
             this.GetRelation.CheckedChanged += new System.EventHandler(this.GetRelation_CheckedChanged);
             // 
+            // SplitStr
+            // 
+            resources.ApplyResources(this.SplitStr, "SplitStr");
+            this.SplitStr.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.SplitStr.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.SplitStr.Name = "SplitStr";
+            this.SplitStr.UseVisualStyleBackColor = false;
+            this.SplitStr.CheckedChanged += new System.EventHandler(this.SplitStr_CheckedChanged);
+            // 
             // HeadBar
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.Controls.Add(this.SplitStr);
             this.Controls.Add(this.GetRelation);
             this.Controls.Add(this.AlwaysTop);
             this.Controls.Add(this.UpperCollection);
@@ -195,5 +206,6 @@
         private System.Windows.Forms.CheckBox UpperCollection;
         private System.Windows.Forms.CheckBox AlwaysTop;
         private System.Windows.Forms.CheckBox GetRelation;
+        private System.Windows.Forms.CheckBox SplitStr;
     }
 }

UAS-MES/CustomControl/HeadBar/HeadBar.cs

@@ -155,5 +155,10 @@ namespace UAS_MES.CustomControl
         {
             SystemInf.GetRelation = GetRelation.Checked;
         }
+
+        private void SplitStr_CheckedChanged(object sender, EventArgs e)
+        {
+            SystemInf.SplitStr = SplitStr.Checked;
+        }
     }
 }

UAS-MES/CustomControl/HeadBar/HeadBar.resx

@@ -130,10 +130,13 @@
     <value>NoControl</value>
   </data>
   <data name="TitleLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 8</value>
+    <value>24, 13</value>
+  </data>
+  <data name="TitleLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="TitleLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 27</value>
+    <value>0, 41</value>
   </data>
   <data name="TitleLabel.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -148,7 +151,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TitleLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="UpperCollection.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -163,10 +166,13 @@
     <value>NoControl</value>
   </data>
   <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>315, 0</value>
+    <value>468, 0</value>
+  </data>
+  <data name="UpperCollection.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 40</value>
+    <value>142, 64</value>
   </data>
   <data name="UpperCollection.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -184,7 +190,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;UpperCollection.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="AlwaysTop.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -199,10 +205,13 @@
     <value>NoControl</value>
   </data>
   <data name="AlwaysTop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>224, 0</value>
+    <value>326, 0</value>
+  </data>
+  <data name="AlwaysTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="AlwaysTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 40</value>
+    <value>142, 64</value>
   </data>
   <data name="AlwaysTop.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -223,7 +232,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;AlwaysTop.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="changepwdicon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -232,13 +241,13 @@
     <value>NoControl</value>
   </data>
   <data name="changepwdicon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>406, 0</value>
+    <value>610, 0</value>
   </data>
   <data name="changepwdicon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="changepwdicon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>35, 40</value>
+    <value>52, 64</value>
   </data>
   <data name="changepwdicon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -256,7 +265,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;changepwdicon.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="Change_psw.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -265,13 +274,13 @@
     <value>NoControl</value>
   </data>
   <data name="Change_psw.Location" type="System.Drawing.Point, System.Drawing">
-    <value>441, 0</value>
+    <value>662, 0</value>
   </data>
   <data name="Change_psw.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 2, 3, 2</value>
+    <value>4, 3, 4, 3</value>
   </data>
   <data name="Change_psw.Size" type="System.Drawing.Size, System.Drawing">
-    <value>128, 40</value>
+    <value>192, 64</value>
   </data>
   <data name="Change_psw.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -289,7 +298,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Change_psw.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="logouticon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -298,13 +307,13 @@
     <value>NoControl</value>
   </data>
   <data name="logouticon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>569, 0</value>
+    <value>854, 0</value>
   </data>
   <data name="logouticon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="logouticon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 40</value>
+    <value>66, 64</value>
   </data>
   <data name="logouticon.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -319,7 +328,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;logouticon.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="LoginOut.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -328,13 +337,13 @@
     <value>NoControl</value>
   </data>
   <data name="LoginOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>613, 0</value>
+    <value>920, 0</value>
   </data>
   <data name="LoginOut.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 2, 3, 2</value>
+    <value>4, 3, 4, 3</value>
   </data>
   <data name="LoginOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 40</value>
+    <value>90, 64</value>
   </data>
   <data name="LoginOut.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>CenterImage</value>
@@ -352,7 +361,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;LoginOut.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="MinWindow2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -361,13 +370,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>673, 0</value>
+    <value>1010, 0</value>
   </data>
   <data name="MinWindow2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>20, 40</value>
+    <value>30, 64</value>
   </data>
   <data name="MinWindow2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -385,7 +394,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow2.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="MinWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -394,13 +403,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>693, 0</value>
+    <value>1040, 0</value>
   </data>
   <data name="MinWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>40, 40</value>
+    <value>60, 64</value>
   </data>
   <data name="MinWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -418,7 +427,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="MinWindow1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -427,13 +436,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>733, 0</value>
+    <value>1100, 0</value>
   </data>
   <data name="MinWindow1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>20, 40</value>
+    <value>30, 64</value>
   </data>
   <data name="MinWindow1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -451,7 +460,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow1.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="CloseWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -460,13 +469,13 @@
     <value>NoControl</value>
   </data>
   <data name="CloseWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>753, 0</value>
+    <value>1130, 0</value>
   </data>
   <data name="CloseWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>40, 40</value>
+    <value>60, 64</value>
   </data>
   <data name="CloseWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -484,7 +493,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CloseWindow.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="GetRelation.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -499,10 +508,13 @@
     <value>NoControl</value>
   </data>
   <data name="GetRelation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 0</value>
+    <value>184, 0</value>
+  </data>
+  <data name="GetRelation.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
   </data>
   <data name="GetRelation.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 40</value>
+    <value>142, 64</value>
   </data>
   <data name="GetRelation.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -520,19 +532,58 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;GetRelation.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="SplitStr.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="SplitStr.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Right</value>
+  </data>
+  <data name="SplitStr.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
+  </data>
+  <data name="SplitStr.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="SplitStr.Location" type="System.Drawing.Point, System.Drawing">
+    <value>42, 0</value>
+  </data>
+  <data name="SplitStr.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 5, 4, 5</value>
+  </data>
+  <data name="SplitStr.Size" type="System.Drawing.Size, System.Drawing">
+    <value>142, 64</value>
+  </data>
+  <data name="SplitStr.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <data name="SplitStr.Text" xml:space="preserve">
+    <value>分割字符</value>
+  </data>
+  <data name="&gt;&gt;SplitStr.Name" xml:space="preserve">
+    <value>SplitStr</value>
+  </data>
+  <data name="&gt;&gt;SplitStr.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;SplitStr.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;SplitStr.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 15</value>
+    <value>12, 24</value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>793, 40</value>
+    <value>1190, 64</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -24,33 +24,30 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         {
             get
             {
- //               if (SystemInf.GetRelation&&base.Text!="")
- //               {
- //                   string sn = dh.getFieldDataByCondition("SNRELATION_VIEW", "sr_sn", "content like '%"+base.Text+"%'").ToString();
- //                  int count = int.Parse(dh.getFieldDataByCondition("SNRELATION_VIEW", "count(1) cn", "content like '%" + base.Text + "%'").ToString());
- //                   if (sn == ""||count>1)
- //                   {
- //                       MessageBox.Show("SN:" + base.Text + "未找到关联信息");
- //                       return "";
- //                   }
- //                   else
- //                   {
- ////                       base.Text = sn;
- //                       if (SystemInf.UpperCollection)
- //                           return sn.ToUpper();
- //                       else
- //                           return sn;
- //                   }
- //               }
- //               else
- //               {
-                    if (SystemInf.UpperCollection)
+                if (SystemInf.UpperCollection)
+                {
+                    if (SystemInf.SplitStr)
+                    {
+                        return base.Text.ToUpper().Split(';')[0];
+                    }
+                    else
+                    {
                         return base.Text.ToUpper();
+                    }
+                }
+                else
+                {
+                    if (SystemInf.SplitStr)
+                    {
+                        return base.Text.Split(';')[0];
+                    }
                     else
+                    {
                         return base.Text;
- //              }
+                    }
+                }
             }
-            
+
             set
             {
                 base.Text = value;
@@ -69,12 +66,12 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     {
                         MessageBox.Show("SN:" + base.Text + "未找到关联信息");
                         base.Text = "";
-                        return ;
+                        return;
                     }
                     else
-                    {    
+                    {
                         if (SystemInf.UpperCollection)
-                            base.Text =  sn.ToUpper();
+                            base.Text = sn.ToUpper();
                         else
                             base.Text = sn;
                     }

UAS-MES/Entity/SystemInf.cs

@@ -74,6 +74,8 @@ namespace UAS_MES.Entity
 
         public static bool GetRelation = false;
 
+        public static bool SplitStr = false;
+
         public static DataOperate.DataHelper dh;
     }
 }