소스 검색

palletweigh修改

shim 8 년 전
부모
커밋
63fedc5fbe
3개의 변경된 파일224개의 추가작업 그리고 220개의 파일을 삭제
  1. 216 212
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs
  2. 2 2
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs
  3. 6 6
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.resx

+ 216 - 212
UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -33,11 +33,9 @@
             this.pr_cartonunit = new System.Windows.Forms.Label();
             this.label22 = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
-            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.Printer_label = new System.Windows.Forms.Label();
-            this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.PrintLabel = new System.Windows.Forms.ComboBox();
             this.autoPrint = new System.Windows.Forms.CheckBox();
             this.printNum_label = new System.Windows.Forms.Label();
@@ -47,25 +45,27 @@
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.label8 = new System.Windows.Forms.Label();
-            this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_detailspec = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.PA_PACKAGEQTY = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.weightedNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.startWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.stopWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ComList = new UAS_MES.CustomControl.ComBoxWithFocus.SerialPortCombox();
             this.showResult = new System.Windows.Forms.ListView();
             this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.ComList = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stopWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.startWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.weightedNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.PA_PACKAGEQTY = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pr_detailspec = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -121,23 +121,6 @@
             this.weight.Size = new System.Drawing.Size(0, 58);
             this.weight.TabIndex = 41;
             // 
-            // palletcode
-            // 
-            this.palletcode.AllPower = null;
-            this.palletcode.BackColor = System.Drawing.Color.White;
-            this.palletcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(183, 14);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4);
-            this.palletcode.Name = "palletcode";
-            this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(416, 55);
-            this.palletcode.Str = null;
-            this.palletcode.Str1 = null;
-            this.palletcode.Str2 = null;
-            this.palletcode.TabIndex = 94;
-            this.palletcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.palletcode_KeyDown);
-            // 
             // label15
             // 
             this.label15.AutoSize = true;
@@ -153,7 +136,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(988, 119);
+            this.label1.Location = new System.Drawing.Point(942, 101);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(110, 31);
@@ -164,28 +147,19 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(966, 24);
+            this.Printer_label.Location = new System.Drawing.Point(918, 21);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
             this.Printer_label.Size = new System.Drawing.Size(134, 31);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
-            // Printer
-            // 
-            this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(1218, 24);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
-            this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(196, 33);
-            this.Printer.TabIndex = 163;
-            // 
             // PrintLabel
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("宋体", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1218, 116);
+            this.PrintLabel.Location = new System.Drawing.Point(1141, 101);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(196, 26);
@@ -197,7 +171,7 @@
             this.autoPrint.Checked = true;
             this.autoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.autoPrint.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.autoPrint.Location = new System.Drawing.Point(971, 207);
+            this.autoPrint.Location = new System.Drawing.Point(923, 183);
             this.autoPrint.Name = "autoPrint";
             this.autoPrint.Size = new System.Drawing.Size(136, 35);
             this.autoPrint.TabIndex = 166;
@@ -208,7 +182,7 @@
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(1146, 208);
+            this.printNum_label.Location = new System.Drawing.Point(1071, 184);
             this.printNum_label.Name = "printNum_label";
             this.printNum_label.Size = new System.Drawing.Size(62, 31);
             this.printNum_label.TabIndex = 167;
@@ -218,7 +192,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(46, 317);
+            this.label2.Location = new System.Drawing.Point(39, 317);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(107, 39);
             this.label2.TabIndex = 169;
@@ -248,7 +222,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(43, 513);
+            this.label5.Location = new System.Drawing.Point(39, 513);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(137, 39);
             this.label5.TabIndex = 172;
@@ -268,130 +242,105 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(430, 445);
+            this.label7.Location = new System.Drawing.Point(430, 378);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(137, 39);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
-            // OperateResult
-            // 
-            this.OperateResult.Location = new System.Drawing.Point(33, 574);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(663, 310);
-            this.OperateResult.TabIndex = 175;
-            this.OperateResult.Text = "";
-            // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label8.Location = new System.Drawing.Point(1001, 301);
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(953, 266);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(77, 39);
+            this.label8.Size = new System.Drawing.Size(62, 31);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
-            // printNum
+            // showResult
             // 
-            this.printNum.AllPower = null;
-            this.printNum.BackColor = System.Drawing.Color.White;
-            this.printNum.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(1218, 207);
-            this.printNum.Name = "printNum";
-            this.printNum.Negative = false;
-            this.printNum.Power = null;
-            this.printNum.Size = new System.Drawing.Size(196, 39);
-            this.printNum.Str = null;
-            this.printNum.Str1 = null;
-            this.printNum.Str2 = null;
-            this.printNum.TabIndex = 178;
-            this.printNum.Text = "1";
+            this.showResult.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3,
+            this.columnHeader4});
+            this.showResult.Location = new System.Drawing.Point(770, 378);
+            this.showResult.Name = "showResult";
+            this.showResult.Size = new System.Drawing.Size(585, 506);
+            this.showResult.TabIndex = 190;
+            this.showResult.UseCompatibleStateImageBehavior = false;
+            this.showResult.View = System.Windows.Forms.View.Details;
             // 
-            // pa_makecode
+            // columnHeader1
             // 
-            this.pa_makecode.AutoSize = true;
-            this.pa_makecode.CutLength = null;
-            this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_makecode.Location = new System.Drawing.Point(176, 317);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
-            this.pa_makecode.TabIndex = 179;
+            this.columnHeader1.Text = "";
+            this.columnHeader1.Width = 69;
             // 
-            // pa_totalqty
+            // columnHeader2
             // 
-            this.pa_totalqty.AutoSize = true;
-            this.pa_totalqty.CutLength = null;
-            this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
-            this.pa_totalqty.TabIndex = 180;
+            this.columnHeader2.Text = "栈板号";
+            this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader2.Width = 150;
             // 
-            // pa_prodcode
+            // columnHeader3
             // 
-            this.pa_prodcode.AutoSize = true;
-            this.pa_prodcode.CutLength = null;
-            this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_prodcode.Location = new System.Drawing.Point(176, 445);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
-            this.pa_prodcode.TabIndex = 181;
-            this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
+            this.columnHeader3.Text = "重量";
+            this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader3.Width = 159;
             // 
-            // pr_detailspec
+            // columnHeader4
             // 
-            this.pr_detailspec.AutoSize = true;
-            this.pr_detailspec.CutLength = null;
-            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pr_detailspec.Location = new System.Drawing.Point(176, 513);
-            this.pr_detailspec.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pr_detailspec.Name = "pr_detailspec";
-            this.pr_detailspec.Size = new System.Drawing.Size(0, 39);
-            this.pr_detailspec.TabIndex = 182;
+            this.columnHeader4.Text = "称量时间";
+            this.columnHeader4.Width = 96;
             // 
-            // pa_salecode
+            // ComList
             // 
-            this.pa_salecode.AutoSize = true;
-            this.pa_salecode.CutLength = null;
-            this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_salecode.Location = new System.Drawing.Point(560, 317);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
-            this.pa_salecode.TabIndex = 183;
+            this.ComList.AutoSize = true;
+            this.ComList.CutLength = null;
+            this.ComList.Location = new System.Drawing.Point(669, 184);
+            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ComList.Name = "ComList";
+            this.ComList.Size = new System.Drawing.Size(71, 18);
+            this.ComList.TabIndex = 191;
+            this.ComList.Text = "ComList";
+            this.ComList.Visible = false;
             // 
-            // PA_PACKAGEQTY
+            // BaudRate
             // 
-            this.PA_PACKAGEQTY.AutoSize = true;
-            this.PA_PACKAGEQTY.CutLength = null;
-            this.PA_PACKAGEQTY.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(560, 445);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(200, 0);
-            this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
-            this.PA_PACKAGEQTY.TabIndex = 184;
+            this.BaudRate.AllPower = null;
+            this.BaudRate.BackColor = System.Drawing.Color.White;
+            this.BaudRate.ID = null;
+            this.BaudRate.Location = new System.Drawing.Point(671, 133);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4);
+            this.BaudRate.Name = "BaudRate";
+            this.BaudRate.Negative = false;
+            this.BaudRate.Power = null;
+            this.BaudRate.Size = new System.Drawing.Size(178, 28);
+            this.BaudRate.Str = null;
+            this.BaudRate.Str1 = null;
+            this.BaudRate.Str2 = null;
+            this.BaudRate.TabIndex = 189;
+            this.BaudRate.Visible = false;
             // 
-            // weightedNum
+            // stopWeigh
             // 
-            this.weightedNum.AllPower = null;
-            this.weightedNum.BackColor = System.Drawing.Color.White;
-            this.weightedNum.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.weightedNum.ID = null;
-            this.weightedNum.Location = new System.Drawing.Point(1218, 301);
-            this.weightedNum.Name = "weightedNum";
-            this.weightedNum.Negative = false;
-            this.weightedNum.Power = null;
-            this.weightedNum.Size = new System.Drawing.Size(196, 39);
-            this.weightedNum.Str = null;
-            this.weightedNum.Str1 = null;
-            this.weightedNum.Str2 = null;
-            this.weightedNum.TabIndex = 185;
-            this.weightedNum.Text = "0";
+            this.stopWeigh.AllPower = null;
+            this.stopWeigh.BackColor = System.Drawing.Color.Transparent;
+            this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
+            this.stopWeigh.Image = null;
+            this.stopWeigh.IsShowBorder = true;
+            this.stopWeigh.Location = new System.Drawing.Point(770, 21);
+            this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
+            this.stopWeigh.Name = "stopWeigh";
+            this.stopWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.NormalImage")));
+            this.stopWeigh.Power = null;
+            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
+            this.stopWeigh.TabIndex = 187;
+            this.stopWeigh.Text = "停止称重";
+            this.stopWeigh.UseVisualStyleBackColor = false;
+            this.stopWeigh.Click += new System.EventHandler(this.stopWeigh_Click);
             // 
             // startWeigh
             // 
@@ -411,94 +360,149 @@
             this.startWeigh.UseVisualStyleBackColor = false;
             this.startWeigh.Click += new System.EventHandler(this.startWeigh_Click);
             // 
-            // stopWeigh
+            // weightedNum
             // 
-            this.stopWeigh.AllPower = null;
-            this.stopWeigh.BackColor = System.Drawing.Color.Transparent;
-            this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
-            this.stopWeigh.Image = null;
-            this.stopWeigh.IsShowBorder = true;
-            this.stopWeigh.Location = new System.Drawing.Point(793, 21);
-            this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
-            this.stopWeigh.Name = "stopWeigh";
-            this.stopWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.NormalImage")));
-            this.stopWeigh.Power = null;
-            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
-            this.stopWeigh.TabIndex = 187;
-            this.stopWeigh.Text = "停止称重";
-            this.stopWeigh.UseVisualStyleBackColor = false;
-            this.stopWeigh.Click += new System.EventHandler(this.stopWeigh_Click);
+            this.weightedNum.AllPower = null;
+            this.weightedNum.BackColor = System.Drawing.Color.White;
+            this.weightedNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weightedNum.ID = null;
+            this.weightedNum.Location = new System.Drawing.Point(1139, 269);
+            this.weightedNum.Name = "weightedNum";
+            this.weightedNum.Negative = false;
+            this.weightedNum.Power = null;
+            this.weightedNum.Size = new System.Drawing.Size(196, 28);
+            this.weightedNum.Str = null;
+            this.weightedNum.Str1 = null;
+            this.weightedNum.Str2 = null;
+            this.weightedNum.TabIndex = 185;
+            this.weightedNum.Text = "0";
             // 
-            // BaudRate
+            // PA_PACKAGEQTY
             // 
-            this.BaudRate.AllPower = null;
-            this.BaudRate.BackColor = System.Drawing.Color.White;
-            this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(671, 133);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4);
-            this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Negative = false;
-            this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(178, 28);
-            this.BaudRate.Str = null;
-            this.BaudRate.Str1 = null;
-            this.BaudRate.Str2 = null;
-            this.BaudRate.TabIndex = 189;
-            this.BaudRate.Visible = false;
+            this.PA_PACKAGEQTY.AutoSize = true;
+            this.PA_PACKAGEQTY.CutLength = null;
+            this.PA_PACKAGEQTY.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(560, 378);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(200, 0);
+            this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
+            this.PA_PACKAGEQTY.TabIndex = 184;
             // 
-            // ComList
+            // pa_salecode
             // 
-            this.ComList.Location = new System.Drawing.Point(669, 185);
-            this.ComList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(182, 30);
-            this.ComList.TabIndex = 188;
-            this.ComList.Visible = false;
+            this.pa_salecode.AutoSize = true;
+            this.pa_salecode.CutLength = null;
+            this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.pa_salecode.Location = new System.Drawing.Point(560, 317);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_salecode.Name = "pa_salecode";
+            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_salecode.TabIndex = 183;
             // 
-            // showResult
+            // pr_detailspec
             // 
-            this.showResult.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2,
-            this.columnHeader3,
-            this.columnHeader4});
-            this.showResult.Location = new System.Drawing.Point(829, 406);
-            this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(585, 478);
-            this.showResult.TabIndex = 190;
-            this.showResult.UseCompatibleStateImageBehavior = false;
-            this.showResult.View = System.Windows.Forms.View.Details;
+            this.pr_detailspec.AutoSize = true;
+            this.pr_detailspec.CutLength = null;
+            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.pr_detailspec.Location = new System.Drawing.Point(176, 513);
+            this.pr_detailspec.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detailspec.Name = "pr_detailspec";
+            this.pr_detailspec.Size = new System.Drawing.Size(0, 39);
+            this.pr_detailspec.TabIndex = 182;
             // 
-            // columnHeader1
+            // pa_prodcode
             // 
-            this.columnHeader1.Text = "";
-            this.columnHeader1.Width = 69;
+            this.pa_prodcode.AutoSize = true;
+            this.pa_prodcode.CutLength = null;
+            this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.pa_prodcode.Location = new System.Drawing.Point(176, 445);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_prodcode.Name = "pa_prodcode";
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
+            this.pa_prodcode.TabIndex = 181;
+            this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
             // 
-            // columnHeader2
+            // pa_totalqty
             // 
-            this.columnHeader2.Text = "栈板号";
-            this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 150;
+            this.pa_totalqty.AutoSize = true;
+            this.pa_totalqty.CutLength = null;
+            this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_totalqty.Name = "pa_totalqty";
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
+            this.pa_totalqty.TabIndex = 180;
             // 
-            // columnHeader3
+            // pa_makecode
             // 
-            this.columnHeader3.Text = "重量";
-            this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader3.Width = 159;
+            this.pa_makecode.AutoSize = true;
+            this.pa_makecode.CutLength = null;
+            this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F);
+            this.pa_makecode.Location = new System.Drawing.Point(176, 317);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_makecode.Name = "pa_makecode";
+            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_makecode.TabIndex = 179;
             // 
-            // columnHeader4
+            // printNum
             // 
-            this.columnHeader4.Text = "称量时间";
-            this.columnHeader4.Width = 96;
+            this.printNum.AllPower = null;
+            this.printNum.BackColor = System.Drawing.Color.White;
+            this.printNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.printNum.ID = null;
+            this.printNum.Location = new System.Drawing.Point(1139, 187);
+            this.printNum.Name = "printNum";
+            this.printNum.Negative = false;
+            this.printNum.Power = null;
+            this.printNum.Size = new System.Drawing.Size(196, 28);
+            this.printNum.Str = null;
+            this.printNum.Str1 = null;
+            this.printNum.Str2 = null;
+            this.printNum.TabIndex = 178;
+            this.printNum.Text = "1";
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Location = new System.Drawing.Point(33, 574);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(663, 310);
+            this.OperateResult.TabIndex = 175;
+            this.OperateResult.Text = "";
+            // 
+            // Printer
+            // 
+            this.Printer.Font = new System.Drawing.Font("宋体", 9F);
+            this.Printer.Location = new System.Drawing.Point(1139, 24);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Name = "Printer";
+            this.Printer.Size = new System.Drawing.Size(196, 33);
+            this.Printer.TabIndex = 163;
+            // 
+            // palletcode
+            // 
+            this.palletcode.AllPower = null;
+            this.palletcode.BackColor = System.Drawing.Color.White;
+            this.palletcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.palletcode.ID = null;
+            this.palletcode.Location = new System.Drawing.Point(183, 14);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(4);
+            this.palletcode.Name = "palletcode";
+            this.palletcode.Power = null;
+            this.palletcode.Size = new System.Drawing.Size(416, 55);
+            this.palletcode.Str = null;
+            this.palletcode.Str1 = null;
+            this.palletcode.Str2 = null;
+            this.palletcode.TabIndex = 94;
+            this.palletcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.palletcode_KeyDown);
             // 
             // Make_PalletWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1451, 896);
+            this.ClientSize = new System.Drawing.Size(1403, 902);
+            this.Controls.Add(this.ComList);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.BaudRate);
-            this.Controls.Add(this.ComList);
             this.Controls.Add(this.stopWeigh);
             this.Controls.Add(this.startWeigh);
             this.Controls.Add(this.weightedNum);
@@ -573,11 +577,11 @@
         private CustomControl.ButtonUtil.NormalButton startWeigh;
         private CustomControl.ButtonUtil.NormalButton stopWeigh;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox BaudRate;
-        private CustomControl.ComBoxWithFocus.SerialPortCombox ComList;
         private System.Windows.Forms.ListView showResult;
         private System.Windows.Forms.ColumnHeader columnHeader1;
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
+        private CustomControl.ValueLabel.ValueLabel ComList;
     }
 }

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -110,8 +110,8 @@ namespace UAS_MES.Make
                         sql.Clear();
                         sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid,mp_stepcode,mp_stepname ,");
                         sql.Append("mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,");
-                        sql.Append("mp_snoutboxcode) values ( makeprocess_seq.nextval,:makecode,:ma_id,:craftcode,:craftname,'栈板称重','称重");
-                        sql.Append("成功',:result,sysdate,:inman,:workcenter,:linecode,:source,:palletcode) ");
+                        sql.Append("mp_snoutboxcode) values ( makeprocess_seq.nextval,:makecode,:ma_id,:craftcode,:craftname,'栈板称重','称重成功'");
+                        sql.Append(",:result,sysdate,:inman,:workcenter,:linecode,:source,:palletcode) ");
                         dh.ExecuteSql(sql.GetString(), "insert", pa_makecode.Text, info.Rows[0]["ma_id"].ToString(), User.CurrentStepCode, User.CurrentStepName, "栈板号:" + palletcode.Text + ",重量:" + weight.Text + "克", User.UserName, info.Rows[0]["ma_wccode"].ToString(), User.UserLineCode, User.UserSourceCode, palletcode.Text);
                         //提示信息栏显示:<< 栈板号:XXXX,重量:xxxx 克,
                         OperateResult.AppendText("<<栈板号:" + palletcode.Text + ",重量:" + weight.Text + "克\n", Color.Green);

+ 6 - 6
UAS-MES/FunctionCode/Make/Make_PalletWeigh.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="startWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="stopWeigh.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="startWeigh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="stopWeigh.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="startWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="stopWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -156,7 +156,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="stopWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="startWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -168,7 +168,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="stopWeigh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="startWeigh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -181,7 +181,7 @@
         gg==
 </value>
   </data>
-  <data name="stopWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="startWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE