Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Special/Special_CancelCollection.Designer.cs

@@ -30,7 +30,7 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_CancelCollection));
             this.sn_code_label = new System.Windows.Forms.Label();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -55,7 +55,6 @@
             this.sn_code.Location = new System.Drawing.Point(113, 131);
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
-            this.sn_code.Negative = false;
             this.sn_code.Power = null;
             this.sn_code.Size = new System.Drawing.Size(176, 21);
             this.sn_code.Str = null;
@@ -125,14 +124,14 @@
             this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Special_CancelCollection";
             this.Text = "取消采集";
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
 
         #endregion
         private System.Windows.Forms.Label sn_code_label;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox sn_code;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
         private CustomControl.ButtonUtil.NormalButton Confirm;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;

UAS-MES/FunctionCode/Special/Special_CancelCollection.cs

@@ -72,7 +72,7 @@ namespace UAS_MES.Special
                             barcode.Add(dt.Rows[i]["cm_barcode"].ToString());
                         }
                         sql.Clear();
-                        sql.Append("update makeserial set ms_nextmacode='' where ms_makecode=:barcode and ms_id=(select max(ms_id) from makeserial where ms_sncode=:barcode1)");
+                        sql.Append("update makeserial set ms_nextmacode='' where ms_sncode=:barcode and ms_id=(select max(ms_id) from makeserial where ms_sncode=:barcode1)");
                         dh.BatchInsert(sql.GetString(), new string[] { "barcode", "barcode1" }, barcode.ToArray(), barcode.ToArray());
                         sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
                     }