修改

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.Designer.cs

@@ -159,7 +159,7 @@
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_makecode_label.TabIndex = 163;
-            this.ms_makecode_label.Text = "归属工单";
+            this.ms_makecode_label.Text = "工单编号";
             // 
             // ma_code
             // 
@@ -203,9 +203,11 @@
             // 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(456, 32);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 175;
@@ -214,9 +216,11 @@
             // 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(793, 32);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 174;

UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -40,39 +40,37 @@
             this.beforeTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.afterTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.label1 = new System.Windows.Forms.Label();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.beforeTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.beforeTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ms_makecode_lock = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ma_code = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // 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(27, 30);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(22, 26);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(0, 36);
+            this.ms_makecode_label.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode_label.TabIndex = 61;
             // 
             // 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(1008, 26);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(825, 22);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(127, 36);
+            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
             this.pr_detail_label.TabIndex = 62;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -80,10 +78,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(593, 26);
-            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(460, 23);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(127, 36);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 63;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -91,10 +89,10 @@
             // 
             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(27, 772);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.sncode_label.Location = new System.Drawing.Point(22, 662);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(99, 36);
+            this.sncode_label.Size = new System.Drawing.Size(86, 31);
             this.sncode_label.TabIndex = 68;
             this.sncode_label.Text = "录入框";
             // 
@@ -102,10 +100,10 @@
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(543, 772);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(5);
+            this.ChangeResult.Location = new System.Drawing.Point(444, 662);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChangeResult.Name = "ChangeResult";
-            this.ChangeResult.Size = new System.Drawing.Size(209, 40);
+            this.ChangeResult.Size = new System.Drawing.Size(184, 35);
             this.ChangeResult.TabIndex = 70;
             this.ChangeResult.Text = "修改转换结果";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -114,10 +112,10 @@
             // 
             this.changenum_lanel.AutoSize = true;
             this.changenum_lanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.changenum_lanel.Location = new System.Drawing.Point(804, 772);
-            this.changenum_lanel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.changenum_lanel.Location = new System.Drawing.Point(658, 662);
+            this.changenum_lanel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.changenum_lanel.Name = "changenum_lanel";
-            this.changenum_lanel.Size = new System.Drawing.Size(127, 36);
+            this.changenum_lanel.Size = new System.Drawing.Size(110, 31);
             this.changenum_lanel.TabIndex = 71;
             this.changenum_lanel.Text = "转换数量";
             // 
@@ -125,10 +123,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(37, 110);
-            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(30, 94);
+            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(232, 35);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "转换前序列号长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -137,10 +135,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(37, 168);
-            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(30, 144);
+            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(232, 35);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "转换后序列号长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -149,10 +147,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(772, 107);
-            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(632, 92);
+            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(232, 35);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "转换前序列号前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -161,10 +159,10 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(772, 166);
-            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(632, 142);
+            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(232, 35);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "转换后序列号前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -173,60 +171,40 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(27, 27);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(22, 23);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(127, 36);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 93;
-            this.label1.Text = "归属工单";
-            // 
-            // 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(166, 26);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(5);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(298, 37);
-            this.ma_code.TabIndex = 92;
-            this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox.OnTextChange(this.ms_makecode_UserControlTextChanged);
+            this.label1.Text = "工单编号";
             // 
             // changenum
             // 
             this.changenum.Enabled = false;
             this.changenum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.changenum.Location = new System.Drawing.Point(1014, 772);
-            this.changenum.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.changenum.Location = new System.Drawing.Point(830, 662);
+            this.changenum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(248, 38);
+            this.changenum.Size = new System.Drawing.Size(204, 34);
             this.changenum.TabIndex = 91;
             this.changenum.Text = "0";
             // 
             // afterTransSNLength
             // 
             this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(329, 163);
-            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.afterTransSNLength.Location = new System.Drawing.Point(269, 140);
+            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(305, 38);
+            this.afterTransSNLength.Size = new System.Drawing.Size(250, 34);
             this.afterTransSNLength.TabIndex = 90;
             this.afterTransSNLength.Text = "0";
             // 
             // beforeTransSNLength
             // 
             this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength.Location = new System.Drawing.Point(329, 105);
-            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(269, 90);
+            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(305, 38);
+            this.beforeTransSNLength.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
@@ -236,11 +214,11 @@
             this.afterTransSNPre.BackColor = System.Drawing.Color.White;
             this.afterTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.afterTransSNPre.ID = null;
-            this.afterTransSNPre.Location = new System.Drawing.Point(1066, 166);
-            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.afterTransSNPre.Location = new System.Drawing.Point(872, 142);
+            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
-            this.afterTransSNPre.Size = new System.Drawing.Size(305, 38);
+            this.afterTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.afterTransSNPre.Str = null;
             this.afterTransSNPre.Str1 = null;
             this.afterTransSNPre.Str2 = null;
@@ -252,36 +230,23 @@
             this.beforeTransSNPre.BackColor = System.Drawing.Color.White;
             this.beforeTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.beforeTransSNPre.ID = null;
-            this.beforeTransSNPre.Location = new System.Drawing.Point(1066, 107);
-            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(872, 92);
+            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
-            this.beforeTransSNPre.Size = new System.Drawing.Size(305, 38);
+            this.beforeTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNPre.Str = null;
             this.beforeTransSNPre.Str1 = null;
             this.beforeTransSNPre.Str2 = null;
             this.beforeTransSNPre.TabIndex = 87;
             // 
-            // ms_makecode_lock
-            // 
-            this.ms_makecode_lock.AutoSize = true;
-            this.ms_makecode_lock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_lock.LeaveEvent = false;
-            this.ms_makecode_lock.Location = new System.Drawing.Point(468, 26);
-            this.ms_makecode_lock.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
-            this.ms_makecode_lock.Name = "ms_makecode_lock";
-            this.ms_makecode_lock.Size = new System.Drawing.Size(80, 32);
-            this.ms_makecode_lock.TabIndex = 80;
-            this.ms_makecode_lock.Text = "锁定";
-            this.ms_makecode_lock.UseVisualStyleBackColor = true;
-            // 
             // 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(37, 247);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(5);
+            this.OperateResult.Location = new System.Drawing.Point(30, 212);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1485, 499);
+            this.OperateResult.Size = new System.Drawing.Size(1216, 428);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -291,11 +256,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(174, 772);
-            this.sncode.Margin = new System.Windows.Forms.Padding(5);
+            this.sncode.Location = new System.Drawing.Point(142, 662);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
-            this.sncode.Size = new System.Drawing.Size(290, 38);
+            this.sncode.Size = new System.Drawing.Size(238, 34);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -310,13 +275,13 @@
             this.ReCall.DownImage = ((System.Drawing.Image)(resources.GetObject("ReCall.DownImage")));
             this.ReCall.Image = ((System.Drawing.Image)(resources.GetObject("ReCall.Image")));
             this.ReCall.IsShowBorder = true;
-            this.ReCall.Location = new System.Drawing.Point(803, 838);
-            this.ReCall.Margin = new System.Windows.Forms.Padding(5);
+            this.ReCall.Location = new System.Drawing.Point(657, 718);
+            this.ReCall.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReCall.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReCall.MoveImage")));
             this.ReCall.Name = "ReCall";
             this.ReCall.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReCall.NormalImage")));
             this.ReCall.Power = null;
-            this.ReCall.Size = new System.Drawing.Size(128, 42);
+            this.ReCall.Size = new System.Drawing.Size(105, 36);
             this.ReCall.TabIndex = 74;
             this.ReCall.Text = "撤销输入";
             this.ReCall.UseVisualStyleBackColor = true;
@@ -329,13 +294,13 @@
             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(623, 838);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(5);
+            this.Confirm.Location = new System.Drawing.Point(510, 718);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(128, 42);
+            this.Confirm.Size = new System.Drawing.Size(105, 36);
             this.Confirm.TabIndex = 73;
             this.Confirm.Tag = "IfWrite";
             this.Confirm.Text = "确认";
@@ -347,32 +312,31 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(728, 26);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(576, 26);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 36);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 94;
             // 
-            // pr_detail
+            // ma_code
             // 
-            this.pr_detail.AutoSize = true;
-            this.pr_detail.CutLength = null;
-            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(1148, 26);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 36);
-            this.pr_detail.TabIndex = 95;
+            this.ma_code.AutoSize = true;
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ma_code.Location = new System.Drawing.Point(136, 22);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.TabIndex = 95;
+            this.ma_code.TextChanged += new System.EventHandler(this.ms_makecode_UserControlTextChanged);
             // 
             // Make_SeqTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1557, 896);
-            this.Controls.Add(this.pr_detail);
+            this.ClientSize = new System.Drawing.Size(1274, 768);
+            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.changenum);
             this.Controls.Add(this.afterTransSNLength);
             this.Controls.Add(this.beforeTransSNLength);
@@ -382,7 +346,6 @@
             this.Controls.Add(this.beforeTransSNPre_checkBox);
             this.Controls.Add(this.afterTransSNLength_checkBox);
             this.Controls.Add(this.beforeTransSNLength_checkBox);
-            this.Controls.Add(this.ms_makecode_lock);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.ReCall);
@@ -394,7 +357,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";
@@ -416,7 +379,6 @@
         private CustomControl.ButtonUtil.NormalButton ReCall;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.CustomCheckBox.LockCheckBox ms_makecode_lock;
         private System.Windows.Forms.CheckBox beforeTransSNLength_checkBox;
         private System.Windows.Forms.CheckBox afterTransSNLength_checkBox;
         private System.Windows.Forms.CheckBox beforeTransSNPre_checkBox;
@@ -426,9 +388,8 @@
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly beforeTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly afterTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly changenum;
-        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private System.Windows.Forms.Label label1;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
-        private CustomControl.ValueLabel.ValueLabel pr_detail;
+        private System.Windows.Forms.Label ma_code;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -35,24 +35,24 @@ namespace UAS_MES.Make
             sncode.Focus();
             OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
 
-            //设置锁定工单
-            ms_makecode_lock.GetMakeCodeCtl(ma_code);
-            ma_code.SetLockCheckBox(ms_makecode_lock);
+            ////设置锁定工单
+            //ms_makecode_lock.GetMakeCodeCtl(ma_code);
+            //ma_code.SetLockCheckBox(ms_makecode_lock);
 
-            //工单放大镜的配置
-            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.Condition = "ma_statuscode='STARTED'";
-            ma_code.DbChange += Ma_code_DbChange;
+            ////工单放大镜的配置
+            //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.Condition = "ma_statuscode='STARTED'";
+            //ma_code.DbChange += Ma_code_DbChange;
         }
 
-        private void Ma_code_DbChange(object sender, EventArgs e)
-        {
-            Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls, Dbfind);
-        }
+        //private void Ma_code_DbChange(object sender, EventArgs e)
+        //{
+        //    Dbfind = ma_code.ReturnData;
+        //    BaseUtil.SetFormValue(this.Controls, Dbfind);
+        //}
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
@@ -90,7 +90,7 @@ namespace UAS_MES.Make
                                     if (dt.Rows.Count > 0)
                                     {
                                         BaseUtil.SetFormValue(this.Controls, dt);
-                                        ms_makecode_lock.Checked = true;
+                                        //ms_makecode_lock.Checked = true;
                                     }
                                 }
                                 //判断用户是否锁定输入转换前序列号长度，