全选、留瓷

DK.Client/PMModule/F_PM_2112.Designer.cs

@@ -110,6 +110,7 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.chkAll = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.dgvInProduction)).BeginInit();
             this.gbxCondition.SuspendLayout();
             this.tsrOperate.SuspendLayout();
@@ -560,6 +561,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.chkAll);
             this.gbxCondition.Controls.Add(this.txtBarcode);
             this.gbxCondition.Controls.Add(this.lblbarcode1);
             this.gbxCondition.Controls.Add(this.chkDeletedate);
@@ -851,7 +853,7 @@
             this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
             this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(950, 82);
+            this.btnClearCondition.Location = new System.Drawing.Point(1028, 82);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
             this.btnClearCondition.TabIndex = 15;
@@ -866,7 +868,7 @@
             this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
             this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(859, 82);
+            this.btnSearch.Location = new System.Drawing.Point(937, 82);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(85, 30);
             this.btnSearch.TabIndex = 14;
@@ -963,6 +965,18 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
+            // chkAll
+            // 
+            this.chkAll.AutoSize = true;
+            this.chkAll.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkAll.Location = new System.Drawing.Point(235, 89);
+            this.chkAll.Name = "chkAll";
+            this.chkAll.Size = new System.Drawing.Size(48, 16);
+            this.chkAll.TabIndex = 41;
+            this.chkAll.Text = "全选";
+            this.chkAll.UseVisualStyleBackColor = true;
+            this.chkAll.CheckedChanged += new System.EventHandler(this.chkAll_CheckedChanged);
+            // 
             // F_PM_2112
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1061,5 +1075,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserID;
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+        private Basics.BaseControls.C_CheckBox chkAll;
     }
 }

DK.Client/PMModule/F_PM_2112.cs

@@ -164,6 +164,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             {
                 this.dgvInProduction.DataSource = null;
                 this.dgvInProduction.DataSource = this.GetSearchData();
+                chkAll_CheckedChanged(null, null);
             }
             catch (Exception ex)
             {
@@ -210,6 +211,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             this.chkScrapDate.Checked = false;
             this.chkDeletedate.Checked = false;
             this.txtBarcode.Text = "";
+            chkAll.Checked = false;
         }
 
         /// <summary>
@@ -473,6 +475,34 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             dtpDeletedDateEnd.Enabled = chkDeletedate.Checked;
         }
 
+        /// <summary>
+        /// 全选改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void chkAll_CheckedChanged(object sender, EventArgs e)
+        {
+            try
+            {
+                DataTable dtInProduction = dgvInProduction.DataSource as DataTable;
+                if (dtInProduction == null || dtInProduction.Rows.Count == 0)
+                {
+                    return;
+                }
+
+                int isChoose = chkAll.Checked ? 1 : 0;
+                foreach (DataRow row in dtInProduction.Rows)
+                {
+                    row["Sel"] = isChoose;
+                }
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
         #endregion
 
         #region  私有方法

DK.Client/ReportModule/R03/M01/F_RPT_030106.resx

@@ -326,6 +326,9 @@
   <metadata name="glazingroom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="RetainFlag.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>
@@ -428,6 +431,9 @@
   <metadata name="bsqx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="RetainFlag1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="protime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -586,7 +592,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAAAXlJREFUeF7t2EENADAM
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAAAXlJREFUeF7t2EENADAM
         A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
         OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
         FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -9777,6 +9777,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"           0\n" +
 				"        END reworkflag" +
                 "     ,gdd.glazingroom" +
+				"     ,gdd.retainflag" +
+
 				"  FROM tp_pm_defect pmd\n" +
 				"  LEFT JOIN TP_MST_Goods g\n" +
 				"    ON pmd.Goodsid = g.Goodsid\n" +
@@ -10091,6 +10093,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"          ELSE\n" +
 				"           0\n" +
 				"        END AS undoflag\n" +
+				"       ,gdd.retainflag" +
 				"  FROM tp_pm_defect pmd\n" +
 				"  LEFT JOIN TP_PC_Procedure p\n" +
 				"    ON p.procedureid = pmd.procedureid\n" +
@@ -10108,6 +10111,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"    ON mstd.DefectTypeID = dt.DefectTypeID\n" +
 				" INNER JOIN tp_pm_productiondata pd\n" +
 				"    ON pmd.ProductionDataID = pd.ProductionDataID\n" +
+				 " LEFT JOIN TP_PM_GroutingDailyDetail gdd\n" +
+				"    ON gdd.Groutingdailydetailid = pd.Groutingdailydetailid\n" +
 				"  LEFT JOIN tp_mst_goodslevel gl\n" +
 				"    ON pd.goodslevelid = gl.goodslevelid\n" +
 				//"-- 交接工序\n" +