Bladeren bron

试验标识

fubin 3 jaren geleden
bovenliggende
commit
7f023ba5c0

File diff suppressed because it is too large
+ 1088 - 1060
DK.Client/ReportModule/R01/M01/F_RPT_010101_1.Designer.cs


+ 6 - 0
DK.Client/ReportModule/R01/M01/F_RPT_010101_1.cs

@@ -174,6 +174,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.chkGroutingFlag.AllItemCheck();
 			this.chkScrapFlag.AllItemCheck();
 			this.chkBarcodeFlag.AllItemCheck();
+			this.chkTestMouldFlag.AllItemCheck();
 			this.chkDeliverTime.Checked = false;
 			this.dtpDeliverTimeBegin.Value = DateTime.Now.Date;
 			this.dtpDeliverTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
@@ -285,6 +286,11 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                     se.GCTimeBegin = this.dtpGCTimeBegin.Value;
                     se.GCTimeEnd = this.dtpGCTimeEnd.Value;
                 }
+				object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
+				if (testMouldFlags.Length == 1)
+				{
+					se.TestMouldFlag = testMouldFlags[0].ToString();
+				}
                 se.Remarks = this.txtRemarks.Text;
 
 				// 调用服务器端获取数据集

+ 60 - 0
DK.Client/ReportModule/R01/M01/F_RPT_010101_1.resx

@@ -231,6 +231,9 @@
   <metadata name="gctime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -289,6 +292,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="chkDeliverFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH

+ 31 - 1
DK.Client/ReportModule/R03/M01/F_RPT_030102_1.Designer.cs

@@ -60,6 +60,7 @@
             this.tapScrapTotalModuleDetail = new System.Windows.Forms.TabPage();
             this.dgvScrapTotalModuleDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.chkTestMouldFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.chkReFireFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
@@ -124,6 +125,7 @@
             this.logoname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ISPUBLICBODY = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.SPECIALREPAIRFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.TestMouldFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.tblScrapTotalModule.SuspendLayout();
             this.tapScrapTotalModule.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvScrapTotalModule)).BeginInit();
@@ -395,7 +397,8 @@
             this.Remarks,
             this.logoname,
             this.ISPUBLICBODY,
-            this.SPECIALREPAIRFLAG});
+            this.SPECIALREPAIRFLAG,
+            this.TestMouldFlag});
             this.dgvScrapTotalModuleDetail.ColumnTreeView = null;
             this.dgvScrapTotalModuleDetail.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
             this.dgvScrapTotalModuleDetail.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -439,6 +442,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
             this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+            this.gbxCondition.Controls.Add(this.chkTestMouldFlag);
             this.gbxCondition.Controls.Add(this.lblGoodsType);
             this.gbxCondition.Controls.Add(this.scbGoodsType);
             this.gbxCondition.Controls.Add(this.chkReFireFlag);
@@ -486,6 +490,20 @@
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
             // 
+            // chkTestMouldFlag
+            // 
+            this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
+            this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
+            this.chkTestMouldFlag.FalseText = "否";
+            this.chkTestMouldFlag.Location = new System.Drawing.Point(741, 51);
+            this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkTestMouldFlag.Name = "chkTestMouldFlag";
+            this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
+            this.chkTestMouldFlag.TabIndex = 59;
+            this.chkTestMouldFlag.Title = "试验标识";
+            this.chkTestMouldFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.chkTestMouldFlag.TrueText = "是";
+            // 
             // lblGoodsType
             // 
             this.lblGoodsType.AutoSize = true;
@@ -1186,6 +1204,16 @@
             this.SPECIALREPAIRFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.SPECIALREPAIRFLAG.TrueValue = "1";
             // 
+            // TestMouldFlag
+            // 
+            this.TestMouldFlag.DataPropertyName = "TestMouldFlag";
+            this.TestMouldFlag.FalseValue = "0";
+            this.TestMouldFlag.HeaderText = "试验标识";
+            this.TestMouldFlag.IndeterminateValue = "0";
+            this.TestMouldFlag.Name = "TestMouldFlag";
+            this.TestMouldFlag.ReadOnly = true;
+            this.TestMouldFlag.TrueValue = "1";
+            // 
             // F_RPT_030102_1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1270,6 +1298,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn g1GOODSMODEL;
         private System.Windows.Forms.DataGridViewTextBoxColumn barcount;
+        private Basics.BaseControls.C_StatusCheckBox chkTestMouldFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineNamed;
         private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAMEd;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeNamed;
@@ -1295,5 +1324,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn logoname;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ISPUBLICBODY;
         private System.Windows.Forms.DataGridViewCheckBoxColumn SPECIALREPAIRFLAG;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn TestMouldFlag;
     }
 }

+ 8 - 0
DK.Client/ReportModule/R03/M01/F_RPT_030102_1.cs

@@ -123,6 +123,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				this.dtpAuditDateEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
 				this.dtpAuditDateStart.Enabled = false;
 				this.dtpAuditDateEnd.Enabled = false;
+				this.chkTestMouldFlag.AllItemCheck();
 			}
 			catch (Exception ex)
 			{
@@ -249,6 +250,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dtpAuditDateStart.Enabled = false;
 			this.dtpAuditDateEnd.Enabled = false;
 			this.chkAuditDate.Checked = false;
+			this.chkTestMouldFlag.AllItemCheck();
 		}
 
 		/// <summary>
@@ -507,6 +509,12 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 
 			_rptse.SpecialRepairFlag = this.chkSpecialRepairFlag.Checked;
 			_rptse.ReFireFlag = this.chkReFireFlag.Checked;
+
+			object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
+			if (testMouldFlags.Length == 1)
+			{
+				_rptse.TestMouldFlag = testMouldFlags[0].ToString();
+			}
 		}
 
 		/// <summary>

+ 60 - 0
DK.Client/ReportModule/R03/M01/F_RPT_030102_1.resx

@@ -228,6 +228,9 @@
   <metadata name="SPECIALREPAIRFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -286,6 +289,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO

File diff suppressed because it is too large
+ 921 - 893
DK.Client/ReportModule/R03/M01/F_RPT_030106.Designer.cs


+ 7 - 0
DK.Client/ReportModule/R03/M01/F_RPT_030106.cs

@@ -121,6 +121,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 					this.dropRptProcedure.ValueMember = "Rptprocedureid";
 					this.dropRptProcedure.DisplayMember = "Rptprocedurename";
 				}
+				this.chkTestMouldFlag.AllItemCheck();
 			}
 			catch (Exception ex)
 			{
@@ -277,6 +278,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			{
 				this.dropRptProcedure.SelectedIndex = 0;
 			}
+			this.chkTestMouldFlag.AllItemCheck();
 		}
 
 		/// <summary>
@@ -433,6 +435,11 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			{
 				rptse.CompleteProcedureIDS = this.dkProcedureSearchBox1.ProcedureIDS;
 			}
+			object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
+			if (testMouldFlags.Length == 1)
+			{
+				rptse.TestMouldFlag = testMouldFlags[0].ToString();
+			}
 		}
 
 		/// <summary>

+ 60 - 0
DK.Client/ReportModule/R03/M01/F_RPT_030106.resx

@@ -178,6 +178,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
+        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
+        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
+        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
+        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
+        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
+        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
+        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
+        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
+        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
+        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
+        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
+        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
+        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
+        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
+        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
+        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
+        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
+        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
+        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
+        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
+        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
+        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
+        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
+        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
+        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
+        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
+        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
+        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
+        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
+        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
+        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
+        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
+        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
+        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
+        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
+        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
+        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
+        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
+        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
+        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
+        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
+        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -332,6 +389,9 @@
   <metadata name="Fyear.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 130 - 100
DK.Client/ReportModule/R08/F_RPT_080107.Designer.cs

@@ -40,8 +40,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.gbSelect = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-            this.dkSemiCheckDefectPositionSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox();
             this.chkReSemiCheckType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ValidCheckedBoxList();
             this.chkSemiCheckType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ValidCheckedBoxList();
             this.chkVNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
@@ -61,9 +59,6 @@
             this.lblSemiCheckUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtCUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.lblCUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dkRProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-            this.dkProcedureSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-            this.dkCProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
             this.txtReworkUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.lblReworkUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
@@ -100,6 +95,12 @@
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.dgvSemiCheck = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.dkSemiCheckDefectPositionSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox();
+            this.dkRProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dkProcedureSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dkCProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.chkTestMouldFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
             this.CProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SemiCheckID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -132,6 +133,7 @@
             this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DefectUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CurrProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TestMouldFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.gbSelect.SuspendLayout();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvSemiCheck)).BeginInit();
@@ -143,6 +145,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbSelect.BackColor = System.Drawing.Color.Transparent;
             this.gbSelect.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbSelect.BackgroundImage")));
+            this.gbSelect.Controls.Add(this.chkTestMouldFlag);
             this.gbSelect.Controls.Add(this.lblGoodsType);
             this.gbSelect.Controls.Add(this.scbGoodsType);
             this.gbSelect.Controls.Add(this.dkSemiCheckDefectPositionSearchBox1);
@@ -223,31 +226,6 @@
             this.lblGoodsType.TabIndex = 57;
             this.lblGoodsType.Text = "产品类别";
             // 
-            // scbGoodsType
-            // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(72, 24);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
-            this.scbGoodsType.TabIndex = 56;
-            // 
-            // dkSemiCheckDefectPositionSearchBox1
-            // 
-            this.dkSemiCheckDefectPositionSearchBox1.DataSource = null;
-            this.dkSemiCheckDefectPositionSearchBox1.DefectFineCode = null;
-            this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS = null;
-            this.dkSemiCheckDefectPositionSearchBox1.Enabled = true;
-            this.dkSemiCheckDefectPositionSearchBox1.IsMustInput = false;
-            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(198, 181);
-            this.dkSemiCheckDefectPositionSearchBox1.Name = "dkSemiCheckDefectPositionSearchBox1";
-            this.dkSemiCheckDefectPositionSearchBox1.PurviewType = ((byte)(0));
-            this.dkSemiCheckDefectPositionSearchBox1.SelectMore = true;
-            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(180, 21);
-            this.dkSemiCheckDefectPositionSearchBox1.TabIndex = 48;
-            this.dkSemiCheckDefectPositionSearchBox1.Title = "缺陷位置";
-            this.dkSemiCheckDefectPositionSearchBox1.TxtUserBackColor = System.Drawing.SystemColors.Control;
-            // 
             // chkReSemiCheckType
             // 
             this.chkReSemiCheckType.BackColor = System.Drawing.SystemColors.Window;
@@ -499,72 +477,6 @@
             this.lblCUserCode.TabIndex = 16;
             this.lblCUserCode.Text = "完成工号";
             // 
-            // dkRProcedureSearchBox
-            // 
-            this.dkRProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
-            this.dkRProcedureSearchBox.DataSource = null;
-            this.dkRProcedureSearchBox.Enabled = true;
-            this.dkRProcedureSearchBox.IsEnablePurview = false;
-            this.dkRProcedureSearchBox.IsMustInput = false;
-            this.dkRProcedureSearchBox.Location = new System.Drawing.Point(12, 105);
-            this.dkRProcedureSearchBox.ModelType = null;
-            this.dkRProcedureSearchBox.Name = "dkRProcedureSearchBox";
-            this.dkRProcedureSearchBox.ProcedureCode = "";
-            this.dkRProcedureSearchBox.ProcedureID = null;
-            this.dkRProcedureSearchBox.ProcedureIDS = null;
-            this.dkRProcedureSearchBox.ProcedureName = null;
-            this.dkRProcedureSearchBox.Purview = null;
-            this.dkRProcedureSearchBox.PurviewType = ((byte)(0));
-            this.dkRProcedureSearchBox.SelectMore = true;
-            this.dkRProcedureSearchBox.Size = new System.Drawing.Size(180, 21);
-            this.dkRProcedureSearchBox.TabIndex = 22;
-            this.dkRProcedureSearchBox.Title = "返工工序";
-            this.dkRProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-            // 
-            // dkProcedureSearchBox1
-            // 
-            this.dkProcedureSearchBox1.BackColor = System.Drawing.Color.Transparent;
-            this.dkProcedureSearchBox1.DataSource = null;
-            this.dkProcedureSearchBox1.Enabled = true;
-            this.dkProcedureSearchBox1.IsEnablePurview = false;
-            this.dkProcedureSearchBox1.IsMustInput = false;
-            this.dkProcedureSearchBox1.Location = new System.Drawing.Point(400, 181);
-            this.dkProcedureSearchBox1.ModelType = null;
-            this.dkProcedureSearchBox1.Name = "dkProcedureSearchBox1";
-            this.dkProcedureSearchBox1.ProcedureCode = "";
-            this.dkProcedureSearchBox1.ProcedureID = null;
-            this.dkProcedureSearchBox1.ProcedureIDS = null;
-            this.dkProcedureSearchBox1.ProcedureName = null;
-            this.dkProcedureSearchBox1.Purview = null;
-            this.dkProcedureSearchBox1.PurviewType = ((byte)(0));
-            this.dkProcedureSearchBox1.SelectMore = true;
-            this.dkProcedureSearchBox1.Size = new System.Drawing.Size(197, 21);
-            this.dkProcedureSearchBox1.TabIndex = 49;
-            this.dkProcedureSearchBox1.Title = "责任工序";
-            this.dkProcedureSearchBox1.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-            // 
-            // dkCProcedureSearchBox
-            // 
-            this.dkCProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
-            this.dkCProcedureSearchBox.DataSource = null;
-            this.dkCProcedureSearchBox.Enabled = true;
-            this.dkCProcedureSearchBox.IsEnablePurview = false;
-            this.dkCProcedureSearchBox.IsMustInput = false;
-            this.dkCProcedureSearchBox.Location = new System.Drawing.Point(12, 78);
-            this.dkCProcedureSearchBox.ModelType = null;
-            this.dkCProcedureSearchBox.Name = "dkCProcedureSearchBox";
-            this.dkCProcedureSearchBox.ProcedureCode = "";
-            this.dkCProcedureSearchBox.ProcedureID = null;
-            this.dkCProcedureSearchBox.ProcedureIDS = null;
-            this.dkCProcedureSearchBox.ProcedureName = null;
-            this.dkCProcedureSearchBox.Purview = null;
-            this.dkCProcedureSearchBox.PurviewType = ((byte)(0));
-            this.dkCProcedureSearchBox.SelectMore = true;
-            this.dkCProcedureSearchBox.Size = new System.Drawing.Size(180, 21);
-            this.dkCProcedureSearchBox.TabIndex = 15;
-            this.dkCProcedureSearchBox.Title = "完成工序";
-            this.dkCProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-            // 
             // txtReworkUserCode
             // 
             this.txtReworkUserCode.BackColor = System.Drawing.SystemColors.Window;
@@ -1056,7 +968,8 @@
             this.DefectPositionName,
             this.ProcedureName,
             this.DefectUser,
-            this.CurrProcedureName});
+            this.CurrProcedureName,
+            this.TestMouldFlag});
             this.dgvSemiCheck.ColumnTreeView = null;
             this.dgvSemiCheck.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
             this.dgvSemiCheck.DynamicColumnName = "";
@@ -1092,6 +1005,111 @@
             this.dgvSemiCheck.TotalSumColumns = null;
             this.dgvSemiCheck.ViewRowFilter = "";
             // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(72, 24);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
+            this.scbGoodsType.TabIndex = 56;
+            // 
+            // dkSemiCheckDefectPositionSearchBox1
+            // 
+            this.dkSemiCheckDefectPositionSearchBox1.DataSource = null;
+            this.dkSemiCheckDefectPositionSearchBox1.DefectFineCode = null;
+            this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS = null;
+            this.dkSemiCheckDefectPositionSearchBox1.Enabled = true;
+            this.dkSemiCheckDefectPositionSearchBox1.IsMustInput = false;
+            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(198, 181);
+            this.dkSemiCheckDefectPositionSearchBox1.Name = "dkSemiCheckDefectPositionSearchBox1";
+            this.dkSemiCheckDefectPositionSearchBox1.PurviewType = ((byte)(0));
+            this.dkSemiCheckDefectPositionSearchBox1.SelectMore = true;
+            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(180, 21);
+            this.dkSemiCheckDefectPositionSearchBox1.TabIndex = 48;
+            this.dkSemiCheckDefectPositionSearchBox1.Title = "缺陷位置";
+            this.dkSemiCheckDefectPositionSearchBox1.TxtUserBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkRProcedureSearchBox
+            // 
+            this.dkRProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkRProcedureSearchBox.DataSource = null;
+            this.dkRProcedureSearchBox.Enabled = true;
+            this.dkRProcedureSearchBox.IsEnablePurview = false;
+            this.dkRProcedureSearchBox.IsMustInput = false;
+            this.dkRProcedureSearchBox.Location = new System.Drawing.Point(12, 105);
+            this.dkRProcedureSearchBox.ModelType = null;
+            this.dkRProcedureSearchBox.Name = "dkRProcedureSearchBox";
+            this.dkRProcedureSearchBox.ProcedureCode = "";
+            this.dkRProcedureSearchBox.ProcedureID = null;
+            this.dkRProcedureSearchBox.ProcedureIDS = null;
+            this.dkRProcedureSearchBox.ProcedureName = null;
+            this.dkRProcedureSearchBox.Purview = null;
+            this.dkRProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkRProcedureSearchBox.SelectMore = true;
+            this.dkRProcedureSearchBox.Size = new System.Drawing.Size(180, 21);
+            this.dkRProcedureSearchBox.TabIndex = 22;
+            this.dkRProcedureSearchBox.Title = "返工工序";
+            this.dkRProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkProcedureSearchBox1
+            // 
+            this.dkProcedureSearchBox1.BackColor = System.Drawing.Color.Transparent;
+            this.dkProcedureSearchBox1.DataSource = null;
+            this.dkProcedureSearchBox1.Enabled = true;
+            this.dkProcedureSearchBox1.IsEnablePurview = false;
+            this.dkProcedureSearchBox1.IsMustInput = false;
+            this.dkProcedureSearchBox1.Location = new System.Drawing.Point(400, 181);
+            this.dkProcedureSearchBox1.ModelType = null;
+            this.dkProcedureSearchBox1.Name = "dkProcedureSearchBox1";
+            this.dkProcedureSearchBox1.ProcedureCode = "";
+            this.dkProcedureSearchBox1.ProcedureID = null;
+            this.dkProcedureSearchBox1.ProcedureIDS = null;
+            this.dkProcedureSearchBox1.ProcedureName = null;
+            this.dkProcedureSearchBox1.Purview = null;
+            this.dkProcedureSearchBox1.PurviewType = ((byte)(0));
+            this.dkProcedureSearchBox1.SelectMore = true;
+            this.dkProcedureSearchBox1.Size = new System.Drawing.Size(197, 21);
+            this.dkProcedureSearchBox1.TabIndex = 49;
+            this.dkProcedureSearchBox1.Title = "责任工序";
+            this.dkProcedureSearchBox1.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkCProcedureSearchBox
+            // 
+            this.dkCProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkCProcedureSearchBox.DataSource = null;
+            this.dkCProcedureSearchBox.Enabled = true;
+            this.dkCProcedureSearchBox.IsEnablePurview = false;
+            this.dkCProcedureSearchBox.IsMustInput = false;
+            this.dkCProcedureSearchBox.Location = new System.Drawing.Point(12, 78);
+            this.dkCProcedureSearchBox.ModelType = null;
+            this.dkCProcedureSearchBox.Name = "dkCProcedureSearchBox";
+            this.dkCProcedureSearchBox.ProcedureCode = "";
+            this.dkCProcedureSearchBox.ProcedureID = null;
+            this.dkCProcedureSearchBox.ProcedureIDS = null;
+            this.dkCProcedureSearchBox.ProcedureName = null;
+            this.dkCProcedureSearchBox.Purview = null;
+            this.dkCProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkCProcedureSearchBox.SelectMore = true;
+            this.dkCProcedureSearchBox.Size = new System.Drawing.Size(180, 21);
+            this.dkCProcedureSearchBox.TabIndex = 15;
+            this.dkCProcedureSearchBox.Title = "完成工序";
+            this.dkCProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // chkTestMouldFlag
+            // 
+            this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
+            this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
+            this.chkTestMouldFlag.FalseText = "否";
+            this.chkTestMouldFlag.Location = new System.Drawing.Point(767, 162);
+            this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkTestMouldFlag.Name = "chkTestMouldFlag";
+            this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
+            this.chkTestMouldFlag.TabIndex = 58;
+            this.chkTestMouldFlag.Title = "试验标识";
+            this.chkTestMouldFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.chkTestMouldFlag.TrueText = "是";
+            // 
             // CProcedureName
             // 
             this.CProcedureName.DataPropertyName = "CProcedureName";
@@ -1329,6 +1347,16 @@
             this.CurrProcedureName.Name = "CurrProcedureName";
             this.CurrProcedureName.ReadOnly = true;
             // 
+            // TestMouldFlag
+            // 
+            this.TestMouldFlag.DataPropertyName = "TestMouldFlag";
+            this.TestMouldFlag.FalseValue = "0";
+            this.TestMouldFlag.HeaderText = "试验标识";
+            this.TestMouldFlag.IndeterminateValue = "0";
+            this.TestMouldFlag.Name = "TestMouldFlag";
+            this.TestMouldFlag.ReadOnly = true;
+            this.TestMouldFlag.TrueValue = "1";
+            // 
             // F_RPT_080107
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1412,6 +1440,9 @@
         private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox1;
         private Basics.BaseControls.C_TextBox txtDefectUser;
         private Basics.BaseControls.C_Label lblDefectUser;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+        private Basics.BaseControls.C_StatusCheckBox chkTestMouldFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn CProcedureName;
         private System.Windows.Forms.DataGridViewTextBoxColumn SemiCheckID;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureTime;
@@ -1444,7 +1475,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureName;
         private System.Windows.Forms.DataGridViewTextBoxColumn DefectUser;
         private System.Windows.Forms.DataGridViewTextBoxColumn CurrProcedureName;
-		private Basics.BaseControls.C_Label lblGoodsType;
-		private Controls.SearchBox.ScbGoodsType scbGoodsType;
-	}
+        private System.Windows.Forms.DataGridViewCheckBoxColumn TestMouldFlag;
+    }
 }

+ 9 - 0
DK.Client/ReportModule/R08/F_RPT_080107.cs

@@ -206,6 +206,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dkSemiCheckDefectPositionSearchBox1.ClearControl();
 			this.dkProcedureSearchBox1.ClearControl();
 			this.txtDefectUser.Text = string.Empty;
+			this.chkTestMouldFlag.AllItemCheck();
 		}
 
 		/// <summary>
@@ -353,6 +354,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 						this.chkReSemiCheckType.DataSource = drReSemiCheckType.CopyToDataTable();
 					}
 				}
+				this.chkTestMouldFlag.AllItemCheck();
 			}
 			catch (Exception ex)
 			{
@@ -526,6 +528,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				entity.DefectPositionIDS = this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS;
 				entity.DefectProcedureIDS = this.dkProcedureSearchBox1.ProcedureIDS;
 				entity.DefectUser = this.txtDefectUser.Text.Trim();
+
+				object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
+				if (testMouldFlags.Length == 1)
+				{
+					entity.TestMouldFlag = testMouldFlags[0].ToString();
+				}
+
 				ServiceResultEntity resultEntity = ReportModuleProxy.Service.GetRPT080107IData(entity);
 				return resultEntity.Data;
 			}

+ 60 - 0
DK.Client/ReportModule/R08/F_RPT_080107.resx

@@ -175,6 +175,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="chkReSemiCheckType.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
@@ -335,6 +392,9 @@
   <metadata name="CurrProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="TestMouldFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>45</value>
   </metadata>

+ 25 - 1
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -297,6 +297,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                         sql.Append(" AND gdd.CreateTime <= :GCTimeEnd");
                         parameters.Add(new OracleParameter(":GCTimeEnd", OracleDbType.Date, se.GCTimeEnd.Value, ParameterDirection.Input));
                     }
+                    // 试验标识
+                    if (!string.IsNullOrEmpty(se.TestMouldFlag))
+                    {
+                        sql.Append(" AND gdd.TestMouldFlag = :TestMouldFlag");
+                        parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
+                    }
 
                     //sql.Append(" AND  TP_PM_GroutingDailyDetail.GroutingLineID  in(Select PurviewID from TP_MST_UserPurview where PurviewType= 5 and UserID = :UserID) ");
                     sql.Append("    AND exists (Select 1  from TP_MST_UserPurview up where up.PurviewType= 5 and up.UserID = :UserID and (up.PurviewID = -1 or up.PurviewID= gdd.GroutingLineID))");
@@ -386,6 +392,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                             //2021年12月28日11:01:36 by fy modify 添加防伪码
                             "      gdd.SecurityCode, " +
                             "      gdd.testflag, " +
+                            "      gdd.testmouldflag, " +
                             "      case when gdd.testflag = 1 then '试验线' when gdd.testflag = 0 then '普通线' end testflagname " +
                             "from TP_PM_GroutingDailyDetail gdd " +
                             "inner join TP_PM_GroutingDaily gd on gd.GroutingDailyID = gdd.GroutingDailyID " +
@@ -6221,6 +6228,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             "      ,gdd.DeliverTime\n" +
             "      ,gdd.ISPUBLICBODY\n" +
             "      ,gdd.SPECIALREPAIRFLAG\n" +
+            "      ,gdd.TESTMOULDFLAG\n" +
             "      ,lg.logoname\n" +
             "      ,sp.CreateTime\n" +
             "      ,sp.Remarks\n" +
@@ -6305,6 +6313,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             "                       gdd.GroutingDate >= :GTimeStart)\n" +
             "                   AND (:GTimeEnd IS NULL OR\n" +
             "                       gdd.GroutingDate <= :GTimeEnd)\n" +
+            "                   AND (:TestMouldFlag IS NULL OR gdd.TestMouldFlag = :TestMouldFlag)\n" +
             "   AND (:CreatUser IS NULL OR instr(cu.UserCode, :CreatUser) > 0)\n" +
             "   AND (:AuditUser IS NULL OR instr(au.UserCode, :AuditUser) > 0)\n" +
             "   AND (:GoodsID IS NULL OR sp.goodsid = :GoodsID)\n" +
@@ -6357,6 +6366,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             parameters.Add(new OracleParameter(":GTimeStart", OracleDbType.Date, se.GTimeStart, ParameterDirection.Input));
             parameters.Add(new OracleParameter(":GTimeEnd", OracleDbType.Date, se.GTimeEnd, ParameterDirection.Input));
             parameters.Add(new OracleParameter(":GoodsID", OracleDbType.Int32, se.GoodsID, ParameterDirection.Input));
+            parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
 
             if (se.ResponProcedureID == "")
             {
@@ -9916,6 +9926,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           0\n" +
                 "        END reworkflag" +
                 "     ,gdd.glazingroom" +
+                "     ,gdd.testmouldflag" +
                 "     ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode\n";
 
                 if (!string.IsNullOrEmpty(se.Fyear))
@@ -10096,6 +10107,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql = selSql + "  AND hopd.CreateTime<= :HandOverTimeEnd  ";
                 parameters.Add(new OracleParameter(":HandOverTimeEnd", OracleDbType.Date, se.HandOverTimeEnd.Value, ParameterDirection.Input));
             }
+            // 试验标识
+            if (!string.IsNullOrEmpty(se.TestMouldFlag))
+            {
+                selSql += "  AND gdd.TestMouldFlag = :TestMouldFlag  ";
+                parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
+            }
             //if (!string.IsNullOrEmpty(se.PurViewUserCodeIDS))
             //{
             //    selSql = selSql + " AND instr(','||:PurViewUserCodeIDS||',',','||TP_PM_Defect.DefectUserID||',')>0 ";
@@ -13063,7 +13080,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                                     concat(SemiCheckDefect.DefectPositionCode||'->',SemiCheckDefect.DefectPositionName) as DefectPositionName,
                                     Procedure.ProcedureName,
                                     inpp.ProcedureName CurrProcedureName,
-                                    DefectUser.username as DefectUser
+                                    DefectUser.username as DefectUser,
+                                    GroutingDailyDetail.testmouldflag
                                     from  TP_PM_SemiCheck SemiCheck
                                     left join TP_PC_Procedure CProcedure
                                     on SemiCheck.ProcedureID=CProcedure.ProcedureID
@@ -13276,6 +13294,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 sqlString = sqlString + "  AND instr(DefectUser.UserCode,:DefectUser)>0";
                 parameters.Add(new OracleParameter(":DefectUser", OracleDbType.NVarchar2, se.DefectUser, ParameterDirection.Input));
             }
+            // 试验标识
+            if (!string.IsNullOrEmpty(se.TestMouldFlag))
+            {
+                sqlString = sqlString + " AND GroutingDailyDetail.TestMouldFlag = :TestMouldFlag ";
+                parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
+            }
             return sqlString;
         }
 

+ 10 - 0
WCF.Service/WCF.DataModels/PMModule/SemiCheckEntity.cs

@@ -567,5 +567,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+
+        /// <summary>
+        /// 试验标识
+        /// </summary>
+        [DataMember]
+        public string TestMouldFlag
+        {
+            get;
+            set;
+        }
     }
 }

+ 20 - 10
WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT010101_SE.cs

@@ -10,7 +10,7 @@
 
 
 using System;
-using System.Runtime.Serialization; 
+using System.Runtime.Serialization;
 
 namespace Dongke.IBOSS.PRD.WCF.DataModels
 {
@@ -141,15 +141,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set;
         }
 
-		/// <summary>
-		/// 注浆批次
-		/// </summary>
-		[DataMember]
-		public int? GroutingBatchNo
-		{
-			get;
-			set;
-		}
+        /// <summary>
+        /// 注浆批次
+        /// </summary>
+        [DataMember]
+        public int? GroutingBatchNo
+        {
+            get;
+            set;
+        }
 
         /// <summary>
         /// 绑定条码标识
@@ -260,5 +260,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+
+        /// <summary>
+        /// 试验标识
+        /// </summary>
+        [DataMember]
+        public string TestMouldFlag 
+        { 
+            get; 
+            set; 
+        }
     }
 }

+ 10 - 0
WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT030102_SE.cs

@@ -249,5 +249,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+
+        /// <summary>
+        /// 试验标识
+        /// </summary>
+        [DataMember]
+        public string TestMouldFlag
+        {
+            get;
+            set;
+        }
     }
 }

+ 10 - 0
WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT030106_SE.cs

@@ -296,5 +296,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+
+        /// <summary>
+        /// 试验标识
+        /// </summary>
+        [DataMember]
+        public string TestMouldFlag
+        {
+            get;
+            set;
+        }
     }
 }

Some files were not shown because too many files changed in this diff