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

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

@@ -48,7 +48,7 @@
             this.pr_detail = new System.Windows.Forms.Label();
             this.rePrintCheck = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.printBtn = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
@@ -61,7 +61,7 @@
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
             this.giftBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.giftBox.Location = new System.Drawing.Point(83, 51);
+            this.giftBox.Location = new System.Drawing.Point(83, 52);
             this.giftBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.giftBox.Name = "giftBox";
             this.giftBox.Size = new System.Drawing.Size(135, 35);
@@ -75,7 +75,7 @@
             // 
             this.CartonBox.AutoSize = true;
             this.CartonBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.CartonBox.Location = new System.Drawing.Point(431, 51);
+            this.CartonBox.Location = new System.Drawing.Point(431, 52);
             this.CartonBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CartonBox.Name = "CartonBox";
             this.CartonBox.Size = new System.Drawing.Size(164, 35);
@@ -88,7 +88,7 @@
             // 
             this.fuselagel.AutoSize = true;
             this.fuselagel.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.fuselagel.Location = new System.Drawing.Point(845, 51);
+            this.fuselagel.Location = new System.Drawing.Point(845, 52);
             this.fuselagel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.fuselagel.Name = "fuselagel";
             this.fuselagel.Size = new System.Drawing.Size(159, 35);
@@ -262,24 +262,24 @@
             this.OperateResult.TabIndex = 195;
             this.OperateResult.Text = "";
             // 
-            // normalButton1
-            // 
-            this.normalButton1.AllPower = null;
-            this.normalButton1.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
-            this.normalButton1.Image = null;
-            this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(923, 267);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
-            this.normalButton1.Name = "normalButton1";
-            this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
-            this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(75, 36);
-            this.normalButton1.TabIndex = 194;
-            this.normalButton1.Text = "打印";
-            this.normalButton1.UseVisualStyleBackColor = false;
-            this.normalButton1.Click += new System.EventHandler(this.print_Click);
+            // printBtn
+            // 
+            this.printBtn.AllPower = null;
+            this.printBtn.BackColor = System.Drawing.Color.Transparent;
+            this.printBtn.DownImage = ((System.Drawing.Image)(resources.GetObject("printBtn.DownImage")));
+            this.printBtn.Image = null;
+            this.printBtn.IsShowBorder = true;
+            this.printBtn.Location = new System.Drawing.Point(923, 267);
+            this.printBtn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.printBtn.MoveImage = ((System.Drawing.Image)(resources.GetObject("printBtn.MoveImage")));
+            this.printBtn.Name = "printBtn";
+            this.printBtn.NormalImage = ((System.Drawing.Image)(resources.GetObject("printBtn.NormalImage")));
+            this.printBtn.Power = null;
+            this.printBtn.Size = new System.Drawing.Size(75, 36);
+            this.printBtn.TabIndex = 194;
+            this.printBtn.Text = "打印";
+            this.printBtn.UseVisualStyleBackColor = false;
+            this.printBtn.Click += new System.EventHandler(this.print_Click);
             // 
             // printNum
             // 
@@ -352,7 +352,7 @@
             this.Controls.Add(this.rePrintCheck);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.normalButton1);
+            this.Controls.Add(this.printBtn);
             this.Controls.Add(this.printNum);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.inputText);
@@ -396,7 +396,7 @@
         private CustomControl.TextBoxWithIcon.SnCollectionBox inputText;
         private System.Windows.Forms.Label label9;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox printNum;
-        private CustomControl.ButtonUtil.NormalButton normalButton1;
+        private CustomControl.ButtonUtil.NormalButton printBtn;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label label10;
         private CustomControl.TextBoxWithIcon.SnCollectionBox rePrintCheck;

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -226,6 +226,7 @@ namespace UAS_MES.Make
                 {
                     //按照打印张数打印
                     OperateResult.AppendText("<<打印成功\n", Color.Green);
+                    printBtn.Enabled = false;
                 }
                 else
                 {
@@ -257,6 +258,7 @@ namespace UAS_MES.Make
                 {
                     //判断通过,打印
                     OperateResult.AppendText("<<打印成功\n", Color.Green);
+                    printBtn.Enabled = false;
                 }
                 else
                 {
@@ -361,6 +363,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update makeserial set ms_downstatus='0' where ms_id='" + re_ms_id + "'", sql.GetString());
                                 }
                             }
+                            printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["ms_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
@@ -410,6 +413,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update package set pa_downstatus='0' where pa_outboxcode='" + TSN + "'", sql.GetString());
                                 }
                             }
+                            printBtn.Enabled = true;
                             //记录操作日志commandlog ， 补打核对，核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对,卡通箱号:" + TSN, "核对成功", TSN, "");
                         }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.resx

@@ -118,7 +118,7 @@
     <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="normalButton1.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +130,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="normalButton1.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -143,7 +143,7 @@
         gg==
 </value>
   </data>
-  <data name="normalButton1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE