添加按照批次号过站的方法

UAS_MES_XMW/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.Designer.cs

@@ -1,550 +0,0 @@
-namespace UAS_MES_NEW.Make
-{
-    partial class Make_ColorBoxLabelPrint_WN
-    {
-        /// <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_XMW/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.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_WN : 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_WN()
-        {
-            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_XMW/FunctionCode/Make/Make_ColorBoxLabelPrint_WN.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_XMW/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_XMW/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_XMW/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_XMW/FunctionCode/Make/Make_FuselageLabelPrintGetIMEIWatch.Designer.cs

@@ -1,408 +0,0 @@
-namespace UAS_MES_NEW.Make
-{
-    partial class Make_FuselageLabelPrintGetIMEIWatch
-    {
-        /// <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.CollectRemark = new System.Windows.Forms.CheckBox();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
-            this.Remark = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
-            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.ma_prodcode = 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.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(1398, 38);
-            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(1422, 216);
-            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(931, 42);
-            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(24, 830);
-            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(114, 41);
-            this.sncode_label.TabIndex = 170;
-            this.sncode_label.Text = "序列号";
-            // 
-            // 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(1366, 138);
-            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(493, 136);
-            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, 136);
-            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(493, 42);
-            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(25, 42);
-            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 = "工单编号";
-            // 
-            // 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(1437, 315);
-            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;
-            // 
-            // 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(392, 48);
-            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 = 199;
-            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(177, 46);
-            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(203, 42);
-            this.ma_code.TabIndex = 198;
-            this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = 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(1430, 370);
-            this.Remark.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3);
-            this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(378, 156);
-            this.Remark.TabIndex = 196;
-            this.Remark.Text = "";
-            // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(931, 136);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(176, 45);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 183;
-            this.StepCount.Load += new System.EventHandler(this.StepCount_Load);
-            // 
-            // PrintLabel
-            // 
-            this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1534, 216);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
-            this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(200, 32);
-            this.PrintLabel.TabIndex = 181;
-            this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
-            // 
-            // Printer
-            // 
-            this.Printer.Location = new System.Drawing.Point(1526, 38);
-            this.Printer.Margin = new System.Windows.Forms.Padding(8);
-            this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(212, 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(617, 136);
-            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(170, 136);
-            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";
-            // 
-            // ma_prodcode
-            // 
-            this.ma_prodcode.AutoSize = true;
-            this.ma_prodcode.CutLength = null;
-            this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(639, 42);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(266, 0);
-            this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 41);
-            this.ma_prodcode.TabIndex = 175;
-            this.ma_prodcode.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(1089, 42);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(266, 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1534, 131);
-            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(200, 39);
-            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(190, 830);
-            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(1, 204);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(6);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1360, 580);
-            this.OperateResult.TabIndex = 168;
-            this.OperateResult.Text = "";
-            // 
-            // Make_FuselageLabelPrint
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1828, 896);
-            this.Controls.Add(this.LockMakeCode);
-            this.Controls.Add(this.ma_code);
-            this.Controls.Add(this.CollectRemark);
-            this.Controls.Add(this.Remark);
-            this.Controls.Add(this.StepCount);
-            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.ma_prodcode);
-            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_FuselageLabelPrint";
-            this.Tag = "Make!FuselageLabelPrint";
-            this.Text = "Make_FuselageLabelPrint";
-            this.Activated += new System.EventHandler(this.Make_FuselageLabelPrint_Activated);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_FuselageLabelPrint_FormClosing);
-            this.Load += new System.EventHandler(this.Make_FuselageLabelPrint_Load);
-            this.SizeChanged += new System.EventHandler(this.Make_FuselageLabelPrint_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 ma_prodcode;
-        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.SourceStepCount StepCount;
-        private System.Windows.Forms.CheckBox CollectRemark;
-        private CustomControl.RichText.RichTextAutoBottom Remark;
-        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
-        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
-    }
-}

UAS_MES_XMW/FunctionCode/Make/Make_FuselageLabelPrintGetIMEIWatch.cs

@@ -1,368 +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.IO;
-using System.Threading;
-using UAS_MES_NEW.PublicForm;
-using Seagull.BarTender.Print;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-
-namespace UAS_MES_NEW.Make
-{
-    public partial class Make_FuselageLabelPrintGetIMEIWatch : Form
-    {
-        DataHelper dh;
-        DataTable dt;
-        LogStringBuilder sql = new LogStringBuilder();
-        Document doc;
-        AutoSizeFormClass asc = new AutoSizeFormClass();
-        //保存StepProduct查询出来的数据
-        //        DataTable ListA = new DataTable();
-        //保存make left join makecraftdetail left join product的数据
-        // DataTable ListB;
-        DataTable mapB;
-
-        string ma_unlimitin = "";
-
-        ApplicationClass lbl;
-
-        string oMakeCode = "";
-        string oMsId = "";
-
-        string oErrorMessage = "";
-
-        Thread InitPrint;
-
-        bool pr_change = false;
-
-        ftpOperater ftp;
-
-        DataTable Dbfind;
-
-        public Make_FuselageLabelPrintGetIMEIWatch()
-        {
-            InitializeComponent();
-        }
-
-        private void Make_FuselageLabelPrint_Load(object sender, EventArgs e)
-        {
-            asc.controllInitializeSize(this);
-            OperateResult.AppendText(">>请输入SN\n", Color.Black);
-            InitPrint = new Thread(InPrint);
-            SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
-            BaseUtil.SetFormCenter(stw);
-            stw.ShowDialog();
-            sncode.Focus();
-            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 # 工单号,ma_prodcode # 产品编号,pr_detail # 产品名称";
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_detail" };
-            ma_code.DbChange += Ma_code_DbChange;
-            ma_code.Condition = "(ma_statuscode='STARTED' or ma_statuscode='FINISH')";
-            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);
-            //}
-        }
-        Engine engine;
-
-        private void InPrint()
-        {
-            try
-            {
-                engine = new Engine(true);
-            }
-            catch (Exception ex)
-            {
-                OperateResult.AppendText("未正确安装BarTender软件\n", Color.Red);
-            }
-        }
-
-        private void sn_code_KeyDown(object sender, KeyEventArgs e)
-        {
-            //按下enter键
-            if (e.KeyCode == Keys.Enter)
-            {
-                //如果输入的值为空的话，提示不能为空
-                if (sncode.Text == "")
-                {
-                    OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                    return;
-                }
-                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
-                {
-                    //定义临时变量
-                    string oStatus = "";
-                    //调用公共方法CheckStepSNAndMacode判断工序是否正确
-                    string status = "";
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where 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 oErrorMessage);
-                    if (oMakeCode == "" || oMakeCode == null)
-                        oMakeCode = ma_code.Text;
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
-                    {
-                        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 (如果ma_code 为空)THEN
-                        if (ma_code.Text == "" || ma_code.Text != oMakeCode)
-                        {
-                            //获取工单的其他信息
-                            sql.Clear();
-                            sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode,pr_detail,nvl(ma_unlimitin,0)ma_unlimitin,");
-                            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='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                            mapB = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            //如果有数据的话
-                            if (mapB.Rows.Count > 0)
-                            {
-                                ma_unlimitin = mapB.Rows[0]["ma_unlimitin"].ToString();
-                                //将工单的其他信息赋值到对应的控件
-                                BaseUtil.SetFormValue(this.Controls, mapB);
-                                //提示用户“<<工单号：取ma_makecode”
-                                OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
-                                //提示用户“<< 序列号：XXXX”
-                                if (PrintLabel.SelectedValue == null)
-                                {
-                                    OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
-                                    return;
-                                }
-                                if (pr_change)
-                                {
-                                    pr_change = false;
-                                    if (MessageBox.Show("是否使用默认标签", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
-                                    {
-                                        OperateResult.AppendText(">>请选择标签模板\n", Color.Green, sncode);
-                                        return;
-                                    }
-                                }
-                            }
-                            //没有数据
-                            else
-                            {
-                                OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
-                                return;
-                            }
-                        }
-                        //所选标签不为空
-                        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;
-                            }
-                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
-                            //按照打印张数打印
-                            string oIMEI1 = "";
-                            string oIMEI2 = "";
-                            string oMEID = "";
-                            string oNetcode = "";
-                            string oPSN = "";
-                            string oID1 = "";
-                            string oID2 = "";
-                            string oID3 = "";
-                            if (!LogicHandler.GetMEIOrNetCodeRange(sncode.Text, ma_code.Text, "", "", out oIMEI1, out oIMEI2, out oMEID, out oNetcode, out oPSN, out oID1, out oID2, out oID3, out oErrorMessage))
-                            {
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
-                                return;
-                            };
-                            //if (!LogicHandler.SetIMEIInfo(sncode.Text, oIMEI1 == "null" ? "" : oIMEI1, oIMEI2 == "null" ? "" : oIMEI2, "", oMEID == "null" ? "" : oMEID, oNetcode == "null" ? "" : oNetcode, oID1 == "null" ? "" : oID1, oID2 == "null" ? "" : oID2, oID3 == "null" ? "" : oID3, out oErrorMessage))
-                            //{
-                            //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
-                            //    return;
-                            //}
-                            dh.ExecuteSql("update makeserial set ms_sncode='" + oPSN + "',ms_firstsn='" + oPSN + "',ms_tsn='" + sncode.Text + "' where ms_id='" + oMsId + "' ", "update");
-                            string oBT = "";
-                            string oWifi = "";
-                            string oCode1 = "";
-                            string oCode2 = "";
-                            string oCode3 = "";
-                            LogicHandler.GetAddressRangeByMO(oPSN, out oWifi, out oBT, out oCode1, out oCode2, out oCode3, out oErrorMessage);
-                            //清空输入框的值，聚焦
-                            //doc = lbl.Documents.Open(PrintLabel.Text);
-                            if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, oPSN, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
-                            {
-                                //提示用户打印成功
-                                OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
-                            }
-                            //if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
-                            //{
-                            //    //提示用户打印成功
-                            //    OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
-                            //}
-                            //else
-                            //{
-                            //    OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
-                            //}
-                            //记录日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
-                            //更新打印的数据
-                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, oPSN, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
-                            {
-                                //提示正确返回时传递的信息
-                                if (oErrorMessage.Contains("AFTERSUCCESS"))
-                                    OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                                if (CollectRemark.Checked && Remark.Text != "")
-                                {
-                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
-                                }
-
-                                sncode.Text = "";
-                                sncode.Focus();
-                                //刷新打印数量和剩余数量
-                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin 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);
-                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-                                //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                                if (int.Parse(mcd_remainqty.Text) == 0 && ma_unlimitin == "0")
-                                {
-                                    OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
-                                }
-                                //剩余数量不为0
-                                else
-                                {
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                }
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                                //清空输入框的值，聚焦
-                                sncode.Text = "";
-                                sncode.Focus();
-                            }
-                        }
-                        //标签为空
-                        else
-                        {
-                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
-                        }
-                    }
-                    else
-                    {
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                    }
-                }
-                else
-                {
-                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                }
-            }
-        }
-        private void pr_code_TextChanged(object sender, EventArgs e)
-        {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault,replace(LA_SOFTTYPE,';',',')LA_SOFTTYPE from label where la_prodcode='" + ma_prodcode.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_id='" + la_id + "' ) where COLUMN_VALUE is not null)", "select");
-                PrintLabel.DataSource = _dt;
-                PrintLabel.DisplayMember = "la_url";
-                PrintLabel.ValueMember = "la_id";
-                pr_change = true;
-            }
-        }
-
-        private void Make_FuselageLabelPrint_Activated(object sender, EventArgs e)
-        {
-            sncode.Focus();
-        }
-
-        private void Make_FuselageLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            BaseUtil.ClosePrint(lbl);
-        }
-
-        private void Make_FuselageLabelPrint_SizeChanged(object sender, EventArgs e)
-        {
-            asc.controlAutoSize(this);
-        }
-
-        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);
-            }
-        }
-
-        private void StepCount_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

UAS_MES_XMW/FunctionCode/Make/Make_FuselageLabelPrintGetIMEIWatch.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_XMW/FunctionCode/Special/Special_CancelCollectionWN.Designer.cs

@@ -1,238 +0,0 @@
-namespace UAS_MES_NEW.Special
-{
-    partial class Special_CancelCollectionWN
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_CancelCollection));
-            this.sn_code_label = new System.Windows.Forms.Label();
-            this.pr_detail = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.SuspendLayout();
-            // 
-            // sn_code_label
-            // 
-            this.sn_code_label.AutoSize = true;
-            this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(68, 401);
-            this.sn_code_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
-            this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(114, 41);
-            this.sn_code_label.TabIndex = 104;
-            this.sn_code_label.Text = "序列号";
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.AutoSize = true;
-            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(219, 343);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 41);
-            this.pr_detail.TabIndex = 237;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(41, 343);
-            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(146, 41);
-            this.label6.TabIndex = 236;
-            this.label6.Text = "产品名称";
-            // 
-            // 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(41, 220);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(146, 41);
-            this.label2.TabIndex = 233;
-            this.label2.Text = "工单编号";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(41, 278);
-            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(146, 41);
-            this.label5.TabIndex = 232;
-            this.label5.Text = "产品代码";
-            // 
-            // pr_code
-            // 
-            this.pr_code.AllPower = null;
-            this.pr_code.BackColor = System.Drawing.Color.White;
-            this.pr_code.Enabled = false;
-            this.pr_code.ID = null;
-            this.pr_code.Location = new System.Drawing.Point(226, 287);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Power = null;
-            this.pr_code.Size = new System.Drawing.Size(388, 35);
-            this.pr_code.Str = null;
-            this.pr_code.Str1 = null;
-            this.pr_code.Str2 = null;
-            this.pr_code.TabIndex = 235;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = "IFALL";
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = "";
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(226, 220);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = "";
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(409, 46);
-            this.ma_code.TabIndex = 234;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "makecode";
-            this.ma_code.TextBoxEnable = true;
-            // 
-            // Clean
-            // 
-            this.Clean.AllPower = null;
-            this.Clean.BackColor = System.Drawing.Color.Transparent;
-            this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
-            this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
-            this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1002, 659);
-            this.Clean.Margin = new System.Windows.Forms.Padding(8);
-            this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
-            this.Clean.Name = "Clean";
-            this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
-            this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(120, 50);
-            this.Clean.TabIndex = 143;
-            this.Clean.Text = "清除";
-            this.Clean.UseVisualStyleBackColor = true;
-            this.Clean.Click += new System.EventHandler(this.Clean_Click);
-            // 
-            // OperateResult
-            // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(832, 26);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(8);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(460, 614);
-            this.OperateResult.TabIndex = 142;
-            this.OperateResult.Text = "";
-            // 
-            // Confirm
-            // 
-            this.Confirm.AllPower = null;
-            this.Confirm.BackColor = System.Drawing.Color.Transparent;
-            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
-            this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
-            this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(319, 518);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(8);
-            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
-            this.Confirm.Name = "Confirm";
-            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
-            this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(120, 50);
-            this.Confirm.TabIndex = 141;
-            this.Confirm.Text = "确认";
-            this.Confirm.UseVisualStyleBackColor = true;
-            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
-            // 
-            // sn_code
-            // 
-            this.sn_code.AllPower = null;
-            this.sn_code.BackColor = System.Drawing.Color.White;
-            this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(226, 404);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(8);
-            this.sn_code.Name = "sn_code";
-            this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(388, 35);
-            this.sn_code.Str = null;
-            this.sn_code.Str1 = null;
-            this.sn_code.Str2 = null;
-            this.sn_code.TabIndex = 140;
-            // 
-            // Special_CancelCollection
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1566, 802);
-            this.Controls.Add(this.pr_detail);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.pr_code);
-            this.Controls.Add(this.ma_code);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.Clean);
-            this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.Confirm);
-            this.Controls.Add(this.sn_code);
-            this.Controls.Add(this.sn_code_label);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "Special_CancelCollection";
-            this.Tag = "Special!CancelCollection";
-            this.Text = "取消采集";
-            this.Load += new System.EventHandler(this.Special_CancelCollection_Load);
-            this.ResumeLayout(true);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Label sn_code_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
-        private CustomControl.ButtonUtil.NormalButton Confirm;
-        private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.ButtonUtil.NormalButton Clean;
-        private System.Windows.Forms.Label pr_detail;
-        private System.Windows.Forms.Label label6;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pr_code;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label5;
-    }
-}

UAS_MES_XMW/FunctionCode/Special/Special_CancelCollectionWN.cs

@@ -1,186 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Windows.Forms;
-using UAS_MES_NEW.DataOperate;
-using UAS_MES_NEW.Entity;
-using UAS_MES_NEW.PublicMethod;
-
-namespace UAS_MES_NEW.Special
-{
-    public partial class Special_CancelCollectionWN : Form
-    {
-
-        DataHelper dh = SystemInf.dh;
-
-        LogStringBuilder sql = new LogStringBuilder();
-
-        public Special_CancelCollectionWN()
-        {
-            InitializeComponent();
-        }
-
-        private void Confirm_Click(object sender, EventArgs e)
-        {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sn_code.Text + "' order by ms_id desc", "select");
-            if (dt.Rows.Count > 0)
-            {
-                sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
-            }
-            else
-            {
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' order by ms_id desc", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + sn_code.Text + "' order by mil_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        sn_code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + sn_code.Text + "' order by mil_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            sn_code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                        }
-                    }
-                }
-            }
-            //获取序列号的途程
-            dt = (DataTable)dh.ExecuteSql("select ms_code,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where (ms_sncode='" + sn_code.Text + "'  or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
-            if (dt.Rows.Count > 0)
-            {
-                string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
-                string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
-                string cr_code = dt.Rows[0]["ms_craftcode"].ToString();
-                string ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
-                string ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
-                string ms_status = dt.Rows[0]["ms_status"].ToString();
-                string ms_currentstepcode = dt.Rows[0]["ms_currentstepcode"].ToString();
-                string ms_id = dt.Rows[0]["ms_id"].ToString();
-                string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
-                string ms_code = dt.Rows[0]["ms_code"].ToString();
-                sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                sql.Clear();
-                sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
-                sql.Append("cr_prodcode='" + pr_code + "' and cr_code='" + cr_code + "' order by cd_detno ");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                //if (ms_stepcode == dt.Rows[0]["cd_stepcode"].ToString() || (ms_stepcode == "" && ms_nextstepcode == User.CurrentStepCode))
-                //{ 
-                List<string> sqls = new List<string>();
-                if (ms_outboxcode != "")
-                {
-                    OperateResult.AppendText(">>序列号" + sn_code.Text + "已装箱" + ms_outboxcode + ",不允许取消采集\n", Color.Red, sn_code);
-                    return;
-                }
-                //存在不良删除不良记录
-                if (ms_status == "3")
-                {
-                    sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
-                    //更新MakeCraftDetail表记录
-                    sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode + "'),mcd_stepcode)>0 ");
-                }
-                else
-                {
-                    sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode + "'),mcd_stepcode)>0 ");
-                }
-                if (ms_checkno != "")
-                {
-                    //删除送检明细
-                    sqls.Add("delete from oqcbatchdetail where obd_sncode='" + sn_code.Text + "' and obd_makecode='" + ms_makecode + "'");
-                    //送检数量-1
-                    sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_checkno + "'");
-                }
-                //清除上料数据
-                dt = (DataTable)dh.ExecuteSql("select cm_barcode,cm_materialtype,cm_makecode,cm_stepcode from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    List<string> barcode = new List<string>();
-                    for (int i = 0; i < dt.Rows.Count; i++)
-                    {
-                        barcode.Add(dt.Rows[i]["cm_barcode"].ToString());
-                        //存在批管控的物料
-                        if (dt.Rows[i]["cm_materialtype"].ToString() == "2")
-                        {
-                            string mss_id = dh.getFieldDataByCondition("makesourcestock", "mss_id", "mss_makecode='" + dt.Rows[i]["cm_makecode"].ToString() + "' and mss_barcode='" + dt.Rows[i]["cm_barcode"].ToString() + "' and mss_stepcode='" + dt.Rows[i]["cm_stepcode"].ToString() + "' and mss_validtime is not null and mss_invalidtime is null").ToString();
-                            dh.UpdateByCondition("makesourcestock", "mss_remain=mss_remain+mss_baseqty,mss_useqty=mss_useqty-mss_baseqty", "mss_id='" + mss_id + "'");
-                        }
-                    }
-                    sql.Clear();
-                    sql.Append("update makeserial set ms_nextmacode='' where ms_sncode=:barcode and ms_nextmacode='" + ms_makecode + "'");
-                    dh.BatchInsert(sql.GetString(), new string[] { "barcode" }, barcode.ToArray());
-                    sqls.Add("update craftmaterial set cm_status=-1 where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
-                }
-                sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "'");
-                //sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
-                //删除打印日志
-                sqls.Add("delete from labelprintlog where lpl_value='" + sn_code.Text + "' and lpl_makecode='" + ms_makecode + "'");
-                //删除老化记录
-                sqls.Add("delete from AGINGRECORD where ar_sncode='" + sn_code.Text + "' and ar_macode='" + ms_makecode + "'");
-                //删除IMIE分配记录
-                sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='' where mil_sncode='" + sn_code.Text + "' and mil_makecode='" + ms_makecode + "'");
-                //更新MAC使用记录
-                sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
-                //解除前一工单板的使用
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_firstsn='" + ms_firstsn + "' or ms_code='" + ms_code + "' and ms_nextmacode='" + ms_makecode + "'");
-                //初始化导入数据状态
-                sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
-                ////初始化号段状态
-                sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "'  and msd_type='before'");
-                sqls.Add("delete from  makesnrelation where SN='" + sn_code.Text + "' and makecode='" + ms_makecode + "' ");
-                //清除操作日志
-                //sqls.Add("delete from commandlog where cl_makecode='" + ms_makecode + "' and cl_sncode='" + sn_code.Text + "'");
-                //删除过站记录
-                //sqls.Add("delete from makeprocess where mp_sncode='" + sn_code.Text + "' and mp_makecode='" + ms_makecode + "'");
-                //投入数-1
-                sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
-                //删除StepPass
-                sqls.Add("delete from steppassed where sp_sncode='" + ms_firstsn + "' or sp_sncode='" + ms_code + "' and sp_makecode='" + ms_makecode + "'");
-                sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
-                dh.ExecuteSQLTran(sqls.ToArray());
-                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");
-                OperateResult.AppendText(">>序列号" + sn_code.Text + "成功解除绑定\n", Color.Green, sn_code);
-                //}
-                //else OperateResult.AppendText(">>序列号" + sn_code.Text + "不处于第一道工序，不允许取消采集\n", Color.Red, sn_code);
-            }
-            else OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在于工单" + ma_code.Text + "\n", Color.Red, sn_code);
-        }
-
-        private void Clean_Click(object sender, EventArgs e)
-        {
-            OperateResult.Clear();
-        }
-
-        private void Special_CancelCollection_Load(object sender, EventArgs e)
-        {
-            ma_code.TableName = " make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单编号,pr_code # 产品编号,pr_spec # 型号";
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code" };
-            ma_code.Condition = "ma_statuscode='STARTED'";
-            ma_code.DbChange += pr_code_DbChange;
-        }
-
-        DataTable Dbfind;
-        private void pr_code_DbChange(object sender, EventArgs e)
-        {
-            Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code.Text + "'", "select");
-            if (dt.Rows.Count > 0)
-            {
-                pr_code.Text = dt.Rows[0]["ma_prodcode"].ToString();
-                pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
-            }
-        }
-
-    }
-}

UAS_MES_XMW/FunctionCode/Special/Special_CancelCollectionWN.resx

@@ -1,383 +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>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Clean.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Clean.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Clean.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Confirm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-</root>

UAS_MES_XMW/FunctionCode/Special/Special_DeleteWN.Designer.cs

@@ -1,413 +0,0 @@
-namespace UAS_MES_NEW.Special
-{
-    partial class Special_DeleteWN
-    {
-        /// <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()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_Delete));
-            this.Pallet_label = new System.Windows.Forms.Label();
-            this.bigboxBtn = new System.Windows.Forms.RadioButton();
-            this.serBtn = new System.Windows.Forms.RadioButton();
-            this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.ms_prodcode_label = new System.Windows.Forms.Label();
-            this.WeighRecord = new System.Windows.Forms.ListView();
-            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.cd_stepno = new System.Windows.Forms.Label();
-            this.数据清空 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.ms_prodcode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
-            this.ms_makecode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
-            this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.input = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Split = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.DeleteALLSN = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.label2 = new System.Windows.Forms.Label();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.RemainSN = new System.Windows.Forms.Label();
-            this.TotalSN = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.PassWord = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.groupBox1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // Pallet_label
-            // 
-            this.Pallet_label.AutoSize = true;
-            this.Pallet_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Pallet_label.Location = new System.Drawing.Point(13, 83);
-            this.Pallet_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.Pallet_label.Name = "Pallet_label";
-            this.Pallet_label.Size = new System.Drawing.Size(114, 41);
-            this.Pallet_label.TabIndex = 1;
-            this.Pallet_label.Text = "录入框";
-            // 
-            // bigboxBtn
-            // 
-            this.bigboxBtn.AutoSize = true;
-            this.bigboxBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bigboxBtn.Location = new System.Drawing.Point(21, 4);
-            this.bigboxBtn.Margin = new System.Windows.Forms.Padding(4);
-            this.bigboxBtn.Name = "bigboxBtn";
-            this.bigboxBtn.Size = new System.Drawing.Size(113, 45);
-            this.bigboxBtn.TabIndex = 234;
-            this.bigboxBtn.Text = "箱号";
-            this.bigboxBtn.UseVisualStyleBackColor = true;
-            this.bigboxBtn.Click += new System.EventHandler(this.bigboxBtn_Click);
-            // 
-            // serBtn
-            // 
-            this.serBtn.AutoSize = true;
-            this.serBtn.Checked = true;
-            this.serBtn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.serBtn.Location = new System.Drawing.Point(160, 4);
-            this.serBtn.Margin = new System.Windows.Forms.Padding(4);
-            this.serBtn.Name = "serBtn";
-            this.serBtn.Size = new System.Drawing.Size(209, 45);
-            this.serBtn.TabIndex = 233;
-            this.serBtn.TabStop = true;
-            this.serBtn.Text = "单台序列号";
-            this.serBtn.UseVisualStyleBackColor = true;
-            this.serBtn.Click += new System.EventHandler(this.bigboxBtn_Click);
-            // 
-            // ms_makecode_label
-            // 
-            this.ms_makecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            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(13, 163);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
-            this.ms_makecode_label.TabIndex = 240;
-            this.ms_makecode_label.Text = "工单号";
-            // 
-            // ms_prodcode_label
-            // 
-            this.ms_prodcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.ms_prodcode_label.AutoSize = true;
-            this.ms_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode_label.Location = new System.Drawing.Point(652, 163);
-            this.ms_prodcode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.ms_prodcode_label.Name = "ms_prodcode_label";
-            this.ms_prodcode_label.Size = new System.Drawing.Size(146, 41);
-            this.ms_prodcode_label.TabIndex = 241;
-            this.ms_prodcode_label.Text = "产品编号";
-            // 
-            // WeighRecord
-            // 
-            this.WeighRecord.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader3});
-            this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.HideSelection = false;
-            this.WeighRecord.Location = new System.Drawing.Point(21, 216);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(839, 639);
-            this.WeighRecord.TabIndex = 243;
-            this.WeighRecord.UseCompatibleStateImageBehavior = false;
-            this.WeighRecord.View = System.Windows.Forms.View.Details;
-            // 
-            // columnHeader3
-            // 
-            this.columnHeader3.Text = "录入项";
-            this.columnHeader3.Width = 300;
-            // 
-            // cd_stepno
-            // 
-            this.cd_stepno.AutoSize = true;
-            this.cd_stepno.Location = new System.Drawing.Point(1408, 83);
-            this.cd_stepno.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.cd_stepno.Name = "cd_stepno";
-            this.cd_stepno.Size = new System.Drawing.Size(0, 24);
-            this.cd_stepno.TabIndex = 244;
-            // 
-            // 数据清空
-            // 
-            this.数据清空.AllPower = null;
-            this.数据清空.BackColor = System.Drawing.Color.Transparent;
-            this.数据清空.DownImage = ((System.Drawing.Image)(resources.GetObject("数据清空.DownImage")));
-            this.数据清空.Image = null;
-            this.数据清空.IsShowBorder = true;
-            this.数据清空.Location = new System.Drawing.Point(947, 800);
-            this.数据清空.Margin = new System.Windows.Forms.Padding(5);
-            this.数据清空.MoveImage = ((System.Drawing.Image)(resources.GetObject("数据清空.MoveImage")));
-            this.数据清空.Name = "数据清空";
-            this.数据清空.NormalImage = ((System.Drawing.Image)(resources.GetObject("数据清空.NormalImage")));
-            this.数据清空.Power = null;
-            this.数据清空.Size = new System.Drawing.Size(112, 56);
-            this.数据清空.TabIndex = 245;
-            this.数据清空.Text = "数据清空";
-            this.数据清空.UseVisualStyleBackColor = false;
-            this.数据清空.Click += new System.EventHandler(this.数据清空_Click);
-            // 
-            // ms_prodcode
-            // 
-            this.ms_prodcode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.ms_prodcode.AutoSize = true;
-            this.ms_prodcode.CutLength = null;
-            this.ms_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_prodcode.Location = new System.Drawing.Point(844, 163);
-            this.ms_prodcode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.ms_prodcode.MaximumSize = new System.Drawing.Size(300, 0);
-            this.ms_prodcode.Name = "ms_prodcode";
-            this.ms_prodcode.Size = new System.Drawing.Size(0, 41);
-            this.ms_prodcode.TabIndex = 239;
-            // 
-            // ms_makecode
-            // 
-            this.ms_makecode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.ms_makecode.AutoSize = true;
-            this.ms_makecode.CutLength = null;
-            this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(173, 163);
-            this.ms_makecode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(500, 0);
-            this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 41);
-            this.ms_makecode.TabIndex = 242;
-            // 
-            // OperatResult
-            // 
-            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(21, 867);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
-            this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(1551, 241);
-            this.OperatResult.TabIndex = 3;
-            this.OperatResult.Text = "";
-            // 
-            // input
-            // 
-            this.input.AllPower = null;
-            this.input.BackColor = System.Drawing.Color.White;
-            this.input.ID = null;
-            this.input.Location = new System.Drawing.Point(160, 85);
-            this.input.Margin = new System.Windows.Forms.Padding(4);
-            this.input.Name = "input";
-            this.input.Power = null;
-            this.input.Size = new System.Drawing.Size(292, 35);
-            this.input.Str = null;
-            this.input.Str1 = null;
-            this.input.Str2 = null;
-            this.input.TabIndex = 2;
-            this.input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.input_KeyDown);
-            // 
-            // Split
-            // 
-            this.Split.AllPower = null;
-            this.Split.BackColor = System.Drawing.Color.Transparent;
-            this.Split.DownImage = ((System.Drawing.Image)(resources.GetObject("Split.DownImage")));
-            this.Split.Image = null;
-            this.Split.IsShowBorder = true;
-            this.Split.Location = new System.Drawing.Point(494, 32);
-            this.Split.Margin = new System.Windows.Forms.Padding(4);
-            this.Split.MoveImage = ((System.Drawing.Image)(resources.GetObject("Split.MoveImage")));
-            this.Split.Name = "Split";
-            this.Split.NormalImage = ((System.Drawing.Image)(resources.GetObject("Split.NormalImage")));
-            this.Split.Power = null;
-            this.Split.Size = new System.Drawing.Size(223, 92);
-            this.Split.TabIndex = 0;
-            this.Split.Text = "解绑录入工单";
-            this.Split.UseVisualStyleBackColor = false;
-            this.Split.Click += new System.EventHandler(this.Split_Click);
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.PassWord);
-            this.groupBox1.Controls.Add(this.DeleteALLSN);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.TotalSN);
-            this.groupBox1.Controls.Add(this.ma_code);
-            this.groupBox1.Controls.Add(this.RemainSN);
-            this.groupBox1.Location = new System.Drawing.Point(917, 384);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(640, 289);
-            this.groupBox1.TabIndex = 253;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "工单解绑";
-            // 
-            // DeleteALLSN
-            // 
-            this.DeleteALLSN.AllPower = null;
-            this.DeleteALLSN.BackColor = System.Drawing.Color.Transparent;
-            this.DeleteALLSN.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteALLSN.DownImage")));
-            this.DeleteALLSN.Image = null;
-            this.DeleteALLSN.IsShowBorder = true;
-            this.DeleteALLSN.Location = new System.Drawing.Point(413, 213);
-            this.DeleteALLSN.Margin = new System.Windows.Forms.Padding(4);
-            this.DeleteALLSN.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteALLSN.MoveImage")));
-            this.DeleteALLSN.Name = "DeleteALLSN";
-            this.DeleteALLSN.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteALLSN.NormalImage")));
-            this.DeleteALLSN.Power = null;
-            this.DeleteALLSN.Size = new System.Drawing.Size(179, 44);
-            this.DeleteALLSN.TabIndex = 246;
-            this.DeleteALLSN.Text = "解绑工单全部SN";
-            this.DeleteALLSN.UseVisualStyleBackColor = false;
-            this.DeleteALLSN.Click += new System.EventHandler(this.DeleteALLSN_Click);
-            // 
-            // 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(22, 66);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(146, 41);
-            this.label2.TabIndex = 247;
-            this.label2.Text = "工单编号";
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = "IFALL";
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = "";
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(207, 66);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = "";
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(409, 46);
-            this.ma_code.TabIndex = 248;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "makecode";
-            this.ma_code.TextBoxEnable = true;
-            // 
-            // RemainSN
-            // 
-            this.RemainSN.AutoSize = true;
-            this.RemainSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.RemainSN.Location = new System.Drawing.Point(222, 226);
-            this.RemainSN.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.RemainSN.Name = "RemainSN";
-            this.RemainSN.Size = new System.Drawing.Size(0, 41);
-            this.RemainSN.TabIndex = 249;
-            // 
-            // TotalSN
-            // 
-            this.TotalSN.AutoSize = true;
-            this.TotalSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TotalSN.Location = new System.Drawing.Point(406, 226);
-            this.TotalSN.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.TotalSN.Name = "TotalSN";
-            this.TotalSN.Size = new System.Drawing.Size(0, 41);
-            this.TotalSN.TabIndex = 250;
-            // 
-            // 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(60, 141);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 41);
-            this.label1.TabIndex = 251;
-            this.label1.Text = "密码";
-            // 
-            // PassWord
-            // 
-            this.PassWord.AllPower = null;
-            this.PassWord.BackColor = System.Drawing.Color.White;
-            this.PassWord.ID = null;
-            this.PassWord.Location = new System.Drawing.Point(207, 143);
-            this.PassWord.Margin = new System.Windows.Forms.Padding(4);
-            this.PassWord.Name = "PassWord";
-            this.PassWord.Power = null;
-            this.PassWord.Size = new System.Drawing.Size(385, 35);
-            this.PassWord.Str = null;
-            this.PassWord.Str1 = null;
-            this.PassWord.Str2 = null;
-            this.PassWord.TabIndex = 252;
-            // 
-            // Special_Delete
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1611, 1131);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.数据清空);
-            this.Controls.Add(this.cd_stepno);
-            this.Controls.Add(this.WeighRecord);
-            this.Controls.Add(this.ms_makecode_label);
-            this.Controls.Add(this.ms_prodcode_label);
-            this.Controls.Add(this.ms_prodcode);
-            this.Controls.Add(this.ms_makecode);
-            this.Controls.Add(this.bigboxBtn);
-            this.Controls.Add(this.serBtn);
-            this.Controls.Add(this.OperatResult);
-            this.Controls.Add(this.input);
-            this.Controls.Add(this.Pallet_label);
-            this.Controls.Add(this.Split);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "Special_Delete";
-            this.Tag = "Special!Reset";
-            this.Text = "重置站点";
-            this.Load += new System.EventHandler(this.Special_BoxSplit_Load);
-            this.SizeChanged += new System.EventHandler(this.Special_Reset_SizeChanged);
-            this.groupBox1.ResumeLayout(true);
-            this.groupBox1.PerformLayout();
-            this.ResumeLayout(true);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private CustomControl.ButtonUtil.NormalButton Split;
-        private System.Windows.Forms.Label Pallet_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox input;
-        private CustomControl.RichText.RichTextAutoBottom OperatResult;
-        private System.Windows.Forms.RadioButton bigboxBtn;
-        private System.Windows.Forms.RadioButton serBtn;
-        private System.Windows.Forms.Label ms_makecode_label;
-        private System.Windows.Forms.Label ms_prodcode_label;
-        private CustomControl.ValueLabel.ValueLabel ms_prodcode;
-        private CustomControl.ValueLabel.ValueLabel ms_makecode;
-        private System.Windows.Forms.ListView WeighRecord;
-        private System.Windows.Forms.ColumnHeader columnHeader3;
-        private System.Windows.Forms.Label cd_stepno;
-        private CustomControl.ButtonUtil.NormalButton 数据清空;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private CustomControl.ButtonUtil.NormalButton DeleteALLSN;
-        private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
-        private System.Windows.Forms.Label RemainSN;
-        private System.Windows.Forms.Label TotalSN;
-        private System.Windows.Forms.Label label1;
-        private CustomControl.TextBoxWithIcon.EnterTextBox PassWord;
-    }
-}

UAS_MES_XMW/FunctionCode/Special/Special_DeleteWN.cs

@@ -1,295 +0,0 @@
-using HslCommunication.Profinet.Knx;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using UAS_MES_NEW.DataOperate;
-using UAS_MES_NEW.Entity;
-using UAS_MES_NEW.PublicMethod;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-
-namespace UAS_MES_NEW.Special
-{
-    public partial class Special_DeleteWN : Form
-    {
-        DataHelper dh;
-
-        LogStringBuilder sql = new LogStringBuilder();
-        AutoSizeFormClass asc = new AutoSizeFormClass();
-        DataTable Dbfind;
-        DataTable dt;
-
-        List<String> sb = new List<string>();
-
-        public Special_DeleteWN()
-        {
-            InitializeComponent();
-        }
-
-        private void Special_BoxSplit_Load(object sender, EventArgs e)
-        {
-            ma_code.TableName = " make left join product on ma_prodcode=pr_code";
-            ma_code.SelectField = "ma_code # 工单编号,pr_code # 产品编号,pr_spec # 型号";
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "ma_code" };
-            ma_code.Condition = "ma_statuscode='STARTED'";
-            ma_code.DbChange += pr_code_DbChange;
-            dh = SystemInf.dh;
-            asc.controllInitializeSize(this);
-        }
-
-        private void pr_code_DbChange(object sender, EventArgs e)
-        {
-            Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code.Text + "'", "select");
-        }
-
-        private void Cd_stepcode_DbChange(object sender, EventArgs e)
-        {
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-        }
-
-        private bool ReSN(string sncode)
-        {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_sncode,ms_outboxcode,ms_code from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
-            if (dt.Rows.Count > 0)
-            {
-                string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
-                string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
-                string ms_code = dt.Rows[0]["ms_code"].ToString();
-                string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
-                if (ms_outboxcode != "") {
-                    OperatResult.AppendText("SN：" + sncode + "已装箱不允许解绑\n", Color.Red);
-                    return false;
-                }
-                dh.ExecuteSql("delete makeserial  where ms_sncode='" + sncode + "' and ms_makecode='" + ms_makecode + "'", "update");
-                dh.ExecuteSql("delete makebad where mb_sncode = '" + sncode + "' and mb_status = 0", "delete");
-                dh.ExecuteSql("delete labelprintlog where lpl_value = '" + sncode + "' and lpl_makecode='" + ms_makecode + "'", "delete");
-                sql.Clear();
-                sql.Append("delete craftmaterial where cm_sncode = '" + sncode + "' and cm_makecode='" + ms_makecode + "' ");
-                dh.ExecuteSql(sql.GetString(), "update");
-                List<string> sqls = new List<string>();
-                sqls.Add("delete from sninfo where si_sn='" + ms_sncode + "'");
-                //sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
-                //删除打印日志
-                sqls.Add("delete from labelprintlog where lpl_value='" + ms_sncode + "' and lpl_makecode='" + ms_makecode + "'");
-                //删除老化记录
-                sqls.Add("delete from AGINGRECORD where ar_sncode='" + ms_sncode + "' and ar_macode='" + ms_makecode + "'");
-                sqls.Add("delete from steppassed where sp_sncode='" + ms_sncode + "' or sp_sncode='"+ms_code+"' and sp_makecode='" + ms_makecode + "'");
-                //删除IMIE分配记录
-                sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='' where mil_sncode='" + ms_sncode + "' and mil_makecode='" + ms_makecode + "'");
-                //更新MAC使用记录
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + ms_sncode + "' or ms_code='" + ms_code + "' and ms_nextmacode='" + ms_makecode + "'");
-                sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + ms_sncode + "' and mal_makecode='" + ms_makecode + "'");
-                //初始化导入数据状态
-                sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + ms_sncode + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
-                ////初始化号段状态
-                sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + ms_sncode + "' and msd_makecode='" + ms_makecode + "'  and msd_type='before'");
-                sqls.Add("delete from  makesnrelation where SN='" + ms_sncode + "' and makecode='" + ms_makecode + "' ");
-                dh.ExecuteSQLTran(sqls.ToArray());
-                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "工单解绑", "工单解绑成功", sncode, "");
-            }
-            return true;
-        }
-
-        private void Split_Click(object sender, EventArgs e)
-        {
-            if (sb.Count == 0)
-            {
-                OperatResult.AppendText(">>采集数工位不能为空\n", Color.Red);
-                return;
-            }
-            string Delete = MessageBox.Show(this.ParentForm, "是否确认解绑工单？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-            if (Delete == "Yes")
-            {
-                if (serBtn.Checked)
-                {
-                    for (int i = 0; i < sb.Count; i++)
-                    {
-                        if (ReSN(sb[i].ToString()))
-                            OperatResult.AppendText("SN：" + sb[i].ToString() + "解绑完成\n", Color.Green);
-                    }
-                    WeighRecord.Clear();
-                    sb.Clear();
-                }
-                else if (bigboxBtn.Checked)
-                {
-                    for (int i = 0; i < sb.Count; i++)
-                    {
-                        DataTable dt2 = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_outboxcode = '" + sb[i].ToString() + "'", "select");
-                        for (int k = 0; k < dt2.Rows.Count; k++)
-                        {
-                            ReSN(dt2.Rows[k]["ms_sncode"].ToString());
-                        }
-                        dh.ExecuteSql("delete from labelprintlog where lpl_value='" + sb[i].ToString() + "'", "delete");
-                        dh.ExecuteSql("insert into PACKAGEBACKUP select * from package where pa_outboxcode='" + sb[i].ToString() + "'", "insert");
-                        dh.ExecuteSql("insert into PACKAGEBACKUPDETAIL select * from packagedetail where pd_outboxcode='" + sb[i].ToString() + "'", "insert");
-                        dh.ExecuteSql("delete from package where pa_outboxcode = '" + sb[i].ToString() + "'", "delete");
-                        //删除箱的明细
-                        dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + sb[i].ToString() + "'", "delete");
-                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "解绑工单", "解绑工单成功", sb[i].ToString(), "");
-                        OperatResult.AppendText("卡通箱：" + sb[i].ToString() + "解绑完成\n", Color.Green);
-                    }
-                    WeighRecord.Clear();
-                    sb.Clear();
-                }
-                sql.Clear();
-                sql.Append("MERGE INTO makecraftdetail USING (select mcd_macode,mcd_detno,mcd_stepcode,mcd_stepname,nvl(count(distinct A.ms_sncode),0) n,nvl(count(distinct B.ms_sncode),0) bn,(select nvl(count(distinct sp_sncode),0) from STEPPASSED where SP_MAKECODE = mcd_macode AND SP_STEPCODE = mcd_stepcode) inqty from MAKECRAFTdetail");
-                sql.Append(" left join makeserial A on mcd_macode = A.ms_makecode and mcd_stepcode = A.ms_nextstepcode AND A.MS_STATUS = 1 LEFT JOIN MAKESERIAL B ON mcd_macode = B.ms_makecode AND MCD_STEPCODE = B.MS_STEPCODE AND B.MS_STATUS = 3 where mcd_macode = '" + ms_makecode.Text + "'  group by mcd_macode,mcd_detno, mcd_stepcode, mcd_stepname order by mcd_detno asc) A");
-                sql.Append(" ON (makecraftdetail.MCD_MACODE = A.MCD_MACODE and makecraftdetail.mcd_stepcode = A.mcd_stepcode)  ");
-                sql.Append(" WHEN MATCHED THEN UPDATE SET makecraftdetail.mcd_inqty = A.inqty,makecraftdetail.mcd_outqty = A.inqty,makecraftdetail.mcd_okqty = A.inqty ");
-                dh.ExecuteSql(sql.GetString(), "update");
-            }
-        }
-
-        private void bigboxBtn_Click(object sender, EventArgs e)
-        {
-            if (((RadioButton)sender).Checked == true)
-            {
-                if (WeighRecord.Items.Count > 0)
-                {
-                    string logout_confirm = MessageBox.Show(this.ParentForm, "是否更换采集项(已录入信息会清空)？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                    if (logout_confirm == "Yes")
-                    {
-                        WeighRecord.Items.Clear();
-                        sb.Clear();
-                        ms_makecode.Text = "";
-                        ms_prodcode.Text = "";
-                    }
-                    else
-                    {
-                        serBtn.Checked = bigboxBtn.Checked;
-                        bigboxBtn.Checked = !serBtn.Checked;
-                    }
-                }
-                if (((RadioButton)sender).Name == "serBtn")
-                {
-                    input.Focus();
-                    OperatResult.AppendText("请输入序列号进行采集\n", Color.Black, input);
-                }
-                else if (((RadioButton)sender).Name == "bigboxBtn")
-                {
-                    input.Focus();
-                    OperatResult.AppendText("请输入箱号进行采集\n", Color.Black, input);
-                }
-            }
-        }
-
-        private void input_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                if (serBtn.Checked)
-                {
-                    dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_prodcode,ms_sncode,ms_craftcode cr_code,ms_status,ms_outboxcode from makeserial where ms_sncode = '" + input.Text + "' or ms_imei1='" + input.Text + "' or ms_imei2='" + input.Text + "' order by ms_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        input.Text = dt.Rows[0]["ms_sncode"].ToString();
-                        if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
-                            return;
-                        }
-                        if (dt.Rows[0]["ms_status"].ToString() == "3")
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "为不良品，不允许采集\n", Color.Red, input);
-                            return;
-                        }
-                        if (dt.Rows[0]["ms_outboxcode"].ToString() != "")
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "已装箱" + dt.Rows[0]["ms_outboxcode"].ToString() + "，不允许采集\n", Color.Red, input);
-                            return;
-                        }
-                        BaseUtil.SetFormValue(this.Controls, dt);
-                        if (sb.Contains(dt.Rows[0]["ms_sncode"].ToString()))
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "已采集\n", Color.Red, input);
-                            return;
-                        }
-                        WeighRecord.Items.Add(dt.Rows[0]["ms_sncode"].ToString());
-                        sb.Add(dt.Rows[0]["ms_sncode"].ToString());
-                        OperatResult.AppendText("SN：" + input.Text + "采集\n", Color.Green, input);
-                    }
-                    else
-                    {
-                        OperatResult.AppendText("SN：" + input.Text + "不存在\n", Color.Red, input);
-                        return;
-                    }
-                }
-                else if (bigboxBtn.Checked)
-                {
-                    dt = (DataTable)dh.ExecuteSql("select pa_makecode ms_makecode,pa_prodcode ms_prodcode,pa_outboxcode,pa_mothercode,ma_craftcode,nvl(pa_iostatus,0)pa_iostatus,ma_craftcode cr_code from package left join make on pa_makecode = ma_code where pa_outboxcode = '" + input.Text + "' and pa_type = '1'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        if (ms_makecode.Text != "" && dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text)
-                        {
-                            OperatResult.AppendText("SN：" + input.Text + "所属工单" + dt.Rows[0]["ms_makecode"].ToString() + "与当前工单" + ms_makecode.Text + "不一致\n", Color.Red, input);
-                            return;
-                        }
-                        if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
-                        {
-                            OperatResult.AppendText("卡通箱：" + input.Text + "处于状态入库状态，不允许采集\n", Color.Red, input);
-                            return;
-                        }
-                        if (dt.Rows[0]["pa_mothercode"].ToString() != "")
-                        {
-                            OperatResult.AppendText("卡通箱：" + input.Text + "已装栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "，不允许采集\n", Color.Red, input);
-                            return;
-                        }
-                        BaseUtil.SetFormValue(this.Controls, dt);
-                        if (sb.Contains(dt.Rows[0]["pa_outboxcode"].ToString()))
-                        {
-                            OperatResult.AppendText("卡通箱：" + input.Text + "已采集\n", Color.Red, input);
-                            return;
-                        }
-                        WeighRecord.Items.Add(dt.Rows[0]["pa_outboxcode"].ToString());
-                        sb.Add(dt.Rows[0]["pa_outboxcode"].ToString());
-                        OperatResult.AppendText("卡通箱：" + input.Text + "采集\n", Color.Green, input);
-                    }
-                    else
-                    {
-                        OperatResult.AppendText("卡通箱：" + input.Text + "不存在\n", Color.Red, input);
-                        return;
-                    }
-                }
-            }
-        }
-
-        private void 数据清空_Click(object sender, EventArgs e)
-        {
-            BaseUtil.CleanControls(this.Controls);
-            WeighRecord.Items.Clear();
-            sb.Clear();
-        }
-
-        private void Special_Reset_SizeChanged(object sender, EventArgs e)
-        {
-            asc.controlAutoSize(this);
-        }
-
-        private void DeleteALLSN_Click(object sender, EventArgs e)
-        {
-            if (PassWord.Text == dh.getFieldDataByCondition("configs", "data", "code='Password' and caller='MESSetting'").ToString())
-            {
-                DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_makecode from makeserial where ms_makecode ='" + ma_code.Text + "'", "select");
-                TotalSN.Text = "总计" + dt.Rows.Count;
-                for (int i = 0; i < dt.Rows.Count; i++)
-                {
-                    ReSN(dt.Rows[i]["ms_sncode"].ToString());
-                    RemainSN.Text = "已解绑" + (i + 1);
-                }
-                dh.ExecuteSql("update make set ma_inqty=0,ma_endqty=0 where ma_code='" + ma_code.Text + "'", "update");
-                dh.ExecuteSql("update makecraftdetail set MCD_INQTY=0, MCD_OUTQTY=0, MCD_OKQTY=0 where mcd_macode='"+ma_code.Text+"'","update");
-            }
-            else
-            {
-                MessageBox.Show("密码不正确");
-            }
-        }
-    }
-}

UAS_MES_XMW/FunctionCode/Special/Special_DeleteWN.resx

@@ -1,235 +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>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="数据清空.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="数据清空.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="数据清空.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Split.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Split.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Split.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="DeleteALLSN.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="DeleteALLSN.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="DeleteALLSN.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-</root>

UAS_MES_XMW/PublicMethod/LogicHandler.cs

@@ -694,6 +694,18 @@ namespace UAS_MES_NEW.PublicMethod
                 return false;
         }
 
+        public static bool LotStepPass(string iLotNo, string iMakeCode, string iSourceCode, string iUserCode, string iResult, string iBoxType, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            string[] param = new string[] { iLotNo, iMakeCode, iSourceCode, iUserCode, iResult, iBoxType, oErrorMessage };
+            dh.CallProcedure("LOTSTEPRESULT", ref param);
+            oErrorMessage = param[6];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
         /// <summary>
         /// 大箱栈板解除装箱
         /// </summary>

UAS_MES_XMW/UAS_MES_XMW.csproj

@@ -557,18 +557,6 @@
     <Compile Include="FunctionCode\Make\Make_CollectElec.Designer.cs">
       <DependentUpon>Make_CollectElec.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_ColorBoxLabelPrint_WNPACKAGE.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>
     <Compile Include="FunctionCode\Make\Make_ColorBoxLoadPrintPT.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -599,12 +587,6 @@
     <Compile Include="FunctionCode\Make\Make_FeedingCollectionCombine.Designer.cs">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_FuselageLabelPrintGetIMEIWatch.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_FuselageLabelPrintGetIMEIWatch.Designer.cs">
-      <DependentUpon>Make_FuselageLabelPrintGetIMEIWatch.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Make\Make_FuselageLabelPrintGetIMEI.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1152,12 +1134,6 @@
     <Compile Include="FunctionCode\SMT\SMT_WaringSetting.Designer.cs">
       <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_CancelCollectionWN.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Special\Special_CancelCollectionWN.Designer.cs">
-      <DependentUpon>Special_CancelCollectionWN.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Special\Special_QCCheck.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1176,12 +1152,6 @@
     <Compile Include="FunctionCode\Special\Special_ChangeMakeCode.Designer.cs">
       <DependentUpon>Special_ChangeMakeCode.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Special\Special_DeleteWN.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Special\Special_DeleteWN.Designer.cs">
-      <DependentUpon>Special_DeleteWN.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Special\Special_QCRecheck.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1594,12 +1564,6 @@
     <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>
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLoadPrintPT.resx">
       <DependentUpon>Make_ColorBoxLoadPrintPT.cs</DependentUpon>
     </EmbeddedResource>
@@ -1615,9 +1579,6 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollectionCombine.resx">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_FuselageLabelPrintGetIMEIWatch.resx">
-      <DependentUpon>Make_FuselageLabelPrintGetIMEIWatch.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_FuselageLabelPrintGetIMEI.resx">
       <DependentUpon>Make_FuselageLabelPrintGetIMEI.cs</DependentUpon>
     </EmbeddedResource>
@@ -1893,9 +1854,6 @@
     <EmbeddedResource Include="FunctionCode\SMT\SMT_WaringSetting.resx">
       <DependentUpon>SMT_WaringSetting.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_CancelCollectionWN.resx">
-      <DependentUpon>Special_CancelCollectionWN.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_QCCheck.resx">
       <DependentUpon>Special_QCCheck.cs</DependentUpon>
     </EmbeddedResource>
@@ -1905,9 +1863,6 @@
     <EmbeddedResource Include="FunctionCode\Special\Special_ChangeMakeCode.resx">
       <DependentUpon>Special_ChangeMakeCode.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Special\Special_DeleteWN.resx">
-      <DependentUpon>Special_DeleteWN.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Special\Special_QCRecheck.resx">
       <DependentUpon>Special_QCRecheck.cs</DependentUpon>
     </EmbeddedResource>