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

UAS-MES/DataOperate/ExcelHandler.cs

@@ -158,7 +158,7 @@ namespace UAS_MES.DataOperate
             string Title = "";
             foreach (DataColumn dc in dt.Columns)
             {
-                Title += String.Format("{0,15}", dc.ColumnName.ToString());
+                Title += String.Format("{0,10}", dc.ColumnName.ToString());
             }
             sr.WriteLine(Title + "\r");
             foreach (DataRow dr in dt.Rows)
@@ -166,7 +166,7 @@ namespace UAS_MES.DataOperate
                 string text = "";
                 for (int i = 0; i < dt.Columns.Count; i++)
                 {
-                    text += String.Format("{0,15}", dr[i].ToString());
+                    text += String.Format("{0,10}", dr[i].ToString());
                 }
                 sr.WriteLine(text + "\r");
             }

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

@@ -45,16 +45,18 @@
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(688, 27);
+            this.pr_detail_label.Location = new System.Drawing.Point(612, 22);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 206;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -64,10 +66,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(38, 621);
+            this.sncode_label.Location = new System.Drawing.Point(34, 517);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(86, 31);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 205;
             this.sncode_label.Text = "录入框";
             // 
@@ -75,10 +77,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(344, 87);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(306, 72);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(86, 31);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 202;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -86,10 +88,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(40, 87);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(36, 72);
             this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 201;
             this.mcd_okqty_label.Text = "采集计数";
             // 
@@ -97,10 +99,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(344, 27);
+            this.pr_code_label.Location = new System.Drawing.Point(306, 22);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 200;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -108,20 +110,19 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(40, 27);
+            this.ms_makecode_label.Location = new System.Drawing.Point(36, 22);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 199;
             this.ms_makecode_label.Text = "工单编号";
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(694, 84);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Location = new System.Drawing.Point(617, 70);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Size = new System.Drawing.Size(106, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 214;
@@ -133,13 +134,13 @@
             this.DeleteButton.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.DownImage")));
             this.DeleteButton.Image = null;
             this.DeleteButton.IsShowBorder = true;
-            this.DeleteButton.Location = new System.Drawing.Point(447, 621);
-            this.DeleteButton.Margin = new System.Windows.Forms.Padding(4);
+            this.DeleteButton.Location = new System.Drawing.Point(397, 517);
+            this.DeleteButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.DeleteButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.MoveImage")));
             this.DeleteButton.Name = "DeleteButton";
             this.DeleteButton.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.NormalImage")));
             this.DeleteButton.Power = null;
-            this.DeleteButton.Size = new System.Drawing.Size(90, 36);
+            this.DeleteButton.Size = new System.Drawing.Size(80, 30);
             this.DeleteButton.TabIndex = 213;
             this.DeleteButton.Text = "取消";
             this.DeleteButton.UseVisualStyleBackColor = false;
@@ -150,20 +151,20 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(160, 27);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(142, 22);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 31);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 212;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(470, 87);
+            this.mcd_remainqty.Location = new System.Drawing.Point(418, 72);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 210;
             this.mcd_remainqty.Text = "0";
             // 
@@ -171,10 +172,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(160, 87);
+            this.mcd_okqty.Location = new System.Drawing.Point(142, 72);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 209;
             this.mcd_okqty.Text = "0";
             // 
@@ -183,11 +184,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(470, 33);
+            this.ma_prodcode.Location = new System.Drawing.Point(418, 27);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 208;
             // 
             // pr_detail
@@ -195,11 +196,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(816, 27);
+            this.pr_detail.Location = new System.Drawing.Point(725, 22);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(267, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 207;
             // 
             // sncode
@@ -209,11 +210,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(132, 624);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(117, 520);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(260, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -224,18 +225,44 @@
             // 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(18, 146);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(16, 122);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 456);
+            this.OperateResult.Size = new System.Drawing.Size(704, 381);
             this.OperateResult.TabIndex = 203;
             this.OperateResult.Text = "";
             // 
+            // CollectRemark
+            // 
+            this.CollectRemark.AutoSize = true;
+            this.CollectRemark.Checked = true;
+            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CollectRemark.Location = new System.Drawing.Point(733, 127);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Name = "CollectRemark";
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.TabIndex = 216;
+            this.CollectRemark.Text = "采集备注";
+            this.CollectRemark.UseVisualStyleBackColor = true;
+            // 
+            // Remark
+            // 
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark.Location = new System.Drawing.Point(728, 161);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(245, 99);
+            this.Remark.TabIndex = 215;
+            this.Remark.Text = "";
+            // 
             // Make_CollectBTMAC
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1110, 672);
+            this.ClientSize = new System.Drawing.Size(987, 560);
+            this.Controls.Add(this.CollectRemark);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.DeleteButton);
             this.Controls.Add(this.ms_makecode);
@@ -252,13 +279,14 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_CollectBTMAC";
             this.Tag = "Make!CollectBTMAC";
             this.Text = "BT/MAC采集";
             this.Activated += new System.EventHandler(this.Make_CollectBTMAC_Activated);
             this.Load += new System.EventHandler(this.Make_CollectBTMAC_Load);
             this.SizeChanged += new System.EventHandler(this.Make_CollectBTMAC_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -280,5 +308,7 @@
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.ButtonUtil.NormalButton DeleteButton;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CollectRemark;
+        private CustomControl.RichText.RichTextAutoBottom Remark;
     }
 }

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -92,7 +92,7 @@ namespace UAS_MES.Make
                 sncode.Text = sncode.Text.Trim().Substring(0, 40);
             }
             //则判断输入转换前的序列号长度是否合法，不合法则提示
-            if (sncode.Text.Trim().Length != psr_length && psr_length!=0)
+            if (sncode.Text.Trim().Length != psr_length && psr_length != 0)
             {
                 //序列号校验错误，长度错误
                 OperateResult.AppendText("<<" + TSNorSN + ":" + sncode.Text + "校验错误，长度错误\n", Color.Red, sncode);
@@ -140,7 +140,7 @@ namespace UAS_MES.Make
                         }
                         if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage2))
                         {
-                             OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
+                            OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                             // 获取工单归属工单下一工序是否正确
                             if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                             {
@@ -213,7 +213,7 @@ namespace UAS_MES.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (!(dt.Rows.Count > 0))
                             {
-                                OperateResult.AppendText(">>BT号" + checkbt + "不符合工单导入要求\n", Color.Red,sncode);
+                                OperateResult.AppendText(">>BT号" + checkbt + "不符合工单导入要求\n", Color.Red, sncode);
                                 return;
                             }
                         }
@@ -248,7 +248,7 @@ namespace UAS_MES.Make
                         }
                         if (dh.CheckExist("sninfo", "si_bt = '" + checkbt + "'"))
                         {
-                            OperateResult.AppendText(">>录入错误，此BT:" + checkbt + "已被"+dh.getFieldDataByCondition("sninfo", "si_sn", "si_bt = '"+ checkbt + "'").ToString() +"使用\n", Color.Red, sncode);
+                            OperateResult.AppendText(">>录入错误，此BT:" + checkbt + "已被" + dh.getFieldDataByCondition("sninfo", "si_sn", "si_bt = '" + checkbt + "'").ToString() + "使用\n", Color.Red, sncode);
                             OperateResult.AppendText(">>请输入BT\n", Color.Black);
                             return;
                         }
@@ -351,17 +351,22 @@ namespace UAS_MES.Make
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                            string si_id = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", " si_sn in (select '"+ sn_code + "' from dual union select sn from makesnrelation where beforesn = '" + sn_code + "' and sn <> ' '  union select beforesn from makesnrelation where sn = '" + sn_code + "' and beforesn <> ' ') ").ToString();
+                            string si_id = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", " si_sn in (select '" + sn_code + "' from dual union select sn from makesnrelation where beforesn = '" + sn_code + "' and sn <> ' '  union select beforesn from makesnrelation where sn = '" + sn_code + "' and beforesn <> ' ') ").ToString();
                             if (si_id != "")
                             {
                                 dh.BatchInsert("update  sninfo set si_mac = :mac,si_bt =:bt,si_indate = sysdate where si_id = :osiId", new String[] { "mac", "bt", "osiId" }, new string[] { checkmac }, new string[] { ms_bt }, new string[] { si_id });
                             }
-                            else {
+                            else
+                            {
                                 dh.BatchInsert("insert into sninfo (si_id,si_sn,si_mac,si_bt,si_indate) values (SnInfo_seq.nextval,:si_sn,:si_mac,:si_bt,sysdate)", new String[] { "si_sn", "si_mac", "si_bt" }, new string[] { sn_code }, new string[] { checkmac }, new string[] { ms_bt });
                             }
                             dh.BatchInsert("update  makeserial set ms_mac = :mac,ms_bt =:bt where ms_id = :oMsId", new String[] { "mac", "bt", "oMsId" }, new string[] { checkmac }, new string[] { ms_bt }, new string[] { oMsID.ToString() });
                             OperateResult.AppendText(">>BT/MAC采集完成,执行更新\n", Color.Green);
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "BT/MAC采集", "采集成功", sn_code, "");
+                            if (CollectRemark.Checked && Remark.Text != "")
+                            {
+                                LogicHandler.CollectRemarkInf(sn_code, "", "", ms_makecode.Text, ma_prodcode.Text, Remark.Text);
+                            }
                             sql.Clear();
                             sql.Append("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
                             sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");

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

@@ -51,10 +51,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(678, 33);
+            this.pr_detail_label.Location = new System.Drawing.Point(603, 27);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 191;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -64,10 +64,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(21, 633);
+            this.sncode_label.Location = new System.Drawing.Point(19, 527);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(86, 31);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 190;
             this.sncode_label.Text = "录入框";
             // 
@@ -75,10 +75,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(354, 106);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(315, 88);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(86, 31);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 187;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -86,10 +86,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(9, 106);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(8, 88);
             this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 186;
             this.mcd_okqty_label.Text = "采集计数";
             // 
@@ -97,10 +97,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(354, 33);
+            this.pr_code_label.Location = new System.Drawing.Point(315, 27);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 185;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -108,20 +108,19 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(9, 33);
+            this.ms_makecode_label.Location = new System.Drawing.Point(8, 27);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 184;
             this.ms_makecode_label.Text = "工单编号";
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(684, 106);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Location = new System.Drawing.Point(608, 88);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Size = new System.Drawing.Size(106, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 200;
@@ -133,13 +132,13 @@
             this.Delete.DownImage = ((System.Drawing.Image)(resources.GetObject("Delete.DownImage")));
             this.Delete.Image = null;
             this.Delete.IsShowBorder = true;
-            this.Delete.Location = new System.Drawing.Point(574, 633);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4);
+            this.Delete.Location = new System.Drawing.Point(510, 527);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
             this.Delete.Name = "Delete";
             this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
             this.Delete.Power = null;
-            this.Delete.Size = new System.Drawing.Size(112, 42);
+            this.Delete.Size = new System.Drawing.Size(100, 35);
             this.Delete.TabIndex = 199;
             this.Delete.Text = "取消";
             this.Delete.UseVisualStyleBackColor = false;
@@ -150,20 +149,20 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(138, 33);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(123, 27);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 31);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 198;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(477, 106);
+            this.mcd_remainqty.Location = new System.Drawing.Point(424, 88);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 195;
             this.mcd_remainqty.Text = "0";
             // 
@@ -171,10 +170,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(138, 106);
+            this.mcd_okqty.Location = new System.Drawing.Point(123, 88);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 194;
             this.mcd_okqty.Text = "0";
             // 
@@ -183,11 +182,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(477, 33);
+            this.ma_prodcode.Location = new System.Drawing.Point(424, 27);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(267, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 193;
             // 
             // pr_detail
@@ -195,11 +194,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(812, 33);
+            this.pr_detail.Location = new System.Drawing.Point(722, 27);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(267, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 192;
             // 
             // sncode
@@ -209,11 +208,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(146, 636);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(130, 530);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(260, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -224,18 +223,18 @@
             // 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(15, 159);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(13, 132);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 456);
+            this.OperateResult.Size = new System.Drawing.Size(736, 381);
             this.OperateResult.TabIndex = 188;
             this.OperateResult.Text = "";
             // 
             // Make_CollectNetCode
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1112, 680);
+            this.ClientSize = new System.Drawing.Size(988, 567);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.Delete);
             this.Controls.Add(this.ms_makecode);
@@ -252,6 +251,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_CollectNetCode";
             this.Tag = "Make!CollectNetCode";
             this.Text = "网标采集";

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

@@ -51,16 +51,18 @@
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
             // PrintLabel
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1184, 293);
+            this.PrintLabel.Location = new System.Drawing.Point(1052, 244);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(199, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(177, 23);
             this.PrintLabel.TabIndex = 181;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -68,10 +70,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1088, 216);
+            this.label2.Location = new System.Drawing.Point(967, 180);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 31);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -79,10 +81,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1088, 293);
+            this.label1.Location = new System.Drawing.Point(967, 244);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 31);
+            this.label1.Size = new System.Drawing.Size(52, 27);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -90,10 +92,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(969, 64);
+            this.pr_detail_label.Location = new System.Drawing.Point(861, 53);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -103,10 +105,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(393, 670);
+            this.sncode_label.Location = new System.Drawing.Point(349, 558);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(106, 31);
+            this.sncode_label.Size = new System.Drawing.Size(88, 27);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "TSN/SN";
             // 
@@ -114,10 +116,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(969, 133);
+            this.label4.Location = new System.Drawing.Point(861, 111);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 31);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -125,10 +127,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(562, 126);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(500, 105);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(86, 31);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -136,10 +138,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(18, 126);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(16, 105);
             this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -147,10 +149,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(562, 62);
+            this.pr_code_label.Location = new System.Drawing.Point(500, 52);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -158,10 +160,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(15, 62);
+            this.ms_makecode_label.Location = new System.Drawing.Point(13, 52);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -171,10 +173,10 @@
             this.CheckTSN.Checked = true;
             this.CheckTSN.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckTSN.Location = new System.Drawing.Point(48, 667);
-            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.CheckTSN.Location = new System.Drawing.Point(43, 556);
+            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4);
             this.CheckTSN.Name = "CheckTSN";
-            this.CheckTSN.Size = new System.Drawing.Size(184, 35);
+            this.CheckTSN.Size = new System.Drawing.Size(153, 31);
             this.CheckTSN.TabIndex = 186;
             this.CheckTSN.Text = "是否检查TSN";
             this.CheckTSN.UseVisualStyleBackColor = true;
@@ -183,10 +185,9 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1094, 368);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Location = new System.Drawing.Point(972, 307);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Size = new System.Drawing.Size(106, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 189;
@@ -196,10 +197,10 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(374, 62);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.LockMakeCode.Location = new System.Drawing.Point(332, 52);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 185;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -211,14 +212,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(135, 62);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ma_code.Location = new System.Drawing.Point(120, 52);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(224, 31);
+            this.ma_code.Size = new System.Drawing.Size(199, 26);
             this.ma_code.TabIndex = 184;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = true;
@@ -226,20 +227,20 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1184, 216);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(1052, 180);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(201, 37);
+            this.Printer.Size = new System.Drawing.Size(179, 31);
             this.Printer.TabIndex = 178;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(694, 126);
+            this.mcd_remainqty.Location = new System.Drawing.Point(617, 105);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -247,10 +248,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(129, 126);
+            this.mcd_okqty.Location = new System.Drawing.Point(115, 105);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -259,11 +260,11 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(694, 64);
+            this.pr_code.Location = new System.Drawing.Point(617, 53);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 31);
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
             this.pr_code.TabIndex = 175;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -272,11 +273,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(1101, 62);
+            this.pr_detail.Location = new System.Drawing.Point(979, 52);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -285,12 +286,12 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1101, 133);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Location = new System.Drawing.Point(979, 111);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(223, 28);
+            this.PrintNum.Size = new System.Drawing.Size(199, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -304,11 +305,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(526, 671);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sncode.Location = new System.Drawing.Point(468, 559);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(260, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -319,18 +320,44 @@
             // 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(21, 193);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(19, 161);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1057, 455);
+            this.OperateResult.Size = new System.Drawing.Size(940, 380);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
+            // CollectRemark
+            // 
+            this.CollectRemark.AutoSize = true;
+            this.CollectRemark.Checked = true;
+            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CollectRemark.Location = new System.Drawing.Point(972, 361);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Name = "CollectRemark";
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.TabIndex = 197;
+            this.CollectRemark.Text = "采集备注";
+            this.CollectRemark.UseVisualStyleBackColor = true;
+            // 
+            // Remark
+            // 
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark.Location = new System.Drawing.Point(967, 395);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(271, 99);
+            this.Remark.TabIndex = 196;
+            this.Remark.Text = "";
+            // 
             // Make_ColorBoxLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1407, 720);
+            this.ClientSize = new System.Drawing.Size(1251, 600);
+            this.Controls.Add(this.CollectRemark);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.CheckTSN);
             this.Controls.Add(this.LockMakeCode);
@@ -354,7 +381,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_ColorBoxLabelPrint";
             this.Tag = "Make!ColorBoxLabelPrint";
             this.Text = "标签打印";
@@ -362,7 +389,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLabelPrint_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxLabelPrint_Load);
             this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLabelPrint_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -391,5 +418,7 @@
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private System.Windows.Forms.CheckBox CheckTSN;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CollectRemark;
+        private CustomControl.RichText.RichTextAutoBottom Remark;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -247,6 +247,10 @@ namespace UAS_MES.Make
                                     {
                                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                     }
+                                    if (CollectRemark.Checked && Remark.Text != "")
+                                    {
+                                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
+                                    }
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒打印", "彩盒打印成功", sncode.Text, "");
                                     //刷新打印数量和剩余数量
                                     dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,mcd_okqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");

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

@@ -92,9 +92,10 @@
             // 
             this.pr_colorboxgw_label.AutoSize = true;
             this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw_label.Location = new System.Drawing.Point(16, 217);
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(21, 271);
+            this.pr_colorboxgw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw_label.Name = "pr_colorboxgw_label";
-            this.pr_colorboxgw_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_colorboxgw_label.Size = new System.Drawing.Size(115, 32);
             this.pr_colorboxgw_label.TabIndex = 42;
             this.pr_colorboxgw_label.Text = "标准重量";
             // 
@@ -102,9 +103,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(16, 307);
+            this.pr_code_label.Location = new System.Drawing.Point(21, 384);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -114,9 +116,10 @@
             this.pr_colorboxunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_colorboxunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_colorboxunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_colorboxunit.Location = new System.Drawing.Point(16, 98);
+            this.pr_colorboxunit.Location = new System.Drawing.Point(21, 122);
+            this.pr_colorboxunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxunit.Name = "pr_colorboxunit";
-            this.pr_colorboxunit.Size = new System.Drawing.Size(31, 25);
+            this.pr_colorboxunit.Size = new System.Drawing.Size(38, 31);
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             this.pr_colorboxunit.Visible = false;
@@ -127,9 +130,10 @@
             this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.weight_label.Location = new System.Drawing.Point(16, 52);
+            this.weight_label.Location = new System.Drawing.Point(21, 65);
+            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight_label.Name = "weight_label";
-            this.weight_label.Size = new System.Drawing.Size(50, 25);
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
             this.weight_label.TabIndex = 20;
             this.weight_label.Text = "重量";
             // 
@@ -138,9 +142,10 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.Green;
-            this.weight.Location = new System.Drawing.Point(86, 30);
+            this.weight.Location = new System.Drawing.Point(115, 38);
+            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 60);
+            this.weight.Size = new System.Drawing.Size(0, 78);
             this.weight.TabIndex = 41;
             // 
             // panel4
@@ -149,19 +154,20 @@
             this.panel4.Controls.Add(this.pr_colorboxunit);
             this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(16, 78);
-            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel4.Location = new System.Drawing.Point(21, 98);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(346, 124);
+            this.panel4.Size = new System.Drawing.Size(461, 154);
             this.panel4.TabIndex = 63;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 20F);
-            this.label15.Location = new System.Drawing.Point(8, 18);
+            this.label15.Location = new System.Drawing.Point(11, 22);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(96, 35);
+            this.label15.Size = new System.Drawing.Size(122, 45);
             this.label15.TabIndex = 56;
             this.label15.Text = "条码号";
             // 
@@ -169,9 +175,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(16, 402);
+            this.pr_detail_label.Location = new System.Drawing.Point(21, 502);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
             this.pr_detail_label.TabIndex = 53;
             this.pr_detail_label.Text = "产品型号";
             // 
@@ -179,9 +186,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(16, 447);
+            this.ma_qty_label.Location = new System.Drawing.Point(21, 559);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
             this.ma_qty_label.TabIndex = 55;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -189,9 +197,10 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(16, 355);
+            this.ma_salecode_label.Location = new System.Drawing.Point(21, 444);
+            this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
             this.ma_salecode_label.TabIndex = 54;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -199,9 +208,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(16, 261);
+            this.ms_makecode_label.Location = new System.Drawing.Point(21, 326);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(115, 32);
             this.ms_makecode_label.TabIndex = 72;
             this.ms_makecode_label.Text = "制造单号";
             // 
@@ -209,10 +219,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(878, 118);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(1171, 148);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(120, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(159, 23);
             this.PrintLabel.TabIndex = 159;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -220,9 +230,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(770, 86);
+            this.Printer_label.Location = new System.Drawing.Point(1027, 108);
+            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(84, 20);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 162;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -230,9 +241,10 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(770, 118);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1027, 148);
+            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(69, 20);
+            this.PrintLabel_label.Size = new System.Drawing.Size(88, 25);
             this.PrintLabel_label.TabIndex = 163;
             this.PrintLabel_label.Text = "打印标签";
             // 
@@ -240,9 +252,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(770, 58);
+            this.label1.Location = new System.Drawing.Point(1027, 72);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(69, 20);
+            this.label1.Size = new System.Drawing.Size(88, 25);
             this.label1.TabIndex = 170;
             this.label1.Text = "打印张数";
             // 
@@ -250,9 +263,10 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate.Location = new System.Drawing.Point(884, 32);
+            this.BaudRate.Location = new System.Drawing.Point(1179, 40);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(78, 20);
+            this.BaudRate.Size = new System.Drawing.Size(100, 25);
             this.BaudRate.TabIndex = 171;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
@@ -261,9 +275,10 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(884, 6);
+            this.ComList.Location = new System.Drawing.Point(1179, 8);
+            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(68, 20);
+            this.ComList.Size = new System.Drawing.Size(86, 25);
             this.ComList.TabIndex = 172;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -276,10 +291,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.Location = new System.Drawing.Point(377, 218);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.WeighRecord.Location = new System.Drawing.Point(503, 272);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(381, 334);
+            this.WeighRecord.Size = new System.Drawing.Size(507, 416);
             this.WeighRecord.TabIndex = 173;
             this.WeighRecord.UseCompatibleStateImageBehavior = false;
             this.WeighRecord.View = System.Windows.Forms.View.Details;
@@ -307,9 +322,10 @@
             // pr_sendchecktype
             // 
             this.pr_sendchecktype.AutoSize = true;
-            this.pr_sendchecktype.Location = new System.Drawing.Point(506, 562);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(675, 702);
+            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 12);
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 15);
             this.pr_sendchecktype.TabIndex = 188;
             this.pr_sendchecktype.Visible = false;
             // 
@@ -317,9 +333,10 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(16, 493);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(21, 616);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(115, 32);
             this.mcd_inqty_label.TabIndex = 190;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -327,9 +344,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(16, 536);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(21, 670);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(115, 32);
             this.mcd_remainqty_label.TabIndex = 192;
             this.mcd_remainqty_label.Text = "待采集数";
             // 
@@ -339,9 +357,10 @@
             this.CollectRemark.Checked = true;
             this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(772, 174);
+            this.CollectRemark.Location = new System.Drawing.Point(1029, 218);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(84, 24);
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
             this.CollectRemark.TabIndex = 195;
             this.CollectRemark.Text = "采集备注";
             this.CollectRemark.UseVisualStyleBackColor = true;
@@ -349,10 +368,10 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(768, 202);
-            this.Remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Remark.Location = new System.Drawing.Point(1024, 252);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(240, 80);
+            this.Remark.Size = new System.Drawing.Size(319, 99);
             this.Remark.TabIndex = 194;
             this.Remark.Text = "";
             // 
@@ -361,10 +380,11 @@
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.CutLength = null;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(129, 536);
-            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(172, 670);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 32);
             this.mcd_remainqty.TabIndex = 193;
             // 
             // mcd_inqty
@@ -372,19 +392,20 @@
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.CutLength = null;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(129, 493);
-            this.mcd_inqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_inqty.Location = new System.Drawing.Point(172, 616);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 32);
             this.mcd_inqty.TabIndex = 191;
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(773, 146);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Location = new System.Drawing.Point(1031, 182);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(80, 22);
+            this.StepCount.Size = new System.Drawing.Size(107, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 189;
@@ -396,13 +417,13 @@
             this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
             this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(308, 221);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.RefreshWeigh.Location = new System.Drawing.Point(411, 276);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
             this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
             this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(54, 24);
+            this.RefreshWeigh.Size = new System.Drawing.Size(72, 30);
             this.RefreshWeigh.TabIndex = 177;
             this.RefreshWeigh.Text = "刷新重量";
             this.RefreshWeigh.UseVisualStyleBackColor = true;
@@ -414,11 +435,11 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(878, 58);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintNum.Location = new System.Drawing.Point(1171, 72);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(78, 21);
+            this.PrintNum.Size = new System.Drawing.Size(103, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -435,11 +456,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty_label);
             this.groupBoxWithBorder2.Controls.Add(this.SendCheck);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(377, 78);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(503, 98);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(380, 122);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(507, 152);
             this.groupBoxWithBorder2.TabIndex = 175;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "送检信息";
@@ -449,9 +470,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno_label.Location = new System.Drawing.Point(22, 78);
+            this.ob_checkno_label.Location = new System.Drawing.Point(28, 96);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(82, 24);
+            this.ob_checkno_label.Size = new System.Drawing.Size(101, 30);
             this.ob_checkno_label.TabIndex = 180;
             this.ob_checkno_label.Text = "当前批号";
             // 
@@ -459,9 +481,10 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno.Location = new System.Drawing.Point(116, 78);
+            this.ob_checkno.Location = new System.Drawing.Point(153, 96);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 24);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 30);
             this.ob_checkno.TabIndex = 179;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
@@ -469,27 +492,30 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(291, 32);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(387, 39);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 24);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 30);
             this.ob_nowcheckqty.TabIndex = 178;
             // 
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty.Location = new System.Drawing.Point(116, 32);
+            this.ob_batchqty.Location = new System.Drawing.Point(153, 39);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 24);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 30);
             this.ob_batchqty.TabIndex = 177;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(197, 32);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(261, 39);
+            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(82, 24);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_nowcheckqty_label.TabIndex = 176;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
@@ -497,9 +523,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(22, 32);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(28, 39);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(82, 24);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_batchqty_label.TabIndex = 175;
             this.ob_batchqty_label.Text = "标准批数";
             // 
@@ -512,13 +539,13 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(290, 86);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SendCheck.Location = new System.Drawing.Point(387, 108);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
             this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
             this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(45, 24);
+            this.SendCheck.Size = new System.Drawing.Size(60, 30);
             this.SendCheck.TabIndex = 174;
             this.SendCheck.Tag = "ifread";
             this.SendCheck.Text = "送检";
@@ -530,20 +557,21 @@
             this.pr_colorboxgw.AutoSize = true;
             this.pr_colorboxgw.CutLength = null;
             this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(129, 217);
-            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_colorboxgw.Location = new System.Drawing.Point(172, 271);
+            this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_colorboxgw.Name = "pr_colorboxgw";
-            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 27);
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
             this.pr_colorboxgw.TabIndex = 80;
             this.pr_colorboxgw.Tag = "1";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(774, 22);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.AutoPrint.Location = new System.Drawing.Point(1032, 28);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(105, 22);
+            this.AutoPrint.Size = new System.Drawing.Size(140, 28);
             this.AutoPrint.TabIndex = 174;
             // 
             // pr_code
@@ -551,20 +579,21 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(128, 307);
-            this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_code.Location = new System.Drawing.Point(171, 384);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             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, 32);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(878, 86);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4);
+            this.PrinterList.Location = new System.Drawing.Point(1171, 108);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(118, 20);
+            this.PrinterList.Size = new System.Drawing.Size(157, 25);
             this.PrinterList.TabIndex = 160;
             // 
             // StopWeight
@@ -574,13 +603,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(681, 24);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.StopWeight.Location = new System.Drawing.Point(908, 30);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(54, 24);
+            this.StopWeight.Size = new System.Drawing.Size(72, 30);
             this.StopWeight.TabIndex = 158;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -593,13 +622,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(602, 24);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.StartWeight.Location = new System.Drawing.Point(803, 30);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(54, 24);
+            this.StartWeight.Size = new System.Drawing.Size(72, 30);
             this.StartWeight.TabIndex = 157;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -612,13 +641,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(878, 146);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Confirm.Location = new System.Drawing.Point(1171, 182);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(50, 24);
+            this.Confirm.Size = new System.Drawing.Size(67, 30);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -629,10 +658,11 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(129, 261);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(172, 326);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             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, 32);
             this.ms_makecode.TabIndex = 77;
             this.ms_makecode.Tag = "1";
             // 
@@ -641,10 +671,11 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(128, 447);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_qty.Location = new System.Drawing.Point(171, 559);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 27);
+            this.ma_qty.Size = new System.Drawing.Size(0, 32);
             this.ma_qty.TabIndex = 76;
             // 
             // pr_detail
@@ -652,10 +683,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(128, 402);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_detail.Location = new System.Drawing.Point(171, 502);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             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, 32);
             this.pr_detail.TabIndex = 75;
             // 
             // ma_salecode
@@ -663,10 +695,11 @@
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.CutLength = null;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(128, 355);
-            this.ma_salecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_salecode.Location = new System.Drawing.Point(171, 444);
+            this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 27);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
             this.ma_salecode.TabIndex = 73;
             // 
             // Clean
@@ -676,13 +709,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(858, 558);
-            this.Clean.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Clean.Location = new System.Drawing.Point(1144, 698);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 60;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -695,8 +728,8 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(21, 54);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.normalButton1.Location = new System.Drawing.Point(28, 68);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 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")));
@@ -712,11 +745,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(110, 18);
-            this.sncode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sncode.Location = new System.Drawing.Point(147, 22);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(469, 39);
+            this.sncode.Size = new System.Drawing.Size(624, 47);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -726,18 +759,18 @@
             // 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(768, 289);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OperateResult.Location = new System.Drawing.Point(1024, 361);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(240, 261);
+            this.OperateResult.Size = new System.Drawing.Size(319, 325);
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
             // Make_ColorBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1013, 584);
+            this.ClientSize = new System.Drawing.Size(1351, 730);
             this.Controls.Add(this.CollectRemark);
             this.Controls.Add(this.Remark);
             this.Controls.Add(this.mcd_remainqty);
@@ -780,7 +813,7 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Name = "Make_ColorBoxWeigh";
             this.Tag = "Make!ColorBoxWeigh";
             this.Text = "彩盒称重";

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -173,7 +173,7 @@ namespace UAS_MES.Make
                                 }
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                            if (CollectRemark.Checked)
+                            if (CollectRemark.Checked && Remark.Text != "")
                             {
                                 LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, pr_code.Text, Remark.Text);
                             }

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

@@ -49,16 +49,18 @@
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.SuspendLayout();
             // 
             // PrintLabel
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(767, 108);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.PrintLabel.Location = new System.Drawing.Point(1023, 135);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(102, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(135, 23);
             this.PrintLabel.TabIndex = 181;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -66,9 +68,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(699, 19);
+            this.label2.Location = new System.Drawing.Point(932, 24);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(58, 21);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -76,9 +79,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(711, 108);
+            this.label1.Location = new System.Drawing.Point(948, 135);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(42, 21);
+            this.label1.Size = new System.Drawing.Size(52, 27);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -86,9 +90,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(450, 19);
+            this.pr_detail_label.Location = new System.Drawing.Point(600, 24);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -98,9 +103,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(12, 415);
+            this.sncode_label.Location = new System.Drawing.Point(16, 519);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "序列号";
             // 
@@ -108,9 +114,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(683, 69);
+            this.label4.Location = new System.Drawing.Point(911, 86);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 21);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -118,9 +125,10 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(231, 68);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(308, 85);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(58, 21);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -128,9 +136,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(12, 68);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(16, 85);
+            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(74, 21);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -138,9 +147,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(231, 19);
+            this.pr_code_label.Location = new System.Drawing.Point(308, 24);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -148,9 +158,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(12, 19);
+            this.ms_makecode_label.Location = new System.Drawing.Point(16, 24);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "工单编号";
             // 
@@ -158,38 +169,38 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(85, 21);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_code.Location = new System.Drawing.Point(113, 26);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 21);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 182;
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(450, 69);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Location = new System.Drawing.Point(600, 86);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Size = new System.Drawing.Size(117, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 183;
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(763, 19);
-            this.Printer.Margin = new System.Windows.Forms.Padding(4);
+            this.Printer.Location = new System.Drawing.Point(1017, 24);
+            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(106, 25);
+            this.Printer.Size = new System.Drawing.Size(141, 31);
             this.Printer.TabIndex = 178;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(293, 68);
+            this.mcd_remainqty.Location = new System.Drawing.Point(391, 85);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(19, 21);
+            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -197,9 +208,10 @@
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(85, 68);
+            this.mcd_okqty.Location = new System.Drawing.Point(113, 85);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(19, 21);
+            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -208,10 +220,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(304, 21);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(405, 26);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(177, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 175;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -220,10 +233,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(529, 21);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(133, 0);
+            this.pr_detail.Location = new System.Drawing.Point(705, 26);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(177, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -233,11 +247,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(767, 66);
+            this.PrintNum.Location = new System.Drawing.Point(1023, 82);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(102, 23);
+            this.PrintNum.Size = new System.Drawing.Size(135, 27);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -251,10 +266,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(95, 415);
+            this.sncode.Location = new System.Drawing.Point(127, 519);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(196, 21);
+            this.sncode.Size = new System.Drawing.Size(260, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -265,17 +281,44 @@
             // 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(16, 108);
+            this.OperateResult.Location = new System.Drawing.Point(21, 135);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(682, 292);
+            this.OperateResult.Size = new System.Drawing.Size(908, 364);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
+            // CollectRemark
+            // 
+            this.CollectRemark.AutoSize = true;
+            this.CollectRemark.Checked = true;
+            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CollectRemark.Location = new System.Drawing.Point(958, 197);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Name = "CollectRemark";
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.TabIndex = 197;
+            this.CollectRemark.Text = "采集备注";
+            this.CollectRemark.UseVisualStyleBackColor = true;
+            // 
+            // Remark
+            // 
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark.Location = new System.Drawing.Point(953, 231);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(253, 99);
+            this.Remark.TabIndex = 196;
+            this.Remark.Text = "";
+            // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(914, 448);
+            this.ClientSize = new System.Drawing.Size(1219, 560);
+            this.Controls.Add(this.CollectRemark);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
@@ -297,6 +340,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "Make_FuselageLabelPrint";
@@ -331,5 +375,7 @@
         private System.Windows.Forms.Label ms_makecode_label;
         private System.Windows.Forms.Label ma_code;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CollectRemark;
+        private CustomControl.RichText.RichTextAutoBottom Remark;
     }
 }

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -166,6 +166,10 @@ namespace UAS_MES.Make
                                 //提示正确返回时传递的信息
                                 if (oErrorMessage.Contains("AFTERSUCCESS"))
                                     OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                                if (CollectRemark.Checked && Remark.Text != "")
+                                {
+                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                }
                                 //清空输入框的值，聚焦
                                 sncode.Text = "";
                                 sncode.Focus();

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

@@ -57,6 +57,8 @@
             this.TSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.TSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
@@ -64,10 +66,9 @@
             // 
             this.ms_macode_label.AutoSize = true;
             this.ms_macode_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode_label.Location = new System.Drawing.Point(19, 17);
-            this.ms_macode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ms_macode_label.Location = new System.Drawing.Point(25, 21);
             this.ms_macode_label.Name = "ms_macode_label";
-            this.ms_macode_label.Size = new System.Drawing.Size(74, 21);
+            this.ms_macode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_macode_label.TabIndex = 0;
             this.ms_macode_label.Text = "工单编号";
             // 
@@ -75,10 +76,9 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode_label.Location = new System.Drawing.Point(289, 17);
-            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(385, 21);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 1;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -86,10 +86,9 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail_label.Location = new System.Drawing.Point(527, 17);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(703, 21);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 2;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -97,10 +96,9 @@
             // 
             this.remain_qty_label.AutoSize = true;
             this.remain_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty_label.Location = new System.Drawing.Point(19, 45);
-            this.remain_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.remain_qty_label.Location = new System.Drawing.Point(25, 56);
             this.remain_qty_label.Name = "remain_qty_label";
-            this.remain_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.remain_qty_label.Size = new System.Drawing.Size(72, 27);
             this.remain_qty_label.TabIndex = 3;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -108,10 +106,9 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(638, 414);
-            this.PrintNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PrintNum_label.Location = new System.Drawing.Point(879, 520);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
+            this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
             this.PrintNum_label.TabIndex = 4;
             this.PrintNum_label.Text = "计数";
             this.PrintNum_label.Visible = false;
@@ -120,10 +117,9 @@
             // 
             this.ms_macode.AutoSize = true;
             this.ms_macode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode.Location = new System.Drawing.Point(94, 17);
-            this.ms_macode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ms_macode.Location = new System.Drawing.Point(125, 21);
             this.ms_macode.Name = "ms_macode";
-            this.ms_macode.Size = new System.Drawing.Size(0, 21);
+            this.ms_macode.Size = new System.Drawing.Size(0, 27);
             this.ms_macode.TabIndex = 5;
             this.ms_macode.TextChanged += new System.EventHandler(this.ms_macode_TextChanged);
             // 
@@ -131,20 +127,18 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(94, 45);
-            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.remain_qty.Location = new System.Drawing.Point(125, 56);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 21);
+            this.remain_qty.Size = new System.Drawing.Size(0, 27);
             this.remain_qty.TabIndex = 6;
             // 
             // count
             // 
             this.count.AutoSize = true;
             this.count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count.Location = new System.Drawing.Point(712, 414);
-            this.count.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.count.Location = new System.Drawing.Point(949, 518);
             this.count.Name = "count";
-            this.count.Size = new System.Drawing.Size(19, 21);
+            this.count.Size = new System.Drawing.Size(24, 27);
             this.count.TabIndex = 8;
             this.count.Text = "0";
             this.count.Visible = false;
@@ -153,10 +147,10 @@
             // 
             this.TSNLength_checkBox.AutoSize = true;
             this.TSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNLength_checkBox.Location = new System.Drawing.Point(25, 81);
-            this.TSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.TSNLength_checkBox.Location = new System.Drawing.Point(33, 101);
+            this.TSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.TSNLength_checkBox.Name = "TSNLength_checkBox";
-            this.TSNLength_checkBox.Size = new System.Drawing.Size(83, 24);
+            this.TSNLength_checkBox.Size = new System.Drawing.Size(100, 27);
             this.TSNLength_checkBox.TabIndex = 10;
             this.TSNLength_checkBox.Text = "TSN长度";
             this.TSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -165,10 +159,10 @@
             // 
             this.SNLength_checkBox.AutoSize = true;
             this.SNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNLength_checkBox.Location = new System.Drawing.Point(25, 111);
-            this.SNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.SNLength_checkBox.Location = new System.Drawing.Point(33, 139);
+            this.SNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.SNLength_checkBox.Name = "SNLength_checkBox";
-            this.SNLength_checkBox.Size = new System.Drawing.Size(75, 24);
+            this.SNLength_checkBox.Size = new System.Drawing.Size(90, 27);
             this.SNLength_checkBox.TabIndex = 11;
             this.SNLength_checkBox.Text = "SN长度";
             this.SNLength_checkBox.UseVisualStyleBackColor = true;
@@ -177,10 +171,10 @@
             // 
             this.TSNPre_checkBox.AutoSize = true;
             this.TSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNPre_checkBox.Location = new System.Drawing.Point(428, 80);
-            this.TSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.TSNPre_checkBox.Location = new System.Drawing.Point(571, 100);
+            this.TSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.TSNPre_checkBox.Name = "TSNPre_checkBox";
-            this.TSNPre_checkBox.Size = new System.Drawing.Size(83, 24);
+            this.TSNPre_checkBox.Size = new System.Drawing.Size(100, 27);
             this.TSNPre_checkBox.TabIndex = 12;
             this.TSNPre_checkBox.Text = "TSN前缀";
             this.TSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -189,10 +183,10 @@
             // 
             this.SNPre_checkBox.AutoSize = true;
             this.SNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNPre_checkBox.Location = new System.Drawing.Point(428, 112);
-            this.SNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.SNPre_checkBox.Location = new System.Drawing.Point(571, 140);
+            this.SNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.SNPre_checkBox.Name = "SNPre_checkBox";
-            this.SNPre_checkBox.Size = new System.Drawing.Size(75, 24);
+            this.SNPre_checkBox.Size = new System.Drawing.Size(90, 27);
             this.SNPre_checkBox.TabIndex = 13;
             this.SNPre_checkBox.Text = "SN前缀";
             this.SNPre_checkBox.UseVisualStyleBackColor = true;
@@ -201,10 +195,9 @@
             // 
             this.tip.AutoSize = true;
             this.tip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
-            this.tip.Location = new System.Drawing.Point(19, 138);
-            this.tip.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.tip.Location = new System.Drawing.Point(25, 172);
             this.tip.Name = "tip";
-            this.tip.Size = new System.Drawing.Size(106, 22);
+            this.tip.Size = new System.Drawing.Size(132, 27);
             this.tip.TabIndex = 18;
             this.tip.Text = "采集提示信息";
             // 
@@ -212,10 +205,9 @@
             // 
             this.in_label.AutoSize = true;
             this.in_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.in_label.Location = new System.Drawing.Point(19, 417);
-            this.in_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.in_label.Location = new System.Drawing.Point(25, 521);
             this.in_label.Name = "in_label";
-            this.in_label.Size = new System.Drawing.Size(58, 21);
+            this.in_label.Size = new System.Drawing.Size(72, 27);
             this.in_label.TabIndex = 21;
             this.in_label.Text = "录入框";
             // 
@@ -223,9 +215,10 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(267, 381);
+            this.ClearSn_code.Location = new System.Drawing.Point(356, 476);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(16, 16);
+            this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
             this.ClearSn_code.TabIndex = 144;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.cancel_Click);
@@ -234,9 +227,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(19, 381);
+            this.sn_code_label.Location = new System.Drawing.Point(25, 476);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
             this.sn_code_label.TabIndex = 142;
             this.sn_code_label.Text = "序列号";
             // 
@@ -244,29 +238,29 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(605, 45);
-            this.ma_softversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_softversion.Location = new System.Drawing.Point(807, 56);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 21);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 27);
             this.ma_softversion.TabIndex = 150;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(527, 45);
+            this.label2.Location = new System.Drawing.Point(703, 56);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 149;
             this.label2.Text = "软件版本";
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(290, 45);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Location = new System.Drawing.Point(387, 56);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Size = new System.Drawing.Size(117, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 195;
@@ -275,11 +269,11 @@
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(267, 413);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.ChangeResult.Location = new System.Drawing.Point(356, 516);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(93, 25);
+            this.ChangeResult.Size = new System.Drawing.Size(114, 31);
             this.ChangeResult.TabIndex = 145;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -292,10 +286,11 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(83, 381);
+            this.show_sncode.Location = new System.Drawing.Point(111, 476);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(160, 25);
+            this.show_sncode.Size = new System.Drawing.Size(212, 29);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -306,11 +301,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(367, 17);
+            this.ma_prodcode.Location = new System.Drawing.Point(489, 21);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(177, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 24;
             // 
             // pr_detail
@@ -318,11 +313,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(604, 17);
+            this.pr_detail.Location = new System.Drawing.Point(805, 21);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(109, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(145, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 23;
             // 
             // code
@@ -331,11 +326,11 @@
             this.code.BackColor = System.Drawing.Color.White;
             this.code.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(83, 415);
-            this.code.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.code.Location = new System.Drawing.Point(111, 519);
+            this.code.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(160, 25);
+            this.code.Size = new System.Drawing.Size(212, 29);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
@@ -345,10 +340,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(23, 166);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OperateResult.Location = new System.Drawing.Point(31, 208);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(770, 199);
+            this.OperateResult.Size = new System.Drawing.Size(1025, 248);
             this.OperateResult.TabIndex = 19;
             this.OperateResult.Text = "";
             // 
@@ -358,11 +353,11 @@
             this.SNPre.BackColor = System.Drawing.Color.White;
             this.SNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNPre.ID = null;
-            this.SNPre.Location = new System.Drawing.Point(517, 111);
-            this.SNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.SNPre.Location = new System.Drawing.Point(689, 139);
+            this.SNPre.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.SNPre.Name = "SNPre";
             this.SNPre.Power = null;
-            this.SNPre.Size = new System.Drawing.Size(143, 25);
+            this.SNPre.Size = new System.Drawing.Size(189, 29);
             this.SNPre.Str = null;
             this.SNPre.Str1 = null;
             this.SNPre.Str2 = null;
@@ -374,11 +369,11 @@
             this.TSNPre.BackColor = System.Drawing.Color.White;
             this.TSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNPre.ID = null;
-            this.TSNPre.Location = new System.Drawing.Point(517, 79);
-            this.TSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.TSNPre.Location = new System.Drawing.Point(689, 99);
+            this.TSNPre.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.TSNPre.Name = "TSNPre";
             this.TSNPre.Power = null;
-            this.TSNPre.Size = new System.Drawing.Size(143, 25);
+            this.TSNPre.Size = new System.Drawing.Size(189, 29);
             this.TSNPre.Str = null;
             this.TSNPre.Str1 = null;
             this.TSNPre.Str2 = null;
@@ -390,12 +385,12 @@
             this.SNLength.BackColor = System.Drawing.Color.White;
             this.SNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNLength.ID = null;
-            this.SNLength.Location = new System.Drawing.Point(123, 110);
-            this.SNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.SNLength.Location = new System.Drawing.Point(164, 138);
+            this.SNLength.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.SNLength.Name = "SNLength";
             this.SNLength.Negative = false;
             this.SNLength.Power = null;
-            this.SNLength.Size = new System.Drawing.Size(143, 25);
+            this.SNLength.Size = new System.Drawing.Size(189, 29);
             this.SNLength.Str = null;
             this.SNLength.Str1 = null;
             this.SNLength.Str2 = null;
@@ -407,22 +402,48 @@
             this.TSNLength.BackColor = System.Drawing.Color.White;
             this.TSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNLength.ID = null;
-            this.TSNLength.Location = new System.Drawing.Point(123, 79);
-            this.TSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.TSNLength.Location = new System.Drawing.Point(164, 99);
+            this.TSNLength.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.TSNLength.Name = "TSNLength";
             this.TSNLength.Negative = false;
             this.TSNLength.Power = null;
-            this.TSNLength.Size = new System.Drawing.Size(143, 25);
+            this.TSNLength.Size = new System.Drawing.Size(189, 29);
             this.TSNLength.Str = null;
             this.TSNLength.Str1 = null;
             this.TSNLength.Str2 = null;
             this.TSNLength.TabIndex = 14;
             // 
+            // CollectRemark
+            // 
+            this.CollectRemark.AutoSize = true;
+            this.CollectRemark.Checked = true;
+            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CollectRemark.Location = new System.Drawing.Point(483, 471);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Name = "CollectRemark";
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.TabIndex = 199;
+            this.CollectRemark.Text = "采集备注";
+            this.CollectRemark.UseVisualStyleBackColor = true;
+            // 
+            // Remark
+            // 
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark.Location = new System.Drawing.Point(594, 469);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(253, 89);
+            this.Remark.TabIndex = 198;
+            this.Remark.Text = "";
+            // 
             // Make_SeqProgramTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(849, 454);
+            this.ClientSize = new System.Drawing.Size(1084, 568);
+            this.Controls.Add(this.CollectRemark);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
@@ -453,7 +474,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.Controls.Add(this.ms_macode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.Name = "Make_SeqProgramTransform";
             this.Tag = "Make!SeqProgramTransform";
             this.Load += new System.EventHandler(this.Make_SeqProgramTransform_Load);
@@ -495,5 +516,7 @@
         private System.Windows.Forms.Label ma_softversion;
         private System.Windows.Forms.Label label2;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CollectRemark;
+        private CustomControl.RichText.RichTextAutoBottom Remark;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -48,7 +48,7 @@ namespace UAS_MES.Make
 
         string oMsid = "";
 
-        string siid="";//存储TSN对应的sninfo记录id
+        string siid = "";//存储TSN对应的sninfo记录id
 
         DataTable macRange;//记录macBT范围
 
@@ -79,7 +79,7 @@ namespace UAS_MES.Make
             StepCount.Dh = dh;
             StepCount.Start();
         }
-        
+
         private void code_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -104,19 +104,19 @@ namespace UAS_MES.Make
                             else//勾选
                             {
                                 oMsid = dh.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode in (select '" + code.Text + "' from dual union select sn from makesnrelation where beforesn='" + code.Text + "' and sn<>' ' union select beforesn from makesnrelation where sn='" + code.Text + "' and beforesn<>' ')").ToString();
-                                if (oMsid=="")
+                                if (oMsid == "")
                                 {
                                     OperateResult.AppendText("<<TSN号错误\n", Color.Red, code);
                                     return;
                                 }
                                 //根据ms_id查询
                                 sql.Clear();
-                                sql.Append("select ms_stepcode from makeserial where ms_id='" + oMsid+"' and ms_beforesn='"+code.Text+"' and ms_nextmacode is null and ms_outboxcode is null");
-                                dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
+                                sql.Append("select ms_stepcode from makeserial where ms_id='" + oMsid + "' and ms_beforesn='" + code.Text + "' and ms_nextmacode is null and ms_outboxcode is null");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 //如果行数大于0则允许转号
                                 if (dt.Rows.Count > 0)
                                 {
-                                    if (dt.Rows[0]["ms_stepcode"].ToString()==User.CurrentStepCode)
+                                    if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
                                     {
                                         step = 1;
 
@@ -138,13 +138,13 @@ namespace UAS_MES.Make
                                 }
                             }
                             //如果用户没有选择工单号
-                            if (ms_macode.Text == "" || ms_macode.Text != oMakecode||ChangeResult.Checked)
+                            if (ms_macode.Text == "" || ms_macode.Text != oMakecode || ChangeResult.Checked)
                             {
                                 //按照out出的工单号查出工单相关信息，并赋值到相关控件
                                 sql.Clear();
                                 sql.Append("select ma_code as ms_macode,ma_softversion,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
                                 sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id='"+ oMsid + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id='" + oMsid + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {
@@ -159,7 +159,7 @@ namespace UAS_MES.Make
                                 }
                             }
                             //查询TSN对应的sninfo记录id
-                            siid= dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", "si_sn in (select '" + code.Text + "' from dual union select sn from makesnrelation where beforesn = '" + code.Text + "' )").ToString();
+                            siid = dh.getFieldDataByCondition("sninfo", "max(si_id) si_id", "si_sn in (select '" + code.Text + "' from dual union select sn from makesnrelation where beforesn = '" + code.Text + "' )").ToString();
                             //获取需要关联采集的信息，以及校验规则
                             ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
                             //没有获取到就提示错误请维护产品对应的关联采集信息
@@ -200,8 +200,8 @@ namespace UAS_MES.Make
                                     //修改转换结果时，输入两次SN直接过站
                                     if (dh.CheckExist("MakeSerial", "ms_id='" + oMsid + "' and ms_sncode='" + code.Text + "' and ms_beforesn is not null"))
                                     {
-                                        string nextstepcode=dh.getFieldDataByCondition("makeserial","ms_nextstepcode","ms_id='"+oMsid+"'").ToString();
-                                        if ( nextstepcode==User.CurrentStepCode)
+                                        string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
+                                        if (nextstepcode == User.CurrentStepCode)
                                         {
                                             step = 1;
                                             TSN = code.Text;
@@ -213,7 +213,7 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是"+nextstepcode+",不是当前岗位的工序\n", Color.Red, code);
+                                            OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, code);
                                             OperateResult.AppendText(">>请重新输入TSN\n", Color.Black);
                                         }
                                     }
@@ -260,7 +260,7 @@ namespace UAS_MES.Make
                                 }
                             }
                             //开始录入SN
-                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ') =' '") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+ "' and nvl(ms_nextmacode,' ') =' '")))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ') =' '") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ') =' '")))
                             {
                                 onlyPass = false;
                                 //SN校验成功，合法,记录下SN
@@ -398,7 +398,7 @@ namespace UAS_MES.Make
             if (code.Text.Length > 40)
             {
                 //如果前缀和长度都满足的话
-                if ((ListA.Rows[step - 2]["psr_length"].ToString() == "0" ? false : code.Text.Substring(0,40).Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
+                if ((ListA.Rows[step - 2]["psr_length"].ToString() == "0" ? false : code.Text.Substring(0, 40).Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
                 {
                     OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"] + "长度需为" + ListA.Rows[step - 2]["psr_length"].ToString() + "校验不通过,请重新输入\n", Color.Red);
                     OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black, code);
@@ -440,16 +440,16 @@ namespace UAS_MES.Make
                 case "IMEI2":
                 case "IMEI3":
                     string tempSn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "(ms_imei1='" + imeif + "' or ms_imei2 = '" + imeif + "' or ms_imei3 = '" + imeif + "') and  ms_status in (0,1,2,3)  and ms_id <> '" + oMsid + "'").ToString();
-                    if (tempSn!="")
+                    if (tempSn != "")
                     {
-                        OperateResult.AppendText("<<" + type + ":" + imeif + "错误，已被序列号"+tempSn+"使用\n", Color.Red);
+                        OperateResult.AppendText("<<" + type + ":" + imeif + "错误，已被序列号" + tempSn + "使用\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + type + "\n", Color.Black, code);
                         return false;
                     }
                     else
                     {   //校验sninfo中是否已经存在这个
                         tempSn = dh.getFieldDataByCondition("sninfo", "si_sn", "(si_imei1='" + imeif + "' or si_imei2 = '" + imeif + "' or si_imei3 = '" + imeif + "') and si_id <>'" + siid + "'").ToString();
-                        if (tempSn!="")
+                        if (tempSn != "")
                         {
                             OperateResult.AppendText("<<" + type + ":" + imeif + "错误，已被序列号" + tempSn + "使用\n", Color.Red);
                             OperateResult.AppendText(">>请输入" + type + "\n", Color.Black, code);
@@ -469,7 +469,7 @@ namespace UAS_MES.Make
                 case "BT":
                 case "MAC":
                     //验证是否符合合同防呆
-                    if (!LogicHandler.checkMacOrBtRange(oMsid,macOrBt,type))
+                    if (!LogicHandler.checkMacOrBtRange(oMsid, macOrBt, type))
                     {
                         OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不在合同防呆范围内\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
@@ -477,7 +477,7 @@ namespace UAS_MES.Make
                     }
                     //验证是否已被使用
                     string temSn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_" + type + "='" + macOrBt + "' and  ms_status in (0,1,2,3) and ms_id <> '" + oMsid + "'").ToString();
-                    if (temSn!="")
+                    if (temSn != "")
                     {
                         OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，已被序列号" + temSn + "使用\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
@@ -486,8 +486,8 @@ namespace UAS_MES.Make
                     else
                     {
                         //校验在sninfo表中是否存在
-                        temSn=dh.getFieldDataByCondition("sninfo", "si_sn", "si_" + type + "='" + macOrBt + "' and si_id <>'" + siid + "'").ToString();
-                        if (temSn!="")
+                        temSn = dh.getFieldDataByCondition("sninfo", "si_sn", "si_" + type + "='" + macOrBt + "' and si_id <>'" + siid + "'").ToString();
+                        if (temSn != "")
                         {
                             OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，已被序列号" + temSn + "使用\n", Color.Red);
                             OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
@@ -498,7 +498,7 @@ namespace UAS_MES.Make
                 case "NETCODE":
                     //校验网标是否存在
                     string teSn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_" + type + "='" + imeif + "' and  ms_status in (0,1,2,3) and ms_id <> '" + oMsid + "'").ToString();
-                    if (teSn!="")
+                    if (teSn != "")
                     {
                         OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
                         OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
@@ -508,7 +508,7 @@ namespace UAS_MES.Make
                     {
                         //校验在sninfo表中是否存在
                         teSn = dh.getFieldDataByCondition("sninfo", "si_sn", "si_" + type + "='" + imeif + "' and si_id <>'" + siid + "'").ToString();
-                        if (teSn!="")
+                        if (teSn != "")
                         {
                             OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
                             OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
@@ -530,13 +530,13 @@ namespace UAS_MES.Make
             if (step == ListA.Rows.Count + 1)
             {
                 //通过存储过程二次校验
-                if (LogicHandler.snChangeAndBurn(TSN,SN,User.UserSourceCode,User.UserCode,ms_macode.Text,ChangeResult.Checked?1:0,(hs.ContainsKey("IMEI1")?hs["IMEI1"].ToString():""), (hs.ContainsKey("IMEI2") ? hs["IMEI2"].ToString() : ""), (hs.ContainsKey("IMEI3") ? hs["IMEI3"].ToString() : ""),"", (hs.ContainsKey("NETCODE") ? hs["NETCODE"].ToString() : ""),"","","","", (hs.ContainsKey("MAC") ? hs["MAC"].ToString() : ""), (hs.ContainsKey("BT") ? hs["BT"].ToString() : ""),"","","",out errorMessage))
+                if (LogicHandler.snChangeAndBurn(TSN, SN, User.UserSourceCode, User.UserCode, ms_macode.Text, ChangeResult.Checked ? 1 : 0, (hs.ContainsKey("IMEI1") ? hs["IMEI1"].ToString() : ""), (hs.ContainsKey("IMEI2") ? hs["IMEI2"].ToString() : ""), (hs.ContainsKey("IMEI3") ? hs["IMEI3"].ToString() : ""), "", (hs.ContainsKey("NETCODE") ? hs["NETCODE"].ToString() : ""), "", "", "", "", (hs.ContainsKey("MAC") ? hs["MAC"].ToString() : ""), (hs.ContainsKey("BT") ? hs["BT"].ToString() : ""), "", "", "", out errorMessage))
                 {
-                    OperateResult.AppendText("<<序列号"+TSN+"成功转换为"+SN+"\n<<关联采集成功\n", Color.Green);
+                    OperateResult.AppendText("<<序列号" + TSN + "成功转换为" + SN + "\n<<关联采集成功\n", Color.Green);
                     //写入日志
                     LogManager.DoLog("修改序列号：" + TSN + "为" + SN + "成功！" + "操作人：" + User.UserCode);
                     //记录日志
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", TSN+"转换为"+SN, SN, "");
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列烧录转换", TSN + "转换为" + SN, SN, "");
                     //获取剩余数，刷新页面
                     sql.Clear();
                     sql.Append("select mcd_inqty from makecraftdetail where mcd_macode='" + ms_macode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
@@ -545,6 +545,10 @@ namespace UAS_MES.Make
                     {
                         remain_qty.Text = ma_qty - int.Parse(dt.Rows[0]["mcd_inqty"].ToString()) + "";
                     }
+                    if (CollectRemark.Checked && Remark.Text != "")
+                    {
+                        LogicHandler.CollectRemarkInf(SN, "", "", ms_macode.Text, ma_prodcode.Text, Remark.Text);
+                    }
                     //更新页面计数+1
                     count.Text = int.Parse(count.Text) + 1 + "";
                     //完成之后,清除信息

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

@@ -57,6 +57,8 @@
             this.beforeTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.CollectRemark = new System.Windows.Forms.CheckBox();
+            this.Remark = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
@@ -64,18 +66,20 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(15, 17);
+            this.ms_makecode_label.Location = new System.Drawing.Point(20, 21);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(0, 21);
+            this.ms_makecode_label.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode_label.TabIndex = 61;
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(550, 15);
+            this.pr_detail_label.Location = new System.Drawing.Point(733, 19);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 62;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -83,9 +87,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(307, 15);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(409, 19);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.ma_prodcode_label.TabIndex = 63;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -93,9 +98,10 @@
             // 
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(17, 431);
+            this.sncode_label.Location = new System.Drawing.Point(23, 539);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.sncode_label.Size = new System.Drawing.Size(72, 27);
             this.sncode_label.TabIndex = 68;
             this.sncode_label.Text = "录入框";
             // 
@@ -103,10 +109,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(19, 81);
-            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(25, 101);
+            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(83, 24);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(100, 27);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "TSN长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -115,10 +121,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(19, 113);
-            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(25, 141);
+            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(75, 24);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(90, 27);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "SN长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -127,10 +133,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(421, 81);
-            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(561, 101);
+            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(83, 24);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(100, 27);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "TSN前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -139,10 +145,10 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(421, 114);
-            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(561, 142);
+            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(75, 24);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(90, 27);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "SN前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -151,10 +157,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(15, 15);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(20, 19);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 93;
             this.label1.Text = "工单编号";
             // 
@@ -162,10 +167,9 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(91, 15);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_code.Location = new System.Drawing.Point(121, 19);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 21);
+            this.ma_code.Size = new System.Drawing.Size(0, 27);
             this.ma_code.TabIndex = 95;
             this.ma_code.TextChanged += new System.EventHandler(this.ms_makecode_UserControlTextChanged);
             // 
@@ -173,10 +177,9 @@
             // 
             this.changenum.AutoSize = true;
             this.changenum.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.changenum.Location = new System.Drawing.Point(729, 427);
-            this.changenum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.changenum.Location = new System.Drawing.Point(972, 534);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(19, 21);
+            this.changenum.Size = new System.Drawing.Size(24, 27);
             this.changenum.TabIndex = 100;
             this.changenum.Text = "0";
             this.changenum.Visible = false;
@@ -185,20 +188,18 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(93, 51);
-            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.remain_qty.Location = new System.Drawing.Point(124, 64);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 21);
+            this.remain_qty.Size = new System.Drawing.Size(0, 27);
             this.remain_qty.TabIndex = 99;
             // 
             // PrintNum_label
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(655, 427);
-            this.PrintNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PrintNum_label.Location = new System.Drawing.Point(873, 534);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
+            this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
             this.PrintNum_label.TabIndex = 98;
             this.PrintNum_label.Text = "计数";
             this.PrintNum_label.Visible = false;
@@ -207,10 +208,9 @@
             // 
             this.remain_qty_label.AutoSize = true;
             this.remain_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty_label.Location = new System.Drawing.Point(18, 51);
-            this.remain_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.remain_qty_label.Location = new System.Drawing.Point(24, 64);
             this.remain_qty_label.Name = "remain_qty_label";
-            this.remain_qty_label.Size = new System.Drawing.Size(58, 21);
+            this.remain_qty_label.Size = new System.Drawing.Size(72, 27);
             this.remain_qty_label.TabIndex = 97;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -218,9 +218,10 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(280, 399);
+            this.ClearSn_code.Location = new System.Drawing.Point(373, 499);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(16, 16);
+            this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
             this.ClearSn_code.TabIndex = 141;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ReCall_Click);
@@ -229,9 +230,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(17, 396);
+            this.sn_code_label.Location = new System.Drawing.Point(23, 495);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
             this.sn_code_label.TabIndex = 139;
             this.sn_code_label.Text = "序列号";
             // 
@@ -239,9 +241,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(550, 51);
+            this.label2.Location = new System.Drawing.Point(733, 64);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 147;
             this.label2.Text = "软件版本";
             // 
@@ -249,19 +252,18 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(623, 51);
-            this.ma_softversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_softversion.Location = new System.Drawing.Point(831, 64);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 21);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 27);
             this.ma_softversion.TabIndex = 148;
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(307, 51);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Location = new System.Drawing.Point(409, 64);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Size = new System.Drawing.Size(117, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 196;
@@ -270,11 +272,11 @@
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(280, 427);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.ChangeResult.Location = new System.Drawing.Point(373, 534);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(93, 25);
+            this.ChangeResult.Size = new System.Drawing.Size(114, 31);
             this.ChangeResult.TabIndex = 146;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -287,10 +289,11 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(97, 396);
+            this.show_sncode.Location = new System.Drawing.Point(129, 495);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(160, 25);
+            this.show_sncode.Size = new System.Drawing.Size(212, 29);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -301,11 +304,10 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(623, 15);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(133, 0);
+            this.pr_detail.Location = new System.Drawing.Point(831, 19);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(177, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 96;
             // 
             // ma_prodcode
@@ -313,30 +315,30 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(384, 17);
+            this.ma_prodcode.Location = new System.Drawing.Point(512, 21);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(177, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
             this.ma_prodcode.TabIndex = 94;
             // 
             // afterTransSNLength
             // 
             this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(111, 115);
-            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.afterTransSNLength.Location = new System.Drawing.Point(148, 144);
+            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(168, 25);
+            this.afterTransSNLength.Size = new System.Drawing.Size(223, 29);
             this.afterTransSNLength.TabIndex = 90;
             this.afterTransSNLength.Text = "0";
             // 
             // beforeTransSNLength
             // 
             this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength.Location = new System.Drawing.Point(111, 81);
-            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(148, 101);
+            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(168, 25);
+            this.beforeTransSNLength.Size = new System.Drawing.Size(223, 29);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
@@ -346,11 +348,11 @@
             this.afterTransSNPre.BackColor = System.Drawing.Color.White;
             this.afterTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.afterTransSNPre.ID = null;
-            this.afterTransSNPre.Location = new System.Drawing.Point(513, 113);
-            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.afterTransSNPre.Location = new System.Drawing.Point(684, 141);
+            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
-            this.afterTransSNPre.Size = new System.Drawing.Size(168, 25);
+            this.afterTransSNPre.Size = new System.Drawing.Size(223, 29);
             this.afterTransSNPre.Str = null;
             this.afterTransSNPre.Str1 = null;
             this.afterTransSNPre.Str2 = null;
@@ -362,11 +364,11 @@
             this.beforeTransSNPre.BackColor = System.Drawing.Color.White;
             this.beforeTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.beforeTransSNPre.ID = null;
-            this.beforeTransSNPre.Location = new System.Drawing.Point(513, 79);
-            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(684, 99);
+            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
-            this.beforeTransSNPre.Size = new System.Drawing.Size(168, 25);
+            this.beforeTransSNPre.Size = new System.Drawing.Size(223, 29);
             this.beforeTransSNPre.Str = null;
             this.beforeTransSNPre.Str1 = null;
             this.beforeTransSNPre.Str2 = null;
@@ -375,9 +377,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(19, 147);
+            this.OperateResult.Location = new System.Drawing.Point(25, 184);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(812, 231);
+            this.OperateResult.Size = new System.Drawing.Size(1081, 288);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -387,10 +390,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(97, 429);
+            this.sncode.Location = new System.Drawing.Point(129, 536);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifread";
-            this.sncode.Size = new System.Drawing.Size(160, 25);
+            this.sncode.Size = new System.Drawing.Size(212, 29);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -398,11 +402,37 @@
             this.sncode.Tag = "IfRead";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
+            // CollectRemark
+            // 
+            this.CollectRemark.AutoSize = true;
+            this.CollectRemark.Checked = true;
+            this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CollectRemark.Location = new System.Drawing.Point(489, 486);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Name = "CollectRemark";
+            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.TabIndex = 201;
+            this.CollectRemark.Text = "采集备注";
+            this.CollectRemark.UseVisualStyleBackColor = true;
+            // 
+            // Remark
+            // 
+            this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Remark.Location = new System.Drawing.Point(600, 484);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Name = "Remark";
+            this.Remark.Size = new System.Drawing.Size(253, 89);
+            this.Remark.TabIndex = 200;
+            this.Remark.Text = "";
+            // 
             // Make_SeqTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(849, 467);
+            this.ClientSize = new System.Drawing.Size(1132, 584);
+            this.Controls.Add(this.CollectRemark);
+            this.Controls.Add(this.Remark);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
@@ -433,6 +463,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";
@@ -474,5 +505,7 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label ma_softversion;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.CheckBox CollectRemark;
+        private CustomControl.RichText.RichTextAutoBottom Remark;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -42,7 +42,7 @@ namespace UAS_MES.Make
         {
             InitializeComponent();
         }
-        
+
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -81,7 +81,7 @@ namespace UAS_MES.Make
                                 //如果行数大于0则允许转号
                                 if (dt.Rows.Count > 0)
                                 {
-                                    if (dt.Rows[0]["ms_stepcode"].ToString()==User.CurrentStepCode)
+                                    if (dt.Rows[0]["ms_stepcode"].ToString() == User.CurrentStepCode)
                                     {
                                         bsncode = sncode.Text;
                                         //显示序列号
@@ -101,13 +101,13 @@ namespace UAS_MES.Make
                                 }
                             }
                             //如果用户没有选择工单号
-                            if (ma_code.Text == "" || ma_code.Text != oMakeCode||ChangeResult.Checked)
+                            if (ma_code.Text == "" || ma_code.Text != oMakeCode || ChangeResult.Checked)
                             {
                                 //按照out出的工单号查出工单相关信息，并赋值到相关控件
                                 sql.Clear();
                                 sql.Append("select ma_code,ma_softversion,ma_prodcode,pr_detail,ma_qty,ma_qty-mcd_inqty as remain_qty ");
                                 sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id='"+oMsId+"' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id='" + oMsId + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows.Count > 0)
                                 {
@@ -245,9 +245,13 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran(updateSql, insertSql);
                                 }
                                 onlyPass = false;
-                                OperateResult.AppendText("<<序列号"+bsncode+"成功转换为"+sncode.Text+"\n", Color.Green);
+                                OperateResult.AppendText("<<序列号" + bsncode + "成功转换为" + sncode.Text + "\n", Color.Green);
                                 //记录日志
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", bsncode+"转换为"+sncode.Text, sncode.Text, "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", bsncode + "转换为" + sncode.Text, sncode.Text, "");
+                                if (CollectRemark.Checked && Remark.Text != "")
+                                {
+                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                }
                                 LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
                                 //写入日志
                                 if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage))
@@ -274,7 +278,7 @@ namespace UAS_MES.Make
                             {
                                 if (onlyPass)
                                 {
-                                    OperateResult.AppendText("<<SN号"+sncode.Text+"错误,已完成转号只允许SN转SN\n", Color.Red);
+                                    OperateResult.AppendText("<<SN号" + sncode.Text + "错误,已完成转号只允许SN转SN\n", Color.Red);
                                 }
                                 else
                                 {
@@ -296,7 +300,7 @@ namespace UAS_MES.Make
                 sncode.Text = "";
             }
         }
-        
+
         private void Confirm_Click(object sender, EventArgs e)
         {
             KeyEventArgs ky = new KeyEventArgs(Keys.Enter);

UAS-MES/FunctionCode/Query/Query_SpecialReport.cs

@@ -134,23 +134,23 @@ namespace UAS_MES.Query
                         {
                             if (dt.Rows[i]["stg_type"].ToString() == "DATE")
                             {
-                                SQLField += "to_char(" + dt.Rows[i]["stg_field"].ToString() + ",'YYYYMMDD') as " + dt.Rows[i]["stg_text"].ToString() + ",";
+                                SQLField += "to_char(" + dt.Rows[i]["stg_field"].ToString() + ",'YYYYMMDD')||';' as " + dt.Rows[i]["stg_text"].ToString() + ",";
                             }
                             else
                             {
-                                SQLField += dt.Rows[i]["stg_field"].ToString() + " as " + dt.Rows[i]["stg_text"].ToString() + ",";
+                                SQLField += dt.Rows[i]["stg_field"].ToString() + "||';' as " + dt.Rows[i]["stg_text"].ToString() + ",";
                             }
                         }
                         else
                         {
                             if (dt.Rows[i]["stg_text"].ToString() == "SEQ")
                             {
-                                SQLField += "'" + SEQ + "'" + " as " + dt.Rows[i]["stg_text"].ToString() + ",";
+                                SQLField += "'" + SEQ + "'" + "||';' as " + dt.Rows[i]["stg_text"].ToString() + ",";
                             }
                             else if (dt.Rows[i]["stg_formula"].ToString().Replace("'", "").Trim() == "")
                                 SQLField += "''" + " as " + dt.Rows[i]["stg_text"].ToString() + ",";
                             else
-                                SQLField += dt.Rows[i]["stg_formula"].ToString() + " as " + dt.Rows[i]["stg_text"].ToString() + ",";
+                                SQLField += dt.Rows[i]["stg_formula"].ToString() + "||';' as " + dt.Rows[i]["stg_text"].ToString() + ",";
                         }
                     }
                     SQLField = SQLField.Substring(0, SQLField.Length - 1);