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

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

@@ -46,7 +46,6 @@
             this.pr_code = new System.Windows.Forms.Label();
             this.ms_makecode = new System.Windows.Forms.Label();
             this.pr_detail = new System.Windows.Forms.Label();
-            this.SN = new System.Windows.Forms.RadioButton();
             this.rePrintCheck = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -62,10 +61,10 @@
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
             this.giftBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.giftBox.Location = new System.Drawing.Point(28, 39);
+            this.giftBox.Location = new System.Drawing.Point(83, 50);
             this.giftBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.giftBox.Name = "giftBox";
-            this.giftBox.Size = new System.Drawing.Size(113, 31);
+            this.giftBox.Size = new System.Drawing.Size(135, 35);
             this.giftBox.TabIndex = 1;
             this.giftBox.TabStop = true;
             this.giftBox.Text = "彩标打印";
@@ -76,10 +75,10 @@
             // 
             this.CartonBox.AutoSize = true;
             this.CartonBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.CartonBox.Location = new System.Drawing.Point(239, 39);
+            this.CartonBox.Location = new System.Drawing.Point(431, 50);
             this.CartonBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CartonBox.Name = "CartonBox";
-            this.CartonBox.Size = new System.Drawing.Size(137, 31);
+            this.CartonBox.Size = new System.Drawing.Size(164, 35);
             this.CartonBox.TabIndex = 2;
             this.CartonBox.Text = "Carton打印";
             this.CartonBox.UseVisualStyleBackColor = true;
@@ -89,10 +88,10 @@
             // 
             this.fuselagel.AutoSize = true;
             this.fuselagel.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.fuselagel.Location = new System.Drawing.Point(490, 39);
+            this.fuselagel.Location = new System.Drawing.Point(845, 50);
             this.fuselagel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.fuselagel.Name = "fuselagel";
-            this.fuselagel.Size = new System.Drawing.Size(133, 31);
+            this.fuselagel.Size = new System.Drawing.Size(159, 35);
             this.fuselagel.TabIndex = 3;
             this.fuselagel.Text = "机身标打印";
             this.fuselagel.UseVisualStyleBackColor = true;
@@ -102,9 +101,9 @@
             // 
             this.label.AutoSize = true;
             this.label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label.Location = new System.Drawing.Point(34, 121);
+            this.label.Location = new System.Drawing.Point(38, 133);
             this.label.Name = "label";
-            this.label.Size = new System.Drawing.Size(72, 27);
+            this.label.Size = new System.Drawing.Size(86, 31);
             this.label.TabIndex = 4;
             this.label.Text = "输入值";
             // 
@@ -112,9 +111,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(485, 121);
+            this.label3.Location = new System.Drawing.Point(546, 133);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(92, 27);
+            this.label3.Size = new System.Drawing.Size(110, 31);
             this.label3.TabIndex = 5;
             this.label3.Text = "工单代码";
             // 
@@ -122,9 +121,9 @@
             // 
             this.label111.AutoSize = true;
             this.label111.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label111.Location = new System.Drawing.Point(34, 161);
+            this.label111.Location = new System.Drawing.Point(38, 173);
             this.label111.Name = "label111";
-            this.label111.Size = new System.Drawing.Size(92, 27);
+            this.label111.Size = new System.Drawing.Size(110, 31);
             this.label111.TabIndex = 6;
             this.label111.Text = "产品编号";
             // 
@@ -132,9 +131,9 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(485, 161);
+            this.label5.Location = new System.Drawing.Point(546, 173);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(52, 27);
+            this.label5.Size = new System.Drawing.Size(62, 31);
             this.label5.TabIndex = 7;
             this.label5.Text = "名称";
             // 
@@ -142,20 +141,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(167, 241);
+            this.PrintLabel.Location = new System.Drawing.Point(188, 269);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(198, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(222, 26);
             this.PrintLabel.TabIndex = 189;
             // 
             // 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(34, 198);
+            this.label6.Location = new System.Drawing.Point(38, 218);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(112, 27);
+            this.label6.Size = new System.Drawing.Size(134, 31);
             this.label6.TabIndex = 188;
             this.label6.Text = "打印机列表";
             // 
@@ -163,10 +162,10 @@
             // 
             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(34, 237);
+            this.label7.Location = new System.Drawing.Point(38, 264);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(92, 27);
+            this.label7.Size = new System.Drawing.Size(110, 31);
             this.label7.TabIndex = 187;
             this.label7.Text = "标签模板";
             // 
@@ -174,9 +173,9 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(484, 202);
+            this.label8.Location = new System.Drawing.Point(544, 222);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(72, 27);
+            this.label8.Size = new System.Drawing.Size(86, 31);
             this.label8.TabIndex = 190;
             this.label8.Text = "输入框";
             // 
@@ -184,9 +183,9 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(485, 241);
+            this.label9.Location = new System.Drawing.Point(546, 269);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(52, 27);
+            this.label9.Size = new System.Drawing.Size(62, 31);
             this.label9.TabIndex = 192;
             this.label9.Text = "份数";
             // 
@@ -194,9 +193,9 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label10.Location = new System.Drawing.Point(44, 500);
+            this.label10.Location = new System.Drawing.Point(49, 576);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(92, 27);
+            this.label10.Size = new System.Drawing.Size(110, 31);
             this.label10.TabIndex = 196;
             this.label10.Text = "补打核对";
             // 
@@ -204,18 +203,18 @@
             // 
             this.inputValue.AutoSize = true;
             this.inputValue.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.inputValue.Location = new System.Drawing.Point(162, 121);
+            this.inputValue.Location = new System.Drawing.Point(182, 133);
             this.inputValue.Name = "inputValue";
-            this.inputValue.Size = new System.Drawing.Size(0, 27);
+            this.inputValue.Size = new System.Drawing.Size(0, 31);
             this.inputValue.TabIndex = 199;
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_code.Location = new System.Drawing.Point(162, 161);
+            this.pr_code.Location = new System.Drawing.Point(182, 173);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 27);
+            this.pr_code.Size = new System.Drawing.Size(0, 31);
             this.pr_code.TabIndex = 200;
             this.pr_code.TextChanged += new System.EventHandler(this.PrintLabel_TextChanged);
             // 
@@ -223,44 +222,30 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_makecode.Location = new System.Drawing.Point(583, 121);
+            this.ms_makecode.Location = new System.Drawing.Point(656, 133);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode.TabIndex = 201;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(583, 161);
+            this.pr_detail.Location = new System.Drawing.Point(656, 173);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 202;
             // 
-            // SN
-            // 
-            this.SN.AutoSize = true;
-            this.SN.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.SN.Location = new System.Drawing.Point(728, 39);
-            this.SN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.SN.Name = "SN";
-            this.SN.Size = new System.Drawing.Size(121, 31);
-            this.SN.TabIndex = 203;
-            this.SN.TabStop = true;
-            this.SN.Text = "SN标打印";
-            this.SN.UseVisualStyleBackColor = true;
-            this.SN.CheckedChanged += new System.EventHandler(this.SN_CheckedChanged);
-            // 
             // rePrintCheck
             // 
             this.rePrintCheck.AllPower = null;
             this.rePrintCheck.BackColor = System.Drawing.Color.White;
             this.rePrintCheck.ID = null;
-            this.rePrintCheck.Location = new System.Drawing.Point(199, 500);
+            this.rePrintCheck.Location = new System.Drawing.Point(223, 576);
             this.rePrintCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.rePrintCheck.Name = "rePrintCheck";
             this.rePrintCheck.Power = null;
-            this.rePrintCheck.Size = new System.Drawing.Size(216, 25);
+            this.rePrintCheck.Size = new System.Drawing.Size(242, 28);
             this.rePrintCheck.Str = null;
             this.rePrintCheck.Str1 = null;
             this.rePrintCheck.Str2 = null;
@@ -270,10 +255,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(39, 281);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(44, 316);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1017, 206);
+            this.OperateResult.Size = new System.Drawing.Size(1134, 246);
             this.OperateResult.TabIndex = 195;
             this.OperateResult.Text = "";
             // 
@@ -284,13 +269,13 @@
             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(821, 244);
+            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(67, 30);
+            this.normalButton1.Size = new System.Drawing.Size(75, 36);
             this.normalButton1.TabIndex = 194;
             this.normalButton1.Text = "打印";
             this.normalButton1.UseVisualStyleBackColor = false;
@@ -301,12 +286,12 @@
             this.printNum.AllPower = null;
             this.printNum.BackColor = System.Drawing.Color.White;
             this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(589, 244);
+            this.printNum.Location = new System.Drawing.Point(663, 273);
             this.printNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.printNum.Name = "printNum";
             this.printNum.Negative = false;
             this.printNum.Power = null;
-            this.printNum.Size = new System.Drawing.Size(198, 25);
+            this.printNum.Size = new System.Drawing.Size(222, 28);
             this.printNum.Str = null;
             this.printNum.Str1 = null;
             this.printNum.Str2 = null;
@@ -318,11 +303,11 @@
             this.inputText.AllPower = null;
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(588, 203);
+            this.inputText.Location = new System.Drawing.Point(662, 224);
             this.inputText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
-            this.inputText.Size = new System.Drawing.Size(198, 25);
+            this.inputText.Size = new System.Drawing.Size(222, 28);
             this.inputText.Str = null;
             this.inputText.Str1 = null;
             this.inputText.Str2 = null;
@@ -331,23 +316,24 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(167, 198);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(188, 218);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(197, 31);
+            this.Printer.Size = new System.Drawing.Size(222, 37);
             this.Printer.TabIndex = 186;
             // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
             this.groupBoxWithBorder1.Controls.Add(this.CartonBox);
-            this.groupBoxWithBorder1.Controls.Add(this.SN);
             this.groupBoxWithBorder1.Controls.Add(this.fuselagel);
             this.groupBoxWithBorder1.Controls.Add(this.giftBox);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(39, 12);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(44, 14);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1017, 90);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1134, 108);
             this.groupBoxWithBorder1.TabIndex = 204;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "打印类型";
@@ -355,9 +341,9 @@
             // 
             // Make_RePrintLabel
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1091, 537);
+            this.ClientSize = new System.Drawing.Size(1227, 625);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ms_makecode);
@@ -418,7 +404,6 @@
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label ms_makecode;
         private System.Windows.Forms.Label pr_detail;
-        private System.Windows.Forms.RadioButton SN;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
     }
 }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -116,14 +116,6 @@ namespace UAS_MES.Make
                 clearAll();
             }
         }
-        private void SN_CheckedChanged(object sender, EventArgs e)
-        {
-            if (SN.Checked)
-            {
-                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                clearAll();
-            }
-        }
         private void inputText_KeyDown(object sender, KeyEventArgs e)
         {
             //按下enter键

UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -53,7 +53,8 @@ namespace UAS_MES.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select ms_status,ms_paststep,ms_stepcode,NVL(ms_ifrework, 0) ms_ifrework,NVL(ms_reworkstatus, 0) ms_reworkstatus from makeserial where ms_sncode='" + sn_code.Text + "'", "select");
+                string ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + sn_code.Text + "'").ToString();
+                dt = (DataTable)dh.ExecuteSql("select ms_status,ms_paststep,ms_stepcode,NVL(ms_ifrework, 0) ms_ifrework,NVL(ms_reworkstatus, 0) ms_reworkstatus from makeserial where ms_id='" + ms_id + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
                     if (Step != null && Step.Count > 0)
@@ -98,7 +99,7 @@ namespace UAS_MES.Query
                     //查询执行过的步骤
                     sql.Clear();
                     sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail on cd_crid = cr_id  left join makeserial ");
-                    sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_sncode='" + sn_code.Text + "' order by cd_detno");
+                    sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_id='" + ms_id + "' order by cd_detno");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     Step = new Dictionary<int, string>();
                     for (int i = 0; i < dt.Rows.Count + 2; i++)