Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.Designer.cs

@@ -136,7 +136,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(822, 660);
+            this.button1.Location = new System.Drawing.Point(821, 667);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -554,7 +554,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(748, 660);
+            this.button6.Location = new System.Drawing.Point(747, 667);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -613,7 +613,6 @@
             // 
             // groupBox3
             // 
-            this.groupBox3.Controls.Add(this.groupBox5);
             this.groupBox3.Controls.Add(this.groupBox_px);
             this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.ck_klcc_xsddt);
@@ -627,7 +626,7 @@
             this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(281, 206);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(684, 449);
+            this.groupBox3.Size = new System.Drawing.Size(684, 349);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -643,7 +642,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(896, 660);
+            this.button7.Location = new System.Drawing.Point(895, 667);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -688,7 +687,7 @@
             // label_StandardLibraryName
             // 
             this.label_StandardLibraryName.AutoSize = true;
-            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 669);
+            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 676);
             this.label_StandardLibraryName.Name = "label_StandardLibraryName";
             this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
             this.label_StandardLibraryName.TabIndex = 69;
@@ -697,9 +696,9 @@
             // groupBox5
             // 
             this.groupBox5.Controls.Add(this.textBox1);
-            this.groupBox5.Location = new System.Drawing.Point(22, 345);
+            this.groupBox5.Location = new System.Drawing.Point(281, 557);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(647, 98);
+            this.groupBox5.Size = new System.Drawing.Size(684, 98);
             this.groupBox5.TabIndex = 69;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "备注";
@@ -709,7 +708,7 @@
             this.textBox1.Location = new System.Drawing.Point(4, 20);
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(637, 72);
+            this.textBox1.Size = new System.Drawing.Size(674, 72);
             this.textBox1.TabIndex = 66;
             // 
             // groupBox6
@@ -728,7 +727,8 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(977, 701);
+            this.ClientSize = new System.Drawing.Size(977, 708);
+            this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.label_StandardLibraryName);
             this.Controls.Add(this.button7);

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.Designer.cs

@@ -139,7 +139,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(841, 741);
+            this.button1.Location = new System.Drawing.Point(841, 754);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -272,7 +272,7 @@
             // 
             this.pictureBox7.Location = new System.Drawing.Point(8, 84);
             this.pictureBox7.Name = "pictureBox7";
-            this.pictureBox7.Size = new System.Drawing.Size(249, 144);
+            this.pictureBox7.Size = new System.Drawing.Size(249, 154);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox7.TabIndex = 55;
             this.pictureBox7.TabStop = false;
@@ -572,7 +572,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(767, 741);
+            this.button6.Location = new System.Drawing.Point(767, 754);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -643,7 +643,6 @@
             // 
             // groupBox3
             // 
-            this.groupBox3.Controls.Add(this.groupBox5);
             this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.groupBox_px);
             this.groupBox3.Controls.Add(this.lbv_syxt_mblb);
@@ -660,7 +659,7 @@
             this.groupBox3.Controls.Add(this.ck_klcc_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(282, 199);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(703, 537);
+            this.groupBox3.Size = new System.Drawing.Size(703, 442);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -687,7 +686,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(915, 741);
+            this.button7.Location = new System.Drawing.Point(915, 754);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -731,7 +730,7 @@
             // label_StandardLibraryName
             // 
             this.label_StandardLibraryName.AutoSize = true;
-            this.label_StandardLibraryName.Location = new System.Drawing.Point(18, 750);
+            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 763);
             this.label_StandardLibraryName.Name = "label_StandardLibraryName";
             this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
             this.label_StandardLibraryName.TabIndex = 80;
@@ -740,9 +739,9 @@
             // groupBox5
             // 
             this.groupBox5.Controls.Add(this.textBox1);
-            this.groupBox5.Location = new System.Drawing.Point(16, 433);
+            this.groupBox5.Location = new System.Drawing.Point(282, 647);
             this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(670, 98);
+            this.groupBox5.Size = new System.Drawing.Size(703, 98);
             this.groupBox5.TabIndex = 68;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "备注";
@@ -752,7 +751,7 @@
             this.textBox1.Location = new System.Drawing.Point(4, 20);
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(660, 72);
+            this.textBox1.Size = new System.Drawing.Size(693, 72);
             this.textBox1.TabIndex = 66;
             // 
             // groupBox6
@@ -762,7 +761,7 @@
             this.groupBox6.Controls.Add(this.button1217);
             this.groupBox6.Location = new System.Drawing.Point(13, 482);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(263, 254);
+            this.groupBox6.Size = new System.Drawing.Size(263, 263);
             this.groupBox6.TabIndex = 69;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "图标选择";
@@ -771,7 +770,8 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(995, 782);
+            this.ClientSize = new System.Drawing.Size(995, 795);
+            this.Controls.Add(this.groupBox5);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.label_StandardLibraryName);
             this.Controls.Add(this.button7);

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -108,8 +108,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
      
             //夹杂物面积比图
             setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));//夹杂物面积比图
-            setXRLabelData(xrTableCell1, GetlanguageData(xrTableCell1.Name.ToString(), languageData));//备注
-
+            //setXRLabelData(xrTableCell1, GetlanguageData(xrTableCell1.Name.ToString(), languageData));//备注
+            setXRLabelData(xrTableCell1, "Notes");//备注
             //颗粒尺寸表
             //Bitmap bitmap = (Bitmap)Image.FromFile(str3 + "\\Config\\ReportTemplate\\ReportIdentification.bmp");
             setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));
@@ -157,6 +157,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrTable3.SizeF = new SizeF(630f, 90.62f);
             xrTable3.Borders = DevExpress.XtraPrinting.BorderSide.All;
             xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.All;
+
+            if(TemplateClass.M_DZ.Notes.ToString()=="")
+            {
+                xrTable3.Visible = false;
+                xrTable2.Visible = false;
+
+                xrTable1.LocationF = new PointF(30.42f, 721.79f);
+            }
             //630, 90.62.