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

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

@@ -40,12 +40,12 @@
             this.label10 = new System.Windows.Forms.Label();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.pr_detailspec = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             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.pr_detailspec = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithTextArea();
             this.SuspendLayout();
             // 
             // label1
@@ -168,17 +168,6 @@
             this.OperateResult.TabIndex = 10;
             this.OperateResult.Text = "";
             // 
-            // pr_detailspec
-            // 
-            this.pr_detailspec.AutoSize = true;
-            this.pr_detailspec.CutLength = null;
-            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detailspec.Location = new System.Drawing.Point(992, 30);
-            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, 31);
-            this.pr_detailspec.TabIndex = 9;
-            // 
             // showResult
             // 
             this.showResult.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -216,16 +205,27 @@
             this.columnHeader4.Text = "结果";
             this.columnHeader4.Width = 96;
             // 
+            // pr_detailspec
+            // 
+            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.pr_detailspec.Location = new System.Drawing.Point(985, 30);
+            this.pr_detailspec.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.pr_detailspec.Name = "pr_detailspec";
+            this.pr_detailspec.Size = new System.Drawing.Size(242, 38);
+            this.pr_detailspec.TabIndex = 196;
+            this.pr_detailspec.TextAreaEnable = false;
+            this.pr_detailspec.TextBoxEnable = false;
+            // 
             // Make_LabelCheck
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1329, 651);
+            this.Controls.Add(this.pr_detailspec);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.pr_detailspec);
             this.Controls.Add(this.remain_qty);
             this.Controls.Add(this.mcd_okqty);
             this.Controls.Add(this.ma_prodcode);
@@ -257,7 +257,6 @@
         private System.Windows.Forms.Label ma_prodcode;
         private System.Windows.Forms.Label mcd_okqty;
         private System.Windows.Forms.Label remain_qty;
-        private CustomControl.ValueLabel.ValueLabel pr_detailspec;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label label10;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
@@ -266,5 +265,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
+        private CustomControl.TextBoxWithIcon.TextBoxWithTextArea pr_detailspec;
     }
 }

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

@@ -50,7 +50,6 @@
             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.pr_detailspec = new System.Windows.Forms.Label();
             this.autoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.ComList = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.BaudRate = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
@@ -66,6 +65,7 @@
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.palletcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pa_prodcode = new System.Windows.Forms.Label();
+            this.pr_detailspec = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithTextArea();
             this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -75,10 +75,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(41, 78);
+            this.panel4.Location = new System.Drawing.Point(46, 94);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(491, 154);
+            this.panel4.Size = new System.Drawing.Size(552, 184);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,10 +87,10 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(409, 62);
+            this.pr_cartonunit.Location = new System.Drawing.Point(460, 74);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -100,10 +100,10 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 62);
+            this.label22.Location = new System.Drawing.Point(22, 74);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(75, 38);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -115,20 +115,20 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(139, 52);
+            this.weight.Location = new System.Drawing.Point(156, 62);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 58);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(41, 12);
+            this.label15.Location = new System.Drawing.Point(46, 14);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(107, 39);
+            this.label15.Size = new System.Drawing.Size(128, 46);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -136,10 +136,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(869, 78);
+            this.label1.Location = new System.Drawing.Point(978, 94);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -147,10 +147,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(869, 18);
+            this.Printer_label.Location = new System.Drawing.Point(978, 22);
             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(112, 27);
+            this.Printer_label.Size = new System.Drawing.Size(134, 31);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -159,10 +159,10 @@
             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(1000, 82);
+            this.PrintLabel.Location = new System.Drawing.Point(1125, 98);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(175, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(196, 26);
             this.PrintLabel.TabIndex = 162;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -170,9 +170,9 @@
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(869, 142);
+            this.printNum_label.Location = new System.Drawing.Point(978, 170);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(52, 27);
+            this.printNum_label.Size = new System.Drawing.Size(62, 31);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -180,9 +180,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(35, 262);
+            this.label2.Location = new System.Drawing.Point(39, 314);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(90, 32);
+            this.label2.Size = new System.Drawing.Size(107, 39);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -190,9 +190,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(35, 315);
+            this.label3.Location = new System.Drawing.Point(39, 378);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(115, 32);
+            this.label3.Size = new System.Drawing.Size(137, 39);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -200,9 +200,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label4.Location = new System.Drawing.Point(35, 372);
+            this.label4.Location = new System.Drawing.Point(39, 446);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(115, 32);
+            this.label4.Size = new System.Drawing.Size(137, 39);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -210,9 +210,9 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(35, 428);
+            this.label5.Location = new System.Drawing.Point(39, 514);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(115, 32);
+            this.label5.Size = new System.Drawing.Size(137, 39);
             this.label5.TabIndex = 172;
             this.label5.Text = "名称规格";
             // 
@@ -220,9 +220,9 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(381, 262);
+            this.label6.Location = new System.Drawing.Point(429, 314);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(115, 32);
+            this.label6.Size = new System.Drawing.Size(137, 39);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -230,9 +230,9 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(381, 315);
+            this.label7.Location = new System.Drawing.Point(429, 378);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(115, 32);
+            this.label7.Size = new System.Drawing.Size(137, 39);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -240,9 +240,9 @@
             // 
             this.label8.AutoSize = true;
             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(869, 208);
+            this.label8.Location = new System.Drawing.Point(978, 250);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(52, 27);
+            this.label8.Size = new System.Drawing.Size(62, 31);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -254,10 +254,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(684, 315);
+            this.showResult.Location = new System.Drawing.Point(770, 378);
             this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(520, 422);
+            this.showResult.Size = new System.Drawing.Size(584, 506);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -284,33 +284,24 @@
             this.columnHeader4.Text = "称量时间";
             this.columnHeader4.Width = 160;
             // 
-            // pr_detailspec
-            // 
-            this.pr_detailspec.AutoSize = true;
-            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pr_detailspec.Location = new System.Drawing.Point(156, 428);
-            this.pr_detailspec.Name = "pr_detailspec";
-            this.pr_detailspec.Size = new System.Drawing.Size(0, 32);
-            this.pr_detailspec.TabIndex = 192;
-            // 
             // autoPrint
             // 
             this.autoPrint.Checked = false;
-            this.autoPrint.Location = new System.Drawing.Point(875, 262);
-            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.autoPrint.Location = new System.Drawing.Point(984, 314);
+            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(125, 34);
+            this.autoPrint.Size = new System.Drawing.Size(141, 41);
             this.autoPrint.TabIndex = 193;
             // 
             // ComList
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(595, 152);
+            this.ComList.Location = new System.Drawing.Point(669, 182);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(63, 15);
+            this.ComList.Size = new System.Drawing.Size(71, 18);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -320,12 +311,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(596, 112);
+            this.BaudRate.Location = new System.Drawing.Point(670, 134);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(159, 25);
+            this.BaudRate.Size = new System.Drawing.Size(178, 28);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -339,13 +330,13 @@
             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(684, 18);
+            this.stopWeigh.Location = new System.Drawing.Point(770, 22);
             this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(96, 32);
+            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -358,13 +349,13 @@
             this.startWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.DownImage")));
             this.startWeigh.Image = null;
             this.startWeigh.IsShowBorder = true;
-            this.startWeigh.Location = new System.Drawing.Point(579, 18);
+            this.startWeigh.Location = new System.Drawing.Point(651, 22);
             this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.startWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.MoveImage")));
             this.startWeigh.Name = "startWeigh";
             this.startWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.NormalImage")));
             this.startWeigh.Power = null;
-            this.startWeigh.Size = new System.Drawing.Size(83, 32);
+            this.startWeigh.Size = new System.Drawing.Size(93, 38);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
@@ -376,12 +367,12 @@
             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(997, 208);
+            this.weightedNum.Location = new System.Drawing.Point(1122, 250);
             this.weightedNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.weightedNum.Name = "weightedNum";
             this.weightedNum.Negative = false;
             this.weightedNum.Power = null;
-            this.weightedNum.Size = new System.Drawing.Size(175, 25);
+            this.weightedNum.Size = new System.Drawing.Size(196, 28);
             this.weightedNum.Str = null;
             this.weightedNum.Str1 = null;
             this.weightedNum.Str2 = null;
@@ -393,10 +384,10 @@
             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(499, 315);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(179, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(561, 378);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(201, 0);
             this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 32);
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -404,10 +395,10 @@
             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(499, 262);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(561, 314);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(201, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 32);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_totalqty
@@ -415,10 +406,10 @@
             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(156, 315);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(201, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 32);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -426,10 +417,10 @@
             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(156, 262);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(179, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(176, 314);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(201, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 32);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
             this.pa_makecode.TabIndex = 179;
             // 
             // PrintNum
@@ -439,12 +430,12 @@
             this.PrintNum.Enabled = false;
             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(997, 142);
+            this.PrintNum.Location = new System.Drawing.Point(1122, 170);
             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(175, 25);
+            this.PrintNum.Size = new System.Drawing.Size(196, 28);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -454,20 +445,20 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(29, 478);
+            this.OperateResult.Location = new System.Drawing.Point(33, 574);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(589, 259);
+            this.OperateResult.Size = new System.Drawing.Size(662, 310);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
             this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(997, 20);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(1122, 24);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(173, 28);
+            this.Printer.Size = new System.Drawing.Size(195, 34);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -476,11 +467,11 @@
             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(163, 12);
+            this.palletcode.Location = new System.Drawing.Point(183, 14);
             this.palletcode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(369, 47);
+            this.palletcode.Size = new System.Drawing.Size(415, 55);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -491,19 +482,30 @@
             // 
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(156, 372);
+            this.pa_prodcode.Location = new System.Drawing.Point(176, 446);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 32);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
             this.pa_prodcode.TabIndex = 194;
             // 
+            // pr_detailspec
+            // 
+            this.pr_detailspec.Font = new System.Drawing.Font("微软雅黑", 10.5F);
+            this.pr_detailspec.Location = new System.Drawing.Point(179, 515);
+            this.pr_detailspec.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+            this.pr_detailspec.Name = "pr_detailspec";
+            this.pr_detailspec.Size = new System.Drawing.Size(242, 38);
+            this.pr_detailspec.TabIndex = 197;
+            this.pr_detailspec.TextAreaEnable = false;
+            this.pr_detailspec.TextBoxEnable = false;
+            // 
             // Make_PalletWeigh
             // 
-            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(1245, 752);
+            this.ClientSize = new System.Drawing.Size(1401, 902);
+            this.Controls.Add(this.pr_detailspec);
             this.Controls.Add(this.pa_prodcode);
             this.Controls.Add(this.autoPrint);
-            this.Controls.Add(this.pr_detailspec);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.BaudRate);
@@ -539,9 +541,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PalletWeigh_FormClosing);
             this.Load += new System.EventHandler(this.Make_PalletWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.Make_PalletWeigh_SizeChanged);
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -582,8 +584,8 @@
         private System.Windows.Forms.ColumnHeader columnHeader3;
         private System.Windows.Forms.ColumnHeader columnHeader4;
         private CustomControl.ValueLabel.ValueLabel ComList;
-        private System.Windows.Forms.Label pr_detailspec;
         private CustomControl.CustomCheckBox.AutoPrintCheckBox autoPrint;
         private System.Windows.Forms.Label pa_prodcode;
+        private CustomControl.TextBoxWithIcon.TextBoxWithTextArea pr_detailspec;
     }
 }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1155,7 +1155,19 @@ namespace UAS_MES.PublicMethod
                     break;
                 case "RULE":
                     int sp_length = int.Parse(iLength != "" ? iLength : "0");
-                    if (iSN.StartsWith(iPrefix) || iPrefix == "")
+                    //若有多个，以|分割
+                    string[] pres = iPrefix.Split('|');
+                    bool f = false;
+                    for (int i=0;i<pres.Length;i++)
+                    {
+                        if (pres[i] == "" ? true : iSN.StartsWith(pres[i]))
+                        {
+                            //满足其中一条即可
+                            f = true;
+                            break;
+                        }
+                    }
+                    if (f)
                     {
                         //进行长度匹配
                         if (iSN.Length == sp_length || sp_length == 0)

UAS_AutoPass/AutoAnalysisXml.cs

@@ -146,6 +146,7 @@ namespace UAS_AutoPass
                 {
                     DataHelper.DBConnectionString = "Data Source=" + DB.Rows[i]["ma_address"] + ";User ID=" + DB.Rows[i]["ma_user"] + ";PassWord=" + DB.Rows[i]["ms_pwd"]; ;
                     dh = new DataHelper();
+                    LogicHandler.dh = new DataHelper();
                 }
             }
             //存在工单必须是已下放状态
@@ -165,6 +166,7 @@ namespace UAS_AutoPass
             //设置按钮不可点击
             StartWatch.Enabled = false;
             ChooseFolder.Enabled = false;
+            Master.Enabled = false;
             ma_code.Enabled = false;
             ChooseBackUpFolder.Enabled = false;
             StopWatch.Enabled = true;
@@ -362,6 +364,7 @@ namespace UAS_AutoPass
             XmlWatcher.EnableRaisingEvents = false;
             StartWatch.Enabled = true;
             ma_code.Enabled = true;
+            Master.Enabled = true;
             ChooseFolder.Enabled = true;
             ChooseBackUpFolder.Enabled = true;
             StopWatch.Enabled = false;

UAS_AutoPass/ToolClass/LogicHandler.cs

@@ -7,7 +7,7 @@ namespace UAS_AutoPass.ToolClass
     {
         public LogicHandler() { }
 
-        static DataHelper dh = new DataHelper();
+        public static DataHelper dh = new DataHelper();
         //用于拼接SQL
         static StringBuilder sql = new StringBuilder();
         //用于存放批量执行的SQL