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

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

@@ -184,6 +184,7 @@
             this.printButton.TabIndex = 192;
             this.printButton.Text = "打印";
             this.printButton.UseVisualStyleBackColor = false;
+            this.printButton.Click += new System.EventHandler(this.printButton_Click);
             // 
             // pr_code
             // 

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -45,6 +45,8 @@ namespace UAS_MES.Make
         System.DateTime[] indate;
 
         StringBuilder sb = new StringBuilder();
+
+        bool canPrint = false;
         public Make_CustomLabelPrint()
         {
             InitializeComponent();
@@ -164,6 +166,7 @@ namespace UAS_MES.Make
                     if (currentIndex == paramsInfo.Rows.Count)
                     {
                         OperateResult.AppendText("<<输入完成，正在打印\n", Color.Black,inputText);
+                        canPrint = true;
                         //打印
                         LogManager.DoLog(sb.ToString());
                         //保存本次赋值进行打印
@@ -183,6 +186,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
+                        canPrint = false;
                         currentIndex++;
                         OperateResult.AppendText("<<请输入自定义模板的" + paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString() + "\n", Color.Green,inputText);
                     }
@@ -252,5 +256,10 @@ namespace UAS_MES.Make
         {
             //pr_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
         }
+
+        private void printButton_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

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

@@ -60,7 +60,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(4, 10);
+            this.label1.Location = new System.Drawing.Point(3, 10);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 0;
@@ -70,7 +70,7 @@
             // 
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
-            this.giftBox.Location = new System.Drawing.Point(179, 8);
+            this.giftBox.Location = new System.Drawing.Point(200, 6);
             this.giftBox.Name = "giftBox";
             this.giftBox.Size = new System.Drawing.Size(135, 35);
             this.giftBox.TabIndex = 1;
@@ -82,7 +82,7 @@
             // CartonBox
             // 
             this.CartonBox.AutoSize = true;
-            this.CartonBox.Location = new System.Drawing.Point(425, 10);
+            this.CartonBox.Location = new System.Drawing.Point(457, 8);
             this.CartonBox.Name = "CartonBox";
             this.CartonBox.Size = new System.Drawing.Size(164, 35);
             this.CartonBox.TabIndex = 2;
@@ -93,7 +93,7 @@
             // fuselagel
             // 
             this.fuselagel.AutoSize = true;
-            this.fuselagel.Location = new System.Drawing.Point(718, 10);
+            this.fuselagel.Location = new System.Drawing.Point(739, 8);
             this.fuselagel.Name = "fuselagel";
             this.fuselagel.Size = new System.Drawing.Size(159, 35);
             this.fuselagel.TabIndex = 3;
@@ -105,7 +105,7 @@
             // 
             this.label.AutoSize = true;
             this.label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label.Location = new System.Drawing.Point(48, 101);
+            this.label.Location = new System.Drawing.Point(37, 61);
             this.label.Name = "label";
             this.label.Size = new System.Drawing.Size(86, 31);
             this.label.TabIndex = 4;
@@ -115,7 +115,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(571, 101);
+            this.label3.Location = new System.Drawing.Point(545, 61);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(110, 31);
             this.label3.TabIndex = 5;
@@ -125,7 +125,7 @@
             // 
             this.label111.AutoSize = true;
             this.label111.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label111.Location = new System.Drawing.Point(42, 154);
+            this.label111.Location = new System.Drawing.Point(37, 102);
             this.label111.Name = "label111";
             this.label111.Size = new System.Drawing.Size(110, 31);
             this.label111.TabIndex = 6;
@@ -135,7 +135,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(571, 154);
+            this.label5.Location = new System.Drawing.Point(545, 102);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
             this.label5.TabIndex = 7;
@@ -145,7 +145,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(192, 276);
+            this.PrintLabel.Location = new System.Drawing.Point(187, 196);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(222, 26);
@@ -156,7 +156,7 @@
             // 
             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(42, 210);
+            this.label6.Location = new System.Drawing.Point(37, 144);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(134, 31);
@@ -167,7 +167,7 @@
             // 
             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(42, 269);
+            this.label7.Location = new System.Drawing.Point(37, 191);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -178,7 +178,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(42, 331);
+            this.label8.Location = new System.Drawing.Point(37, 242);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(86, 31);
             this.label8.TabIndex = 190;
@@ -188,7 +188,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(42, 385);
+            this.label9.Location = new System.Drawing.Point(37, 293);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(62, 31);
             this.label9.TabIndex = 192;
@@ -198,7 +198,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label10.Location = new System.Drawing.Point(42, 725);
+            this.label10.Location = new System.Drawing.Point(46, 600);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(110, 31);
             this.label10.TabIndex = 196;
@@ -212,16 +212,16 @@
             this.panel1.Controls.Add(this.CartonBox);
             this.panel1.Controls.Add(this.fuselagel);
             this.panel1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.panel1.Location = new System.Drawing.Point(48, 30);
+            this.panel1.Location = new System.Drawing.Point(43, 12);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1057, 56);
+            this.panel1.Size = new System.Drawing.Size(1057, 46);
             this.panel1.TabIndex = 198;
             // 
             // inputValue
             // 
             this.inputValue.AutoSize = true;
             this.inputValue.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.inputValue.Location = new System.Drawing.Point(198, 101);
+            this.inputValue.Location = new System.Drawing.Point(181, 61);
             this.inputValue.Name = "inputValue";
             this.inputValue.Size = new System.Drawing.Size(0, 31);
             this.inputValue.TabIndex = 199;
@@ -230,7 +230,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_code.Location = new System.Drawing.Point(198, 154);
+            this.pr_code.Location = new System.Drawing.Point(181, 102);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 31);
             this.pr_code.TabIndex = 200;
@@ -239,7 +239,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_makecode.Location = new System.Drawing.Point(697, 101);
+            this.ms_makecode.Location = new System.Drawing.Point(655, 61);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode.TabIndex = 201;
@@ -248,7 +248,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(697, 154);
+            this.pr_detail.Location = new System.Drawing.Point(655, 102);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 202;
@@ -258,7 +258,7 @@
             this.rePrintCheck.AllPower = null;
             this.rePrintCheck.BackColor = System.Drawing.Color.White;
             this.rePrintCheck.ID = null;
-            this.rePrintCheck.Location = new System.Drawing.Point(226, 725);
+            this.rePrintCheck.Location = new System.Drawing.Point(221, 600);
             this.rePrintCheck.Name = "rePrintCheck";
             this.rePrintCheck.Power = null;
             this.rePrintCheck.Size = new System.Drawing.Size(242, 28);
@@ -271,10 +271,10 @@
             // 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, 443);
+            this.OperateResult.Location = new System.Drawing.Point(43, 332);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1144, 257);
+            this.OperateResult.Size = new System.Drawing.Size(1144, 246);
             this.OperateResult.TabIndex = 195;
             this.OperateResult.Text = "";
             // 
@@ -285,7 +285,7 @@
             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(575, 390);
+            this.normalButton1.Location = new System.Drawing.Point(549, 296);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -301,11 +301,11 @@
             this.printNum.AllPower = null;
             this.printNum.BackColor = System.Drawing.Color.White;
             this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(194, 392);
+            this.printNum.Location = new System.Drawing.Point(187, 296);
             this.printNum.Name = "printNum";
             this.printNum.Negative = false;
             this.printNum.Power = null;
-            this.printNum.Size = new System.Drawing.Size(153, 28);
+            this.printNum.Size = new System.Drawing.Size(222, 28);
             this.printNum.Str = null;
             this.printNum.Str1 = null;
             this.printNum.Str2 = null;
@@ -317,7 +317,7 @@
             this.inputText.AllPower = null;
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(196, 334);
+            this.inputText.Location = new System.Drawing.Point(187, 242);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
             this.inputText.Size = new System.Drawing.Size(222, 28);
@@ -329,7 +329,7 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(192, 210);
+            this.Printer.Location = new System.Drawing.Point(187, 144);
             this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(222, 37);
@@ -339,7 +339,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1264, 780);
+            this.ClientSize = new System.Drawing.Size(1227, 653);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.pr_code);
@@ -368,9 +368,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -143,6 +143,7 @@ namespace UAS_MES.Make
                     BaseUtil.SetFormValue(this.Controls,formValue);
                     //无值,可补打
                     inputValue.Text = inputText.Text;
+                    inputText.Text = "";
                 }
                 //打印类型为卡通箱
                 else
@@ -160,6 +161,7 @@ namespace UAS_MES.Make
                     //有值,可以打
                     //展示产品编号和标签模板到界面
                     inputValue.Text = inputText.Text;
+                    inputText.Text = "";
                 }
             }
         }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -414,7 +414,7 @@ namespace UAS_MES.Make
                             //记录本次修改，存入makesnrelation表中
                             updateSql = "update makeserial set ms_sncode='" + SN + "'," + s1.Remove(s1.Length - 1, 1).ToString() + " where ms_beforesn='" + TSN + "' and ms_id='" + oMsid + "'";
                             //删除最近一条转换记录
-                            dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "'", "delete");
+                            dh.ExecuteSql("delete from makesnrelation where BEFORESN='" + TSN + "' and makecode='" + oMakecode + "'", "delete");
                         }
                         //未勾选修改转换结果
                         else

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -199,7 +199,7 @@ namespace UAS_MES.Make
                                         //记录本次修改，存入makesnrelation表中
                                         updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "' and ms_id='" + oMsId + "'";
                                         //删除最近一条转换记录
-                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='"+bsncode+"'", "delete");
+                                        dh.ExecuteSql("delete from makesnrelation where BEFORESN='"+bsncode+"' and makecode='"+oMakeCode+"'", "delete");
                                     }
                                     //未勾选修改转换结果
                                     else