章政 8 жил өмнө
parent
commit
2eb177ff24

+ 31 - 31
UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -137,7 +137,7 @@
             this.ReworkRequire.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ReworkRequire.Location = new System.Drawing.Point(163, 656);
-            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4);
             this.ReworkRequire.Name = "ReworkRequire";
             this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
             this.ReworkRequire.TabIndex = 168;
@@ -217,7 +217,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1300, 38);
             this.panel2.TabIndex = 220;
@@ -260,7 +260,7 @@
             // Remark
             // 
             this.Remark.Location = new System.Drawing.Point(117, 239);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4);
             this.Remark.Name = "Remark";
             this.Remark.Size = new System.Drawing.Size(547, 280);
             this.Remark.TabIndex = 225;
@@ -295,7 +295,7 @@
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
             this.ob_status.Location = new System.Drawing.Point(800, 246);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
             this.ob_status.Size = new System.Drawing.Size(195, 25);
@@ -312,7 +312,7 @@
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
             this.ob_source.Location = new System.Drawing.Point(1012, 94);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(4);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
             this.ob_source.Size = new System.Drawing.Size(195, 25);
@@ -330,7 +330,7 @@
             this.ob_id.Enabled = false;
             this.ob_id.ID = null;
             this.ob_id.Location = new System.Drawing.Point(1012, 69);
-            this.ob_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_id.Margin = new System.Windows.Forms.Padding(4);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
             this.ob_id.Size = new System.Drawing.Size(195, 25);
@@ -345,7 +345,7 @@
             // 
             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(1013, 214);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(279, 398);
             this.OperateResult.TabIndex = 227;
@@ -359,11 +359,11 @@
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
             this.GetBatch.Location = new System.Drawing.Point(681, 182);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
-            this.GetBatch.Power = "";
+            this.GetBatch.Power = "ifread";
             this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
@@ -377,7 +377,7 @@
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
             this.ob_prodcode.Location = new System.Drawing.Point(473, 186);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
             this.ob_prodcode.Size = new System.Drawing.Size(191, 25);
@@ -394,7 +394,7 @@
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
             this.ob_makecode.Location = new System.Drawing.Point(117, 182);
-            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
             this.ob_makecode.Size = new System.Drawing.Size(212, 25);
@@ -410,7 +410,7 @@
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
             this.ob_checkno.Location = new System.Drawing.Point(117, 54);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
             this.ob_checkno.Size = new System.Drawing.Size(547, 25);
@@ -427,7 +427,7 @@
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
             this.obd_outboxcode.Location = new System.Drawing.Point(117, 94);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
             this.obd_outboxcode.Size = new System.Drawing.Size(547, 25);
@@ -444,7 +444,7 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(117, 136);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
             this.ms_sncode.Size = new System.Drawing.Size(547, 25);
@@ -462,7 +462,7 @@
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
             this.ob_nowcheckqty.Location = new System.Drawing.Point(800, 328);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
             this.ob_nowcheckqty.Size = new System.Drawing.Size(195, 25);
@@ -479,7 +479,7 @@
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
             this.ob_okqty.Location = new System.Drawing.Point(800, 414);
-            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
             this.ob_okqty.Size = new System.Drawing.Size(195, 25);
@@ -496,7 +496,7 @@
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
             this.oi_checkqty.Location = new System.Drawing.Point(800, 370);
-            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
             this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
@@ -513,7 +513,7 @@
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
             this.ob_ngqty.Location = new System.Drawing.Point(800, 456);
-            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
             this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
@@ -530,7 +530,7 @@
             this.ob_result.Enabled = false;
             this.ob_result.ID = null;
             this.ob_result.Location = new System.Drawing.Point(800, 288);
-            this.ob_result.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_result.Margin = new System.Windows.Forms.Padding(4);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
             this.ob_result.Size = new System.Drawing.Size(195, 25);
@@ -547,7 +547,7 @@
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
             this.ob_aqlcode.Location = new System.Drawing.Point(800, 498);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
             this.ob_aqlcode.Size = new System.Drawing.Size(195, 25);
@@ -566,7 +566,7 @@
             this.WithdrawPass.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.Image")));
             this.WithdrawPass.IsShowBorder = true;
             this.WithdrawPass.Location = new System.Drawing.Point(580, 606);
-            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4);
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
@@ -586,7 +586,7 @@
             this.BatchRejection.Image = ((System.Drawing.Image)(resources.GetObject("BatchRejection.Image")));
             this.BatchRejection.IsShowBorder = true;
             this.BatchRejection.Location = new System.Drawing.Point(41, 658);
-            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4);
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
@@ -606,7 +606,7 @@
             this.ForcePass.Image = ((System.Drawing.Image)(resources.GetObject("ForcePass.Image")));
             this.ForcePass.IsShowBorder = true;
             this.ForcePass.Location = new System.Drawing.Point(393, 606);
-            this.ForcePass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ForcePass.Margin = new System.Windows.Forms.Padding(4);
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
@@ -626,7 +626,7 @@
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
             this.ForceRejection.Location = new System.Drawing.Point(393, 660);
-            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
@@ -646,7 +646,7 @@
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
             this.WithdrawRejection.Location = new System.Drawing.Point(580, 660);
-            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
@@ -666,7 +666,7 @@
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
             this.BatchPass.Location = new System.Drawing.Point(41, 605);
-            this.BatchPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
@@ -685,7 +685,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1113, 642);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -702,7 +702,7 @@
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
             this.ob_maxngacceptqty.Location = new System.Drawing.Point(268, 534);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = "";
             this.ob_maxngacceptqty.Size = new System.Drawing.Size(257, 25);
@@ -760,16 +760,16 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_BatchResultJudge_FormClosing);
             this.Load += new System.EventHandler(this.抽检批维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽检批维护_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

+ 9 - 9
UAS-MES/FunctionCode/OQC/OQC_CheckNoSplit.Designer.cs

@@ -83,7 +83,7 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(45, 33);
+            this.ob_checkno_label.Location = new System.Drawing.Point(45, 32);
             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(72, 27);
@@ -112,7 +112,7 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(45, 81);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(45, 80);
             this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
             this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
@@ -141,7 +141,7 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(45, 125);
+            this.ms_sncode_label.Location = new System.Drawing.Point(45, 124);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -152,7 +152,7 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(45, 170);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(45, 169);
             this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
             this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -163,7 +163,7 @@
             // 
             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(384, 170);
+            this.pr_detail_label.Location = new System.Drawing.Point(384, 169);
             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);
@@ -174,7 +174,7 @@
             // 
             this.ob_prodcode.AutoSize = true;
             this.ob_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode.Location = new System.Drawing.Point(153, 170);
+            this.ob_prodcode.Location = new System.Drawing.Point(153, 169);
             this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Size = new System.Drawing.Size(0, 27);
@@ -193,7 +193,7 @@
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
-            this.GetBatch.Power = "";
+            this.GetBatch.Power = "ifread";
             this.GetBatch.Size = new System.Drawing.Size(80, 30);
             this.GetBatch.TabIndex = 227;
             this.GetBatch.Text = "获取批";
@@ -393,7 +393,7 @@
             // 
             this.pr_detail.AutoSize = true;
             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(484, 170);
+            this.pr_detail.Location = new System.Drawing.Point(484, 169);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -446,7 +446,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.OutBoxDGV)).EndInit();
             this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(trues);
             this.PerformLayout();
 
         }

+ 2 - 2
UAS-MES/PublicMethod/Print.cs

@@ -54,12 +54,12 @@ namespace UAS_MES.PublicMethod
                         {
                             for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
                             {
-                                if (j == 0 & doc.Variables.FormVariables.Item(k + 1).Name == dt.Rows[i]["lp_name"].ToString())
+                                if (j == 0 & doc.Variables.FormVariables.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper())
                                 {
                                     doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[0][0].ToString();
                                 }
                                 //使用SN开头的参数赋值SN1,SN2,SN3等参数
-                                if (doc.Variables.FormVariables.Item(k + 1).Name == dt.Rows[i]["lp_name"].ToString() + j)
+                                if (doc.Variables.FormVariables.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j+1))
                                 {
                                     doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[j][0].ToString();
                                 }