修改

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -33,6 +33,7 @@ namespace UAS_MES.Make
 
         Thread InitPrint;
 
+        bool pr_change = false;
         public Make_FuselageLabelPrint()
         {
             InitializeComponent();
@@ -102,6 +103,12 @@ namespace UAS_MES.Make
                             {
                                 //将工单的其他信息赋值到对应的控件
                                 BaseUtil.SetFormValue(this.Controls, mapB);
+                                if (pr_change)
+                                {
+                                    pr_change = false;
+                                    OperateResult.AppendText(">>产品编号改变，请重新选择标签模板\n", Color.Green);
+                                    return;
+                                }
                                 //提示用户“<<工单号：取ma_makecode”
                                 OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                                 //提示用户“<< 序列号：XXXX”
@@ -200,6 +207,7 @@ namespace UAS_MES.Make
                 BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
                 indate[i] = Convert.ToDateTime(dt.Rows[i]["pl_indate"].ToString());
             }
+            pr_change = true;
         }
 
         private void Make_FuselageLabelPrint_Activated(object sender, EventArgs e)

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

@@ -40,6 +40,8 @@
             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 System.Windows.Forms.Label();
+            this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.beforeTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
@@ -49,8 +51,7 @@
             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.ma_code = new System.Windows.Forms.Label();
+            this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.SuspendLayout();
             // 
             // ms_makecode_label
@@ -177,6 +178,28 @@
             this.label1.TabIndex = 93;
             this.label1.Text = "工单编号";
             // 
+            // ma_code
+            // 
+            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);
+            // 
+            // ma_prodcode
+            // 
+            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(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, 31);
+            this.ma_prodcode.TabIndex = 94;
+            // 
             // changenum
             // 
             this.changenum.Enabled = false;
@@ -244,7 +267,7 @@
             // 
             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(30, 212);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(1216, 428);
             this.OperateResult.TabIndex = 78;
@@ -257,7 +280,7 @@
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.sncode.ID = null;
             this.sncode.Location = new System.Drawing.Point(142, 662);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
             this.sncode.Size = new System.Drawing.Size(238, 34);
@@ -276,7 +299,7 @@
             this.ReCall.Image = ((System.Drawing.Image)(resources.GetObject("ReCall.Image")));
             this.ReCall.IsShowBorder = true;
             this.ReCall.Location = new System.Drawing.Point(657, 718);
-            this.ReCall.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ReCall.Margin = new System.Windows.Forms.Padding(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")));
@@ -295,7 +318,7 @@
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
             this.Confirm.Location = new System.Drawing.Point(510, 718);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(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")));
@@ -307,33 +330,23 @@
             this.Confirm.UseVisualStyleBackColor = true;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
-            // ma_prodcode
+            // pr_detail
             // 
-            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(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, 31);
-            this.ma_prodcode.TabIndex = 94;
-            // 
-            // ma_code
-            // 
-            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);
+            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(935, 22);
+            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 = 96;
             // 
             // Make_SeqTransform
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1274, 768);
+            this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.label1);
@@ -391,5 +404,6 @@
         private System.Windows.Forms.Label label1;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private System.Windows.Forms.Label ma_code;
+        private CustomControl.ValueLabel.ValueLabel pr_detail;
     }
 }