去除多余界面

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.Designer.cs → UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrintZX.Designer.cs

@@ -1,6 +1,6 @@
 namespace UAS_MES_NEW.Make
 {
-    partial class Make_ColorBoxLabelPrint_WN
+    partial class Make_ColorBoxLabelPrintZX
     {
         /// <summary>
         /// Required designer variable.
@@ -315,7 +315,6 @@
             // 
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
-            this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
             this.PrintNum.Location = new System.Drawing.Point(1458, 184);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(6);
@@ -377,9 +376,6 @@
             // PrintSecond
             // 
             this.PrintSecond.AutoSize = true;
-            this.PrintSecond.Checked = true;
-            this.PrintSecond.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.PrintSecond.Enabled = false;
             this.PrintSecond.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintSecond.ForeColor = System.Drawing.Color.Red;
             this.PrintSecond.Location = new System.Drawing.Point(1458, 411);
@@ -436,7 +432,6 @@
             // 
             this.PrintNum1.AllPower = null;
             this.PrintNum1.BackColor = System.Drawing.Color.White;
-            this.PrintNum1.Enabled = false;
             this.PrintNum1.ID = null;
             this.PrintNum1.Location = new System.Drawing.Point(1726, 404);
             this.PrintNum1.Margin = new System.Windows.Forms.Padding(6);
@@ -461,7 +456,7 @@
             this.label3.TabIndex = 212;
             this.label3.Text = "份数";
             // 
-            // Make_ColorBoxLabelPrint_WN
+            // Make_ColorBoxLabelPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -500,7 +495,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Make_ColorBoxLabelPrint_WN";
+            this.Name = "Make_ColorBoxLabelPrint";
             this.Tag = "Make!ColorBoxLabelPrint";
             this.Text = "W";
             this.Activated += new System.EventHandler(this.Make_ColorBoxLabelPrint_Activated);

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.cs → UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrintZX.cs

@@ -14,7 +14,7 @@ using Seagull.BarTender.Print;
 
 namespace UAS_MES_NEW.Make
 {
-    public partial class Make_ColorBoxLabelPrint_WN : Form
+    public partial class Make_ColorBoxLabelPrintZX : Form
     {
         DataHelper dh;
         DataTable dt;
@@ -39,7 +39,7 @@ namespace UAS_MES_NEW.Make
 
         DataTable Dbfind;
 
-        public Make_ColorBoxLabelPrint_WN()
+        public Make_ColorBoxLabelPrintZX()
         {
             InitializeComponent();
         }
@@ -160,7 +160,7 @@ namespace UAS_MES_NEW.Make
                     //判断界面工单是否为空时的序列号是否自动归属工单
                     // 获取工单归属工单下一工序是否正确
                     string status = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or  ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -204,6 +204,7 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText(">>序列号" + sncode.Text + "所属工单号" + oMakeCode + "与界面工单号" + ma_code.Text + "不同,无法采集\n", Color.Red, sncode);
                             return;
                         }
+                        HttpServer.GetEN(sncode.Text);
                         //获取工单的其他信息
                         sql.Clear();
                         sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from  ");

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrint_WNPACKAGE.Designer.cs

@@ -1,550 +0,0 @@
-namespace UAS_MES_NEW.Make
-{
-    partial class Make_ColorBoxLabelPrint_WNPACKAGE
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.pr_detail_label = new System.Windows.Forms.Label();
-            this.sncode_label = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.mcd_remainqty_label = new System.Windows.Forms.Label();
-            this.mcd_okqty_label = new System.Windows.Forms.Label();
-            this.pr_code_label = new System.Windows.Forms.Label();
-            this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.CheckTSN = new System.Windows.Forms.CheckBox();
-            this.CollectRemark = new System.Windows.Forms.CheckBox();
-            this.Remark = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
-            this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
-            this.Printer = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.mcd_remainqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueNumLabel(this.components);
-            this.mcd_okqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueNumLabel(this.components);
-            this.pr_code = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
-            this.pr_detail = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
-            this.PrintNum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.locksalecode = new System.Windows.Forms.CheckBox();
-            this.PrintSecond = new System.Windows.Forms.CheckBox();
-            this.PrintLabel1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
-            this.label7 = new System.Windows.Forms.Label();
-            this.PrintList1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.PrintNum1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1450, 288);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(114, 41);
-            this.label2.TabIndex = 180;
-            this.label2.Text = "打印机";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1450, 347);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 41);
-            this.label1.TabIndex = 179;
-            this.label1.Text = "标签";
-            // 
-            // pr_detail_label
-            // 
-            this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(1292, 85);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
-            this.pr_detail_label.TabIndex = 171;
-            this.pr_detail_label.Text = "产品名称";
-            // 
-            // sncode_label
-            // 
-            this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.sncode_label.AutoSize = true;
-            this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(524, 893);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(138, 41);
-            this.sncode_label.TabIndex = 170;
-            this.sncode_label.Text = "TSN/SN";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(1292, 178);
-            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(146, 41);
-            this.label4.TabIndex = 167;
-            this.label4.Text = "打印张数";
-            // 
-            // mcd_remainqty_label
-            // 
-            this.mcd_remainqty_label.AutoSize = true;
-            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(750, 168);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(114, 41);
-            this.mcd_remainqty_label.TabIndex = 166;
-            this.mcd_remainqty_label.Text = "剩余数";
-            // 
-            // mcd_okqty_label
-            // 
-            this.mcd_okqty_label.AutoSize = true;
-            this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(24, 168);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(146, 41);
-            this.mcd_okqty_label.TabIndex = 165;
-            this.mcd_okqty_label.Text = "打印计数";
-            // 
-            // pr_code_label
-            // 
-            this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(750, 83);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(146, 41);
-            this.pr_code_label.TabIndex = 164;
-            this.pr_code_label.Text = "产品编号";
-            // 
-            // ms_makecode_label
-            // 
-            this.ms_makecode_label.AutoSize = true;
-            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(20, 83);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
-            this.ms_makecode_label.TabIndex = 163;
-            this.ms_makecode_label.Text = "归属工单";
-            // 
-            // CheckTSN
-            // 
-            this.CheckTSN.AutoSize = true;
-            this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckTSN.Location = new System.Drawing.Point(64, 890);
-            this.CheckTSN.Margin = new System.Windows.Forms.Padding(6);
-            this.CheckTSN.Name = "CheckTSN";
-            this.CheckTSN.Size = new System.Drawing.Size(240, 45);
-            this.CheckTSN.TabIndex = 186;
-            this.CheckTSN.Text = "是否检查TSN";
-            this.CheckTSN.UseVisualStyleBackColor = true;
-            this.CheckTSN.CheckedChanged += new System.EventHandler(this.CheckTSN_CheckedChanged);
-            // 
-            // CollectRemark
-            // 
-            this.CollectRemark.AutoSize = true;
-            this.CollectRemark.Checked = true;
-            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(1458, 670);
-            this.CollectRemark.Margin = new System.Windows.Forms.Padding(6);
-            this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(155, 39);
-            this.CollectRemark.TabIndex = 197;
-            this.CollectRemark.Text = "采集备注";
-            this.CollectRemark.UseVisualStyleBackColor = true;
-            // 
-            // Remark
-            // 
-            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(1450, 724);
-            this.Remark.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
-            this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(404, 156);
-            this.Remark.TabIndex = 196;
-            this.Remark.Text = "";
-            // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1457, 613);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(6);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(159, 45);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 189;
-            // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(498, 83);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(6);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(94, 35);
-            this.LockMakeCode.TabIndex = 185;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(180, 83);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(298, 42);
-            this.ma_code.TabIndex = 184;
-            this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
-            // 
-            // PrintLabel
-            // 
-            this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1578, 347);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(264, 32);
-            this.PrintLabel.TabIndex = 181;
-            this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
-            // 
-            // Printer
-            // 
-            this.Printer.Location = new System.Drawing.Point(1578, 288);
-            this.Printer.Margin = new System.Windows.Forms.Padding(8);
-            this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(268, 50);
-            this.Printer.TabIndex = 178;
-            // 
-            // mcd_remainqty
-            // 
-            this.mcd_remainqty.AutoSize = true;
-            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(926, 168);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(37, 41);
-            this.mcd_remainqty.TabIndex = 177;
-            this.mcd_remainqty.Text = "0";
-            // 
-            // mcd_okqty
-            // 
-            this.mcd_okqty.AutoSize = true;
-            this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(172, 168);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(37, 41);
-            this.mcd_okqty.TabIndex = 176;
-            this.mcd_okqty.Text = "0";
-            // 
-            // pr_code
-            // 
-            this.pr_code.AutoSize = true;
-            this.pr_code.CutLength = null;
-            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(926, 85);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 41);
-            this.pr_code.TabIndex = 175;
-            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.AutoSize = true;
-            this.pr_detail.CutLength = null;
-            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(1468, 83);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 41);
-            this.pr_detail.TabIndex = 174;
-            // 
-            // PrintNum
-            // 
-            this.PrintNum.AllPower = null;
-            this.PrintNum.BackColor = System.Drawing.Color.White;
-            this.PrintNum.Enabled = false;
-            this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1458, 184);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(6);
-            this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Negative = false;
-            this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(296, 35);
-            this.PrintNum.Str = null;
-            this.PrintNum.Str1 = null;
-            this.PrintNum.Str2 = null;
-            this.PrintNum.TabIndex = 172;
-            this.PrintNum.Text = "1";
-            // 
-            // sncode
-            // 
-            this.sncode.AllPower = "ifall";
-            this.sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.sncode.BackColor = System.Drawing.Color.White;
-            this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(702, 894);
-            this.sncode.Margin = new System.Windows.Forms.Padding(6);
-            this.sncode.Name = "sncode";
-            this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(388, 35);
-            this.sncode.Str = null;
-            this.sncode.Str1 = null;
-            this.sncode.Str2 = null;
-            this.sncode.TabIndex = 169;
-            this.sncode.Tag = "ifread";
-            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
-            // 
-            // OperateResult
-            // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(28, 258);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1403, 606);
-            this.OperateResult.TabIndex = 168;
-            this.OperateResult.Text = "";
-            // 
-            // locksalecode
-            // 
-            this.locksalecode.AutoSize = true;
-            this.locksalecode.Checked = true;
-            this.locksalecode.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.locksalecode.Enabled = false;
-            this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(180, 33);
-            this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
-            this.locksalecode.Name = "locksalecode";
-            this.locksalecode.Size = new System.Drawing.Size(186, 28);
-            this.locksalecode.TabIndex = 205;
-            this.locksalecode.Text = "当前订单锁定";
-            this.locksalecode.UseVisualStyleBackColor = true;
-            // 
-            // PrintSecond
-            // 
-            this.PrintSecond.AutoSize = true;
-            this.PrintSecond.Checked = true;
-            this.PrintSecond.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.PrintSecond.Enabled = false;
-            this.PrintSecond.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintSecond.ForeColor = System.Drawing.Color.Red;
-            this.PrintSecond.Location = new System.Drawing.Point(1458, 411);
-            this.PrintSecond.Margin = new System.Windows.Forms.Padding(6);
-            this.PrintSecond.Name = "PrintSecond";
-            this.PrintSecond.Size = new System.Drawing.Size(162, 28);
-            this.PrintSecond.TabIndex = 211;
-            this.PrintSecond.Text = "打印副标签";
-            this.PrintSecond.UseVisualStyleBackColor = true;
-            // 
-            // PrintLabel1
-            // 
-            this.PrintLabel1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PrintLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintLabel1.FormattingEnabled = true;
-            this.PrintLabel1.Location = new System.Drawing.Point(1578, 542);
-            this.PrintLabel1.Margin = new System.Windows.Forms.Padding(4);
-            this.PrintLabel1.Name = "PrintLabel1";
-            this.PrintLabel1.Size = new System.Drawing.Size(264, 39);
-            this.PrintLabel1.TabIndex = 209;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(1450, 537);
-            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(101, 41);
-            this.label7.TabIndex = 210;
-            this.label7.Text = "标签1";
-            // 
-            // PrintList1
-            // 
-            this.PrintList1.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList1.Location = new System.Drawing.Point(1578, 472);
-            this.PrintList1.Margin = new System.Windows.Forms.Padding(12, 14, 12, 14);
-            this.PrintList1.Name = "PrintList1";
-            this.PrintList1.Size = new System.Drawing.Size(264, 56);
-            this.PrintList1.TabIndex = 208;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(1443, 472);
-            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(133, 41);
-            this.label8.TabIndex = 207;
-            this.label8.Text = "打印机1";
-            // 
-            // PrintNum1
-            // 
-            this.PrintNum1.AllPower = null;
-            this.PrintNum1.BackColor = System.Drawing.Color.White;
-            this.PrintNum1.Enabled = false;
-            this.PrintNum1.ID = null;
-            this.PrintNum1.Location = new System.Drawing.Point(1726, 404);
-            this.PrintNum1.Margin = new System.Windows.Forms.Padding(6);
-            this.PrintNum1.Name = "PrintNum1";
-            this.PrintNum1.Negative = false;
-            this.PrintNum1.Power = null;
-            this.PrintNum1.Size = new System.Drawing.Size(85, 35);
-            this.PrintNum1.Str = null;
-            this.PrintNum1.Str1 = null;
-            this.PrintNum1.Str2 = null;
-            this.PrintNum1.TabIndex = 213;
-            this.PrintNum1.Text = "1";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(1632, 400);
-            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(82, 41);
-            this.label3.TabIndex = 212;
-            this.label3.Text = "份数";
-            // 
-            // Make_ColorBoxLabelPrint_WN
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1876, 960);
-            this.Controls.Add(this.PrintNum1);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.PrintSecond);
-            this.Controls.Add(this.PrintLabel1);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.PrintList1);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.locksalecode);
-            this.Controls.Add(this.CollectRemark);
-            this.Controls.Add(this.Remark);
-            this.Controls.Add(this.StepCount);
-            this.Controls.Add(this.CheckTSN);
-            this.Controls.Add(this.LockMakeCode);
-            this.Controls.Add(this.ma_code);
-            this.Controls.Add(this.PrintLabel);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.Printer);
-            this.Controls.Add(this.mcd_remainqty);
-            this.Controls.Add(this.mcd_okqty);
-            this.Controls.Add(this.pr_code);
-            this.Controls.Add(this.pr_detail);
-            this.Controls.Add(this.PrintNum);
-            this.Controls.Add(this.pr_detail_label);
-            this.Controls.Add(this.sncode_label);
-            this.Controls.Add(this.sncode);
-            this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.mcd_remainqty_label);
-            this.Controls.Add(this.mcd_okqty_label);
-            this.Controls.Add(this.pr_code_label);
-            this.Controls.Add(this.ms_makecode_label);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(6);
-            this.Name = "Make_ColorBoxLabelPrint_WN";
-            this.Tag = "Make!ColorBoxLabelPrint";
-            this.Text = "W";
-            this.Activated += new System.EventHandler(this.Make_ColorBoxLabelPrint_Activated);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLabelPrint_FormClosing);
-            this.Load += new System.EventHandler(this.Make_ColorBoxLabelPrint_Load);
-            this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLabelPrint_SizeChanged);
-            this.ResumeLayout(true);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private CustomControl.ComBoxWithFocus.PrinterCombox Printer;
-        private CustomControl.ValueLabel.ValueNumLabel mcd_remainqty;
-        private CustomControl.ValueLabel.ValueNumLabel mcd_okqty;
-        private CustomControl.ValueLabel.ValueLabel pr_code;
-        private CustomControl.ValueLabel.ValueLabel pr_detail;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox PrintNum;
-        private System.Windows.Forms.Label pr_detail_label;
-        private System.Windows.Forms.Label sncode_label;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
-        private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label mcd_remainqty_label;
-        private System.Windows.Forms.Label mcd_okqty_label;
-        private System.Windows.Forms.Label pr_code_label;
-        private System.Windows.Forms.Label ms_makecode_label;
-        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
-        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
-        private System.Windows.Forms.CheckBox CheckTSN;
-        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
-        private System.Windows.Forms.CheckBox CollectRemark;
-        private CustomControl.RichText.RichTextAutoBottom Remark;
-        private System.Windows.Forms.CheckBox locksalecode;
-        private System.Windows.Forms.CheckBox PrintSecond;
-        private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel1;
-        private System.Windows.Forms.Label label7;
-        private CustomControl.ComBoxWithFocus.PrinterCombox PrintList1;
-        private System.Windows.Forms.Label label8;
-        private CustomControl.TextBoxWithIcon.NumOnlyTextBox PrintNum1;
-        private System.Windows.Forms.Label label3;
-    }
-}

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrint_WNPACKAGE.cs

@@ -1,437 +0,0 @@
-using System;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using UAS_MES_NEW.DataOperate;
-using UAS_MES_NEW.PublicMethod;
-using UAS_MES_NEW.Entity;
-using LabelManager2;
-using System.Threading;
-using UAS_MES_NEW.PublicForm;
-using System.Web.UI.WebControls;
-using Seagull.BarTender.Print;
-
-namespace UAS_MES_NEW.Make
-{
-    public partial class Make_ColorBoxLabelPrint_WNPACKAGE : Form
-    {
-        DataHelper dh;
-        DataTable dt;
-        LogStringBuilder sql = new LogStringBuilder();
-        AutoSizeFormClass asc = new AutoSizeFormClass();
-        //保存StepProduct查询出来的数据
-        DataTable ListA = new DataTable();
-        //制造单号
-        string macode;
-        //当前提示的索引
-        //保存TSN编号
-        string ms_id = null;
-
-        string PR_CHECKCARTONW = "0";
-
-        bool pr_change = false;
-
-        Thread InitPrint;
-        ApplicationClass lbl;
-
-        Engine engine;
-
-        DataTable Dbfind;
-
-        public Make_ColorBoxLabelPrint_WNPACKAGE()
-        {
-            InitializeComponent();
-        }
-
-        private void Make_ColorBoxLabelPrint_Load(object sender, EventArgs e)
-        {
-            sncode.Focus();
-            asc.controllInitializeSize(this);
-            InitPrint = new Thread(InPrint);
-            SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
-            BaseUtil.SetFormCenter(stw);
-            stw.ShowDialog();
-            //设置锁定工单
-            LockMakeCode.GetMakeCodeCtl(ma_code);
-            ma_code.SetLockCheckBox(LockMakeCode);
-            //工单号放大镜配置
-            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
-            ma_code.Condition = "ma_statuscode='STARTED'";
-            ma_code.DbChange += Ma_code_DbChange;
-            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-            dh = SystemInf.dh;
-            StepCount.StepCode = User.CurrentStepCode;
-            StepCount.Source = User.UserSourceCode;
-            StepCount.LineCode = User.UserLineCode;
-            StepCount.Dh = dh;
-            StepCount.Start();
-        }
-
-        private void Ma_code_DbChange(object sender, EventArgs e)
-        {
-            Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-            //获取工单的其他信息
-            sql.Clear();
-            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
-            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
-            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (dt.Rows.Count > 0)
-            {
-                BaseUtil.SetFormValue(this.Controls, dt);
-            }
-        }
-
-        private void InPrint()
-        {
-            try
-            {
-                engine = new Engine(true);
-            }
-            catch (Exception)
-            {
-                OperateResult.AppendText("未正确安装BarTender软件\n", Color.Red);
-            }
-        }
-
-        private void sn_code_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                if (CheckTSN.Checked == true && ms_id == null)
-                {
-                    if (sncode.Text == "")
-                    {
-                        OperateResult.AppendText(">>TSN不能为空\n", Color.Red);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                        return;
-                    }
-                    OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
-                    sql.Clear();
-                    sql.Append("select max(ms_id) ms_id from makeserial where ms_beforesn = '" + sncode.Text + "'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows[0][0].ToString() != "")
-                    {
-                        ms_id = dt.Rows[0][0].ToString();
-                        sncode.Focus();
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
-                        return;
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(">>TSN" + sncode.Text + "错误,不存在\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                        return;
-                    }
-                }
-                if (sncode.Text == "")
-                {
-                    OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                    return;
-                }
-                OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
-                if (CheckTSN.Checked == true && ms_id != null)
-                {
-                    sql.Clear();
-                    sql.Append("select ms_id from makeserial where ms_id='" + ms_id + "' and ms_sncode = '" + sncode.Text + "'");
-                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        OperateResult.AppendText(">>TSN和SN一致\n", Color.Green);
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(">>TSN和SN不一致\n", Color.Red, sncode);
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                        ms_id = null;
-                        return;
-                    }
-                }
-                string oMsID;
-                string ErrorMessage;
-                string oMakeCode;
-                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
-                {
-                    //判断界面工单是否为空时的序列号是否自动归属工单
-                    // 获取工单归属工单下一工序是否正确
-                    string status = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' order by ms_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                        }
-                        else
-                        {
-                            dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + sncode.Text + "' order by mil_id desc", "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
-                            }
-                            else
-                            {
-                                dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + sncode.Text + "' order by mil_id desc", "select");
-                                if (dt.Rows.Count > 0)
-                                {
-                                    sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
-                                }
-                            }
-                        }
-                    }
-                    LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out status, out ErrorMessage);
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
-                    {
-                        string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
-                        if (nextstepcode != User.CurrentStepCode)
-                        {
-                            string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
-                            OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
-                            return;
-                        }
-                        if (locksalecode.Checked && ma_code.Text != "" && ma_code.Text != oMakeCode)
-                        {
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "所属工单号" + oMakeCode + "与界面工单号" + ma_code.Text + "不同,无法采集\n", Color.Red, sncode);
-                            return;
-                        }
-                        //获取工单的其他信息
-                        sql.Clear();
-                        sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from  ");
-                        sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "'");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sncode.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
-                            if (PR_CHECKCARTONW != "0")
-                            {
-                                OperateResult.AppendText(">>彩盒" + sncode.Text + "当前处于称重工序，无法在此界面采集，需去彩盒称重界面进行采集\n", Color.Black, sncode);
-                                return;
-                            }
-                            BaseUtil.SetFormValue(this.Controls, dt);
-                            LockMakeCode.Checked = true;
-                            //提示用户“<<工单号：取ma_makecode”
-                            OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
-                            //提示用户“<< 序列号：XXXX”
-                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
-                            if (pr_change)
-                            {
-                                String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
-                                if (dialog != "OK")
-                                {
-                                    OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
-                                    return;
-                                }
-                                else pr_change = false;
-                            }
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red, sncode);
-                            sncode.Focus();
-                            return;
-                        }
-                        //if (int.Parse(mcd_remainqty.Text) <= 0 && dt.Rows[0]["ma_unlimitin"].ToString() == "0")
-                        //{
-                        //    macode = ma_code.Text;
-                        //    ErrorMessage = "工单" + macode + "打印结束\n>请输入SN";
-                        //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                        //    sncode.Focus();
-                        //}
-                        //else
-                        //{
-                        //所选标签不为空
-                        if (PrintLabel.SelectedValue != null)
-                        {
-                            //如果打印张数为空，返回
-                            if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
-                            {
-                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
-                                //清空输入框的值，聚焦
-                                sncode.Focus();
-                                //提示用户“>>请输入SN”
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                return;
-                            }
-                            //更新至下一步工序
-                            if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage))
-                            {
-                                //提示正确返回时传递的信息
-                                if (ErrorMessage.Contains("AFTERSUCCESS"))
-                                    OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
-                                {
-                                    //提示用户打印成功
-                                    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                                }
-                                if (PrintSecond.Checked)
-                                {
-                                    if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sncode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
-                                    {
-                                        OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
-                                    }
-                                }
-                                if (CollectRemark.Checked && Remark.Text != "")
-                                {
-                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
-                                }
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
-                                //刷新打印数量和剩余数量
-                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
-                                BaseUtil.SetFormValue(Controls, dt);
-                                sncode.Text = "";
-                                ms_id = null;
-                                sncode.Focus();
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
-                                ms_id = null;
-                                sncode.Focus();
-                            }
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>产品编号:" + pr_code.Text + "未维护彩盒标签\n", Color.Red, sncode);
-                            return;
-                        }
-                        if (CheckTSN.Checked == true)
-                        {
-                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                            ms_id = null;
-                        }
-                        else
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                        //}
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(ErrorMessage + "\n", Color.Red, sncode);
-                        if (CheckTSN.Checked == true)
-                        {
-                            OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                            ms_id = null;
-                        }
-                        else
-                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                    }
-                }
-                else
-                {
-                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red, sncode);
-                    if (CheckTSN.Checked == true)
-                    {
-                        OperateResult.AppendText(">>请输入TSN\n", Color.Black);
-                        ms_id = null;
-                    }
-                    else
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                }
-            }
-        }
-        DataTable _dt;
-        //根据产品编号获取打印模板
-        private void pr_code_TextChanged(object sender, EventArgs e)
-        {
-            _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='精品袋标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
-            if (_dt.Rows.Count == 0)
-            {
-                _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode is null and la_templatetype='精品袋标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
-            }
-            if (_dt.Rows.Count > 0)
-            {
-                string la_id = _dt.Rows[0]["la_id"].ToString();
-                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='精品袋标签' and la_id='" + la_id + "') where COLUMN_VALUE is not null)", "select");
-                PrintLabel.DataSource = _dt;
-                PrintLabel.DisplayMember = "la_url";
-                PrintLabel.ValueMember = "la_id";
-
-                PrintLabel1.DataSource = _dt.Copy();
-                PrintLabel1.DisplayMember = "la_url";
-                PrintLabel1.ValueMember = "la_id";
-
-                pr_change = true;
-            }
-        }
-
-        private void Make_ColorBoxLabelPrint_Activated(object sender, EventArgs e)
-        {
-            sncode.Focus();
-        }
-
-        private void Make_ColorBoxLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            BaseUtil.ClosePrint(lbl);
-        }
-
-        private void Make_ColorBoxLabelPrint_SizeChanged(object sender, EventArgs e)
-        {
-            asc.controlAutoSize(this);
-        }
-
-        private void ma_code_UserControlTextChanged(object sender, EventArgs e)
-        {
-            if (ma_code.Text.Length > 4)
-            {
-                //获取工单的其他信息
-                sql.Clear();
-                sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
-                sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
-                sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (dt.Rows.Count > 0)
-                {
-                    BaseUtil.SetFormValue(this.Controls, dt);
-                }
-                else
-                {
-                    sncode.Text = "";
-                }
-            }
-        }
-
-        private void CheckTSN_CheckedChanged(object sender, EventArgs e)
-        {
-            if (CheckTSN.Checked == true)
-            {
-                ms_id = null;
-                OperateResult.AppendText(">>切换至检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入TSN\n", Color.Black, sncode);
-                sncode.Focus();
-            }
-            else
-            {
-                ms_id = null;
-                OperateResult.AppendText(">>切换至不检查TSN\n", Color.Green);
-                OperateResult.AppendText(">>请输入SN\n", Color.Black, sncode);
-                sncode.Focus();
-            }
-        }
-
-        private void PrintLabel_SelectedValueChanged(object sender, EventArgs e)
-        {
-            if (PrintLabel.SelectedValue != null && PrintLabel.SelectedValue.ToString() != "System.Data.DataRowView")
-            {
-                string PrintNums = dh.getFieldDataByCondition("label", "la_printnos", "la_id='" + PrintLabel.SelectedValue.ToString() + "'").ToString();
-                PrintNum.Text = (PrintNums == "" ? "1" : PrintNums);
-            }
-        }
-    }
-}

UAS_MES_HYSX/FunctionCode/Make/Make_ColorBoxLabelPrint_WNPACKAGE.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

UAS_MES_HYSX/UAS_MES_HYSX.csproj

@@ -557,17 +557,11 @@
     <Compile Include="FunctionCode\Make\Make_CollectElec.Designer.cs">
       <DependentUpon>Make_CollectElec.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WNPACKAGE.cs">
+    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrintZX.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WNPACKAGE.Designer.cs">
-      <DependentUpon>Make_ColorBoxLabelPrint_WNPACKAGE.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WN.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WN.Designer.cs">
-      <DependentUpon>Make_ColorBoxLabelPrint_WN.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrintZX.Designer.cs">
+      <DependentUpon>Make_ColorBoxLabelPrintZX.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\Make\Make_ColorBoxLoadPrintPT.cs">
       <SubType>Form</SubType>
@@ -1607,11 +1601,8 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_CollectElec.resx">
       <DependentUpon>Make_CollectElec.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WNPACKAGE.resx">
-      <DependentUpon>Make_ColorBoxLabelPrint_WNPACKAGE.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WN.resx">
-      <DependentUpon>Make_ColorBoxLabelPrint_WN.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLabelPrintZX.resx">
+      <DependentUpon>Make_ColorBoxLabelPrintZX.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLoadPrintPT.resx">
       <DependentUpon>Make_ColorBoxLoadPrintPT.cs</DependentUpon>