成型班长

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -99,6 +99,7 @@
             this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.collogo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ScrapFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.DeliverFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -729,6 +730,7 @@
             this.BarCode,
             this.collogo,
             this.GMouldTypeName,
+            this.MONITORName,
             this.ScrapFlag,
             this.DeliverFlag,
             this.DeliverTime,
@@ -928,6 +930,13 @@
             this.GMouldTypeName.Name = "GMouldTypeName";
             this.GMouldTypeName.ReadOnly = true;
             // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "成型班长";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
             // ScrapFlag
             // 
             this.ScrapFlag.DataPropertyName = "ScrapFlag";
@@ -1044,6 +1053,9 @@
         private Basics.BaseControls.C_Label c_Label4;
         private Basics.BaseControls.C_DateTimePicker dtpDeliverTimeEnd;
         private Basics.BaseControls.C_DateTimePicker dtpDeliverTimeBegin;
+        private Basics.BaseControls.C_StatusCheckBox chkDeliverFlag;
+        private Basics.BaseControls.C_CheckBox chkDeliverTime;
+        private System.Windows.Forms.ToolStripButton tsbtnUnLast;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyDetailID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
@@ -1063,14 +1075,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn collogo;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ScrapFlag;
         private System.Windows.Forms.DataGridViewCheckBoxColumn DeliverFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn Createuser;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-        private Basics.BaseControls.C_StatusCheckBox chkDeliverFlag;
-        private Basics.BaseControls.C_CheckBox chkDeliverTime;
-        private System.Windows.Forms.ToolStripButton tsbtnUnLast;
     }
 }

DK.Client/PMModule/F_PM_0101.resx

@@ -479,6 +479,9 @@
   <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ScrapFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/PMModule/F_PM_0202.Designer.cs

@@ -87,6 +87,7 @@
             this.colGMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DMCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ProcedureTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -653,6 +654,7 @@
             this.colGMouldStatus,
             this.GroutingCount,
             this.GMouldTypeName,
+            this.MONITORname,
             this.DMCreateTime,
             this.ProcedureName,
             this.ProcedureTime,
@@ -800,6 +802,13 @@
             this.GMouldTypeName.Name = "GMouldTypeName";
             this.GMouldTypeName.ReadOnly = true;
             // 
+            // MONITORname
+            // 
+            this.MONITORname.DataPropertyName = "MONITORname";
+            this.MONITORname.HeaderText = "成型班长";
+            this.MONITORname.Name = "MONITORname";
+            this.MONITORname.ReadOnly = true;
+            // 
             // DMCreateTime
             // 
             this.DMCreateTime.DataPropertyName = "DMCreateTime";
@@ -931,6 +940,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn colGMouldStatus;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORname;
         private System.Windows.Forms.DataGridViewTextBoxColumn DMCreateTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureName;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureTime;

DK.Client/PMModule/F_PM_0202.resx

@@ -233,6 +233,9 @@
   <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="DMCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/PMModule/F_PM_0203.Designer.cs

@@ -84,6 +84,7 @@
             this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -622,6 +623,7 @@
             this.GroutingDate,
             this.GroutingBatchNo,
             this.UserCode,
+            this.MONITORName,
             this.GoodsCode,
             this.GoodsName,
             this.GroutingMouldCode,
@@ -641,11 +643,19 @@
             this.dgvBarCodes.DynamicColumnName = "";
             this.dgvBarCodes.EnableHeadersVisualStyles = false;
             this.dgvBarCodes.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvBarCodes.FormatQuantityColumns = null;
+            this.dgvBarCodes.HorizontalMergeColumn = null;
             this.dgvBarCodes.IsAutoCountSum = true;
             this.dgvBarCodes.IsAutoResizeColumns = false;
             this.dgvBarCodes.IsClickF12 = false;
+            this.dgvBarCodes.IsOpenMergeCellFlag = false;
             this.dgvBarCodes.IsSubTotalFlag = false;
+            this.dgvBarCodes.IsTopDeep = false;
             this.dgvBarCodes.Location = new System.Drawing.Point(0, 142);
+            this.dgvBarCodes.MergeColumnNames = null;
+            this.dgvBarCodes.MergeDetailColumnNames = null;
+            this.dgvBarCodes.MergeDetailOnlyColumn = null;
+            this.dgvBarCodes.MergeOnlyColumn = null;
             this.dgvBarCodes.MultiSelect = false;
             this.dgvBarCodes.Name = "dgvBarCodes";
             this.dgvBarCodes.ReadOnly = true;
@@ -754,6 +764,13 @@
             this.UserCode.Name = "UserCode";
             this.UserCode.ReadOnly = true;
             // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "成型班长";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
             // GoodsCode
             // 
             this.GoodsCode.DataPropertyName = "GoodsCode";
@@ -869,6 +886,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;

DK.Client/PMModule/F_PM_0203.resx

@@ -180,20 +180,18 @@
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="colBarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -232,6 +230,9 @@
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R01/M01/F_RPT_010103.resx

@@ -168,6 +168,9 @@
   <metadata name="check1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.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>

DK.Client/ReportModule/R01/M01/F_RPT_010104.Designer.cs

@@ -32,26 +32,9 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010104));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgvGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DETAILGMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.txtRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
@@ -76,6 +59,24 @@
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DETAILGMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).BeginInit();
             this.gbxCondition.SuspendLayout();
             this.tsrOperate.SuspendLayout();
@@ -124,6 +125,7 @@
             this.MouldQuantity,
             this.GMouldTypeName,
             this.UserCode,
+            this.MONITORName,
             this.GMOULDSTATUSNAME,
             this.Remarks});
             this.dgvGroutingLine.ColumnTreeView = null;
@@ -171,129 +173,6 @@
             this.dgvGroutingLine.ViewRowFilter = "";
             this.dgvGroutingLine.VirtualMode = true;
             // 
-            // GroutingLineID
-            // 
-            this.GroutingLineID.DataPropertyName = "GroutingLineID";
-            this.GroutingLineID.HeaderText = "成型生产线ID";
-            this.GroutingLineID.Name = "GroutingLineID";
-            this.GroutingLineID.ReadOnly = true;
-            this.GroutingLineID.Visible = false;
-            // 
-            // GroutingLineCode
-            // 
-            this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
-            this.GroutingLineCode.HeaderText = "成型线编码";
-            this.GroutingLineCode.Name = "GroutingLineCode";
-            this.GroutingLineCode.ReadOnly = true;
-            // 
-            // GroutingLineName
-            // 
-            this.GroutingLineName.DataPropertyName = "GroutingLineName";
-            this.GroutingLineName.HeaderText = "成型线名称";
-            this.GroutingLineName.Name = "GroutingLineName";
-            this.GroutingLineName.ReadOnly = true;
-            // 
-            // GroutingMouldCode
-            // 
-            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-            this.GroutingMouldCode.HeaderText = "模具编号";
-            this.GroutingMouldCode.Name = "GroutingMouldCode";
-            this.GroutingMouldCode.ReadOnly = true;
-            // 
-            // GOODSCODE
-            // 
-            this.GOODSCODE.DataPropertyName = "GOODSCODE";
-            this.GOODSCODE.HeaderText = "产品编码";
-            this.GOODSCODE.Name = "GOODSCODE";
-            this.GOODSCODE.ReadOnly = true;
-            // 
-            // GoodsName
-            // 
-            this.GoodsName.DataPropertyName = "GoodsName";
-            this.GoodsName.HeaderText = "产品名称";
-            this.GoodsName.Name = "GoodsName";
-            this.GoodsName.ReadOnly = true;
-            // 
-            // GoodsSpecification
-            // 
-            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
-            this.GoodsSpecification.HeaderText = "产品规格";
-            this.GoodsSpecification.Name = "GoodsSpecification";
-            this.GoodsSpecification.ReadOnly = true;
-            // 
-            // GroutingCount
-            // 
-            this.GroutingCount.DataPropertyName = "GroutingCount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
-            this.GroutingCount.HeaderText = "注浆次数";
-            this.GroutingCount.Name = "GroutingCount";
-            this.GroutingCount.ReadOnly = true;
-            // 
-            // DETAILGMOULDSTATUSNAME
-            // 
-            this.DETAILGMOULDSTATUSNAME.DataPropertyName = "DETAILGMOULDSTATUSNAME";
-            this.DETAILGMOULDSTATUSNAME.HeaderText = "模具状态";
-            this.DETAILGMOULDSTATUSNAME.Name = "DETAILGMOULDSTATUSNAME";
-            this.DETAILGMOULDSTATUSNAME.ReadOnly = true;
-            // 
-            // BuildingNo
-            // 
-            this.BuildingNo.DataPropertyName = "BuildingNo";
-            this.BuildingNo.HeaderText = "楼号";
-            this.BuildingNo.Name = "BuildingNo";
-            this.BuildingNo.ReadOnly = true;
-            // 
-            // FloorNo
-            // 
-            this.FloorNo.DataPropertyName = "FloorNo";
-            this.FloorNo.HeaderText = "楼层";
-            this.FloorNo.Name = "FloorNo";
-            this.FloorNo.ReadOnly = true;
-            // 
-            // GroutingLineNo
-            // 
-            this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
-            this.GroutingLineNo.HeaderText = "线号";
-            this.GroutingLineNo.Name = "GroutingLineNo";
-            this.GroutingLineNo.ReadOnly = true;
-            // 
-            // MouldQuantity
-            // 
-            this.MouldQuantity.DataPropertyName = "MouldQuantity";
-            this.MouldQuantity.HeaderText = "模具个数";
-            this.MouldQuantity.Name = "MouldQuantity";
-            this.MouldQuantity.ReadOnly = true;
-            // 
-            // GMouldTypeName
-            // 
-            this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
-            this.GMouldTypeName.HeaderText = "成型线类别";
-            this.GMouldTypeName.Name = "GMouldTypeName";
-            this.GMouldTypeName.ReadOnly = true;
-            // 
-            // UserCode
-            // 
-            this.UserCode.DataPropertyName = "UserCode";
-            this.UserCode.HeaderText = "成型工号";
-            this.UserCode.Name = "UserCode";
-            this.UserCode.ReadOnly = true;
-            // 
-            // GMOULDSTATUSNAME
-            // 
-            this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
-            this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
-            this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
-            this.GMOULDSTATUSNAME.ReadOnly = true;
-            this.GMOULDSTATUSNAME.Width = 120;
-            // 
-            // Remarks
-            // 
-            this.Remarks.DataPropertyName = "Remarks";
-            this.Remarks.HeaderText = "备注";
-            this.Remarks.Name = "Remarks";
-            this.Remarks.ReadOnly = true;
-            // 
             // btnClearCondition
             // 
             this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -627,6 +506,136 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
+            // GroutingLineID
+            // 
+            this.GroutingLineID.DataPropertyName = "GroutingLineID";
+            this.GroutingLineID.HeaderText = "成型生产线ID";
+            this.GroutingLineID.Name = "GroutingLineID";
+            this.GroutingLineID.ReadOnly = true;
+            this.GroutingLineID.Visible = false;
+            // 
+            // GroutingLineCode
+            // 
+            this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
+            this.GroutingLineCode.HeaderText = "成型线编码";
+            this.GroutingLineCode.Name = "GroutingLineCode";
+            this.GroutingLineCode.ReadOnly = true;
+            // 
+            // GroutingLineName
+            // 
+            this.GroutingLineName.DataPropertyName = "GroutingLineName";
+            this.GroutingLineName.HeaderText = "成型线名称";
+            this.GroutingLineName.Name = "GroutingLineName";
+            this.GroutingLineName.ReadOnly = true;
+            // 
+            // GroutingMouldCode
+            // 
+            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+            this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.Name = "GroutingMouldCode";
+            this.GroutingMouldCode.ReadOnly = true;
+            // 
+            // GOODSCODE
+            // 
+            this.GOODSCODE.DataPropertyName = "GOODSCODE";
+            this.GOODSCODE.HeaderText = "产品编码";
+            this.GOODSCODE.Name = "GOODSCODE";
+            this.GOODSCODE.ReadOnly = true;
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
+            // 
+            // GoodsSpecification
+            // 
+            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
+            this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.Name = "GoodsSpecification";
+            this.GoodsSpecification.ReadOnly = true;
+            // 
+            // GroutingCount
+            // 
+            this.GroutingCount.DataPropertyName = "GroutingCount";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
+            this.GroutingCount.HeaderText = "注浆次数";
+            this.GroutingCount.Name = "GroutingCount";
+            this.GroutingCount.ReadOnly = true;
+            // 
+            // DETAILGMOULDSTATUSNAME
+            // 
+            this.DETAILGMOULDSTATUSNAME.DataPropertyName = "DETAILGMOULDSTATUSNAME";
+            this.DETAILGMOULDSTATUSNAME.HeaderText = "模具状态";
+            this.DETAILGMOULDSTATUSNAME.Name = "DETAILGMOULDSTATUSNAME";
+            this.DETAILGMOULDSTATUSNAME.ReadOnly = true;
+            // 
+            // BuildingNo
+            // 
+            this.BuildingNo.DataPropertyName = "BuildingNo";
+            this.BuildingNo.HeaderText = "楼号";
+            this.BuildingNo.Name = "BuildingNo";
+            this.BuildingNo.ReadOnly = true;
+            // 
+            // FloorNo
+            // 
+            this.FloorNo.DataPropertyName = "FloorNo";
+            this.FloorNo.HeaderText = "楼层";
+            this.FloorNo.Name = "FloorNo";
+            this.FloorNo.ReadOnly = true;
+            // 
+            // GroutingLineNo
+            // 
+            this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
+            this.GroutingLineNo.HeaderText = "线号";
+            this.GroutingLineNo.Name = "GroutingLineNo";
+            this.GroutingLineNo.ReadOnly = true;
+            // 
+            // MouldQuantity
+            // 
+            this.MouldQuantity.DataPropertyName = "MouldQuantity";
+            this.MouldQuantity.HeaderText = "模具个数";
+            this.MouldQuantity.Name = "MouldQuantity";
+            this.MouldQuantity.ReadOnly = true;
+            // 
+            // GMouldTypeName
+            // 
+            this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
+            this.GMouldTypeName.HeaderText = "成型线类别";
+            this.GMouldTypeName.Name = "GMouldTypeName";
+            this.GMouldTypeName.ReadOnly = true;
+            // 
+            // UserCode
+            // 
+            this.UserCode.DataPropertyName = "UserCode";
+            this.UserCode.HeaderText = "成型工号";
+            this.UserCode.Name = "UserCode";
+            this.UserCode.ReadOnly = true;
+            // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "成型班长";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
+            // GMOULDSTATUSNAME
+            // 
+            this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
+            this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.ReadOnly = true;
+            this.GMOULDSTATUSNAME.Width = 120;
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.Name = "Remarks";
+            this.Remarks.ReadOnly = true;
+            // 
             // F_RPT_010104
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -673,6 +682,8 @@
         private System.Windows.Forms.ToolStripButton tsbtnClose;
         private Basics.BaseControls.C_TextBox txtGoodsCode;
         private Basics.BaseControls.C_Label c_Label1;
+		private Basics.BaseControls.C_Label lblGMouldType;
+		private Controls.SearchBox.ScbGMouldType scbGMouldType;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
@@ -688,9 +699,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn MouldQuantity;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMOULDSTATUSNAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private Basics.BaseControls.C_Label lblGMouldType;
-		private Controls.SearchBox.ScbGMouldType scbGMouldType;
-	}
+    }
 }

DK.Client/ReportModule/R01/M01/F_RPT_010104.resx

@@ -135,6 +135,9 @@
   <metadata name="DETAILGMOULDSTATUSNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.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="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DK.Client/ReportModule/R01/M01/F_RPT_010106.resx

@@ -209,6 +209,9 @@
   <metadata name="usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="goodscode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R01/M03/F_RPT_010301_1.Designer.cs

@@ -63,6 +63,7 @@
             this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).BeginInit();
@@ -275,17 +276,26 @@
             this.GroutingMouldCode,
             this.GroutingDate,
             this.GroutingCount,
-            this.GroutingUserCode});
+            this.GroutingUserCode,
+            this.MONITORName});
             this.dgvReportModule.ColumnTreeView = null;
             this.dgvReportModule.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.dgvReportModule.DynamicColumnName = "";
             this.dgvReportModule.EnableHeadersVisualStyles = false;
             this.dgvReportModule.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvReportModule.FormatQuantityColumns = null;
+            this.dgvReportModule.HorizontalMergeColumn = null;
             this.dgvReportModule.IsAutoCountSum = true;
             this.dgvReportModule.IsAutoResizeColumns = false;
             this.dgvReportModule.IsClickF12 = false;
+            this.dgvReportModule.IsOpenMergeCellFlag = false;
             this.dgvReportModule.IsSubTotalFlag = false;
+            this.dgvReportModule.IsTopDeep = false;
             this.dgvReportModule.Location = new System.Drawing.Point(0, 90);
+            this.dgvReportModule.MergeColumnNames = null;
+            this.dgvReportModule.MergeDetailColumnNames = null;
+            this.dgvReportModule.MergeDetailOnlyColumn = null;
+            this.dgvReportModule.MergeOnlyColumn = null;
             this.dgvReportModule.MultiSelect = false;
             this.dgvReportModule.Name = "dgvReportModule";
             this.dgvReportModule.ReadOnly = true;
@@ -419,6 +429,13 @@
             this.GroutingUserCode.ReadOnly = true;
             this.GroutingUserCode.Width = 60;
             // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "成型班长";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
             // F_RPT_010301_1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -470,5 +487,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
     }
 }

DK.Client/ReportModule/R01/M03/F_RPT_010301_1.resx

@@ -180,20 +180,18 @@
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACOSURBVGhD7dChEcQgFEDBaxCJjqMFLIqCUgG94Gji35y4
-        yUTDc09sA/sppYT29d5jjBFrrTD1EFMBpgJMBZgKMBVgKsBUgKkAUwGmAkwFmAp4pV7XFdrXWjP1NFMB
-        pgJqrU9qzjm075865zT1FFMBpgJMBZgKMBVgKsBUgKmAX+p936ae9EpNKYX2PakzvjyGRAUGdwqwAAAA
-        AElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -238,6 +236,9 @@
   <metadata name="GroutingUserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.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>53</value>
   </metadata>

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

@@ -206,6 +206,9 @@
   <metadata name="usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="groutingcount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R03/M01/F_RPT_030116.Designer.cs

@@ -33,25 +33,25 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = 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();
@@ -71,10 +71,21 @@
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.dgvG1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.g1GOODSID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1goodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1rdcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1gldcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1rddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1reserveddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1ProfitNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.dgvG2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.dgvG3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.g2GOODSID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2goodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -82,28 +93,19 @@
             this.g2groutinglineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2userid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2rdcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2gldcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2rddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2reserveddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g2ProfitNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.dgvG3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.g3barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g3groutinglinecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g3GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g3goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g3usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.glMONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g3groutingdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1GOODSID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1goodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1rdcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1gldcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1rddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1reserveddays = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1ProfitNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.gbSelect.SuspendLayout();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvG1)).BeginInit();
@@ -438,6 +440,85 @@
             this.dgvG1.ViewRowFilter = "";
             this.dgvG1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvG1_CellDoubleClick);
             // 
+            // g1GOODSID
+            // 
+            this.g1GOODSID.DataPropertyName = "GOODSID";
+            this.g1GOODSID.HeaderText = "GOODSID";
+            this.g1GOODSID.Name = "g1GOODSID";
+            this.g1GOODSID.ReadOnly = true;
+            this.g1GOODSID.Visible = false;
+            // 
+            // g1goodstypename2
+            // 
+            this.g1goodstypename2.DataPropertyName = "goodstypename2";
+            this.g1goodstypename2.HeaderText = "产品大类";
+            this.g1goodstypename2.Name = "g1goodstypename2";
+            this.g1goodstypename2.ReadOnly = true;
+            // 
+            // goodstypename
+            // 
+            this.goodstypename.DataPropertyName = "goodstypename";
+            this.goodstypename.HeaderText = "产品类别";
+            this.goodstypename.Name = "goodstypename";
+            this.goodstypename.ReadOnly = true;
+            // 
+            // g1GOODSCODE
+            // 
+            this.g1GOODSCODE.DataPropertyName = "GOODSCODE";
+            this.g1GOODSCODE.HeaderText = "产品编码";
+            this.g1GOODSCODE.Name = "g1GOODSCODE";
+            this.g1GOODSCODE.ReadOnly = true;
+            // 
+            // g1rdcount
+            // 
+            this.g1rdcount.DataPropertyName = "rdcount";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.Format = "N0";
+            this.g1rdcount.DefaultCellStyle = dataGridViewCellStyle3;
+            this.g1rdcount.HeaderText = "存坯数";
+            this.g1rdcount.Name = "g1rdcount";
+            this.g1rdcount.ReadOnly = true;
+            // 
+            // g1gldcount
+            // 
+            this.g1gldcount.DataPropertyName = "gldcount";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Format = "N0";
+            this.g1gldcount.DefaultCellStyle = dataGridViewCellStyle4;
+            this.g1gldcount.HeaderText = "模具数";
+            this.g1gldcount.Name = "g1gldcount";
+            this.g1gldcount.ReadOnly = true;
+            // 
+            // g1rddays
+            // 
+            this.g1rddays.DataPropertyName = "rddays";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.Format = "N2";
+            this.g1rddays.DefaultCellStyle = dataGridViewCellStyle5;
+            this.g1rddays.HeaderText = "存坯天数";
+            this.g1rddays.Name = "g1rddays";
+            this.g1rddays.ReadOnly = true;
+            // 
+            // g1reserveddays
+            // 
+            this.g1reserveddays.DataPropertyName = "reserveddays";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Format = "N0";
+            this.g1reserveddays.DefaultCellStyle = dataGridViewCellStyle6;
+            this.g1reserveddays.HeaderText = "应存天数";
+            this.g1reserveddays.Name = "g1reserveddays";
+            this.g1reserveddays.ReadOnly = true;
+            // 
+            // g1ProfitNum
+            // 
+            this.g1ProfitNum.DataPropertyName = "ProfitNum";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Format = "N0";
+            this.g1ProfitNum.DefaultCellStyle = dataGridViewCellStyle7;
+            this.g1ProfitNum.HeaderText = "盈亏坯数";
+            this.g1ProfitNum.Name = "g1ProfitNum";
+            this.g1ProfitNum.ReadOnly = true;
+            // 
             // tabControl1
             // 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -504,6 +585,7 @@
             this.g2groutinglineCode,
             this.g2userid,
             this.g2usercode,
+            this.MONITORName,
             this.g2rdcount,
             this.g2gldcount,
             this.g2rddays,
@@ -554,6 +636,92 @@
             this.dgvG2.ViewRowFilter = "";
             this.dgvG2.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvG2_CellDoubleClick);
             // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.dgvG3);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(935, 281);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "成型存坯明细表";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // dgvG3
+            // 
+            this.dgvG3.AllowUserToAddRows = false;
+            this.dgvG3.AllowUserToDeleteRows = false;
+            this.dgvG3.AllowUserToModifyRows = true;
+            this.dgvG3.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvG3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
+            this.dgvG3.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvG3.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvG3.CellHeight = 23;
+            this.dgvG3.ChildNodeColumnName = null;
+            this.dgvG3.ChildNodeColumnText = null;
+            this.dgvG3.ColumnDeep = 1;
+            this.dgvG3.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvG3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
+            this.dgvG3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvG3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.g3barcode,
+            this.g3groutinglinecode,
+            this.g3GroutingMouldCode,
+            this.g3goodscode,
+            this.g3usercode,
+            this.glMONITORName,
+            this.g3groutingdate});
+            this.dgvG3.ColumnTreeView = null;
+            this.dgvG3.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)));
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvG3.DefaultCellStyle = dataGridViewCellStyle22;
+            this.dgvG3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvG3.DynamicColumnName = "";
+            this.dgvG3.EnableHeadersVisualStyles = false;
+            this.dgvG3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvG3.FormatQuantityColumns = null;
+            this.dgvG3.HorizontalMergeColumn = null;
+            this.dgvG3.IsAutoCountSum = true;
+            this.dgvG3.IsAutoResizeColumns = false;
+            this.dgvG3.IsClickF12 = false;
+            this.dgvG3.IsOpenMergeCellFlag = false;
+            this.dgvG3.IsSubTotalFlag = false;
+            this.dgvG3.IsTopDeep = false;
+            this.dgvG3.Location = new System.Drawing.Point(0, 0);
+            this.dgvG3.Margin = new System.Windows.Forms.Padding(0);
+            this.dgvG3.MergeColumnNames = null;
+            this.dgvG3.MergeDetailColumnNames = null;
+            this.dgvG3.MergeDetailOnlyColumn = null;
+            this.dgvG3.MergeOnlyColumn = null;
+            this.dgvG3.MultiSelect = false;
+            this.dgvG3.Name = "dgvG3";
+            this.dgvG3.ReadOnly = true;
+            this.dgvG3.RefreshAtHscroll = false;
+            this.dgvG3.RowHeadersWidth = 50;
+            this.dgvG3.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvG3.RowsDefaultCellStyle = dataGridViewCellStyle23;
+            this.dgvG3.RowTemplate.Height = 21;
+            this.dgvG3.Size = new System.Drawing.Size(935, 281);
+            this.dgvG3.SortOrderColumnName = null;
+            this.dgvG3.TabIndex = 3;
+            this.dgvG3.Tag = true;
+            this.dgvG3.TotalSumColumns = null;
+            this.dgvG3.ViewRowFilter = "";
+            // 
             // g2GOODSID
             // 
             this.g2GOODSID.DataPropertyName = "GOODSID";
@@ -606,6 +774,13 @@
             this.g2usercode.Name = "g2usercode";
             this.g2usercode.ReadOnly = true;
             // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "成型班长";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
             // g2rdcount
             // 
             this.g2rdcount.DataPropertyName = "rdcount";
@@ -656,91 +831,6 @@
             this.g2ProfitNum.Name = "g2ProfitNum";
             this.g2ProfitNum.ReadOnly = true;
             // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.dgvG3);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(935, 281);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "成型存坯明细表";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // dgvG3
-            // 
-            this.dgvG3.AllowUserToAddRows = false;
-            this.dgvG3.AllowUserToDeleteRows = false;
-            this.dgvG3.AllowUserToModifyRows = true;
-            this.dgvG3.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvG3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
-            this.dgvG3.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvG3.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvG3.CellHeight = 23;
-            this.dgvG3.ChildNodeColumnName = null;
-            this.dgvG3.ChildNodeColumnText = null;
-            this.dgvG3.ColumnDeep = 1;
-            this.dgvG3.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvG3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
-            this.dgvG3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvG3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.g3barcode,
-            this.g3groutinglinecode,
-            this.g3GroutingMouldCode,
-            this.g3goodscode,
-            this.g3usercode,
-            this.g3groutingdate});
-            this.dgvG3.ColumnTreeView = null;
-            this.dgvG3.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)));
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvG3.DefaultCellStyle = dataGridViewCellStyle22;
-            this.dgvG3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvG3.DynamicColumnName = "";
-            this.dgvG3.EnableHeadersVisualStyles = false;
-            this.dgvG3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvG3.FormatQuantityColumns = null;
-            this.dgvG3.HorizontalMergeColumn = null;
-            this.dgvG3.IsAutoCountSum = true;
-            this.dgvG3.IsAutoResizeColumns = false;
-            this.dgvG3.IsClickF12 = false;
-            this.dgvG3.IsOpenMergeCellFlag = false;
-            this.dgvG3.IsSubTotalFlag = false;
-            this.dgvG3.IsTopDeep = false;
-            this.dgvG3.Location = new System.Drawing.Point(0, 0);
-            this.dgvG3.Margin = new System.Windows.Forms.Padding(0);
-            this.dgvG3.MergeColumnNames = null;
-            this.dgvG3.MergeDetailColumnNames = null;
-            this.dgvG3.MergeDetailOnlyColumn = null;
-            this.dgvG3.MergeOnlyColumn = null;
-            this.dgvG3.MultiSelect = false;
-            this.dgvG3.Name = "dgvG3";
-            this.dgvG3.ReadOnly = true;
-            this.dgvG3.RefreshAtHscroll = false;
-            this.dgvG3.RowHeadersWidth = 50;
-            this.dgvG3.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvG3.RowsDefaultCellStyle = dataGridViewCellStyle23;
-            this.dgvG3.RowTemplate.Height = 21;
-            this.dgvG3.Size = new System.Drawing.Size(935, 281);
-            this.dgvG3.SortOrderColumnName = null;
-            this.dgvG3.TabIndex = 3;
-            this.dgvG3.Tag = true;
-            this.dgvG3.TotalSumColumns = null;
-            this.dgvG3.ViewRowFilter = "";
-            // 
             // g3barcode
             // 
             this.g3barcode.DataPropertyName = "barcode";
@@ -776,6 +866,13 @@
             this.g3usercode.Name = "g3usercode";
             this.g3usercode.ReadOnly = true;
             // 
+            // glMONITORName
+            // 
+            this.glMONITORName.DataPropertyName = "MONITORName";
+            this.glMONITORName.HeaderText = "成型班长";
+            this.glMONITORName.Name = "glMONITORName";
+            this.glMONITORName.ReadOnly = true;
+            // 
             // g3groutingdate
             // 
             this.g3groutingdate.DataPropertyName = "groutingdate";
@@ -787,85 +884,6 @@
             this.g3groutingdate.Name = "g3groutingdate";
             this.g3groutingdate.ReadOnly = true;
             // 
-            // g1GOODSID
-            // 
-            this.g1GOODSID.DataPropertyName = "GOODSID";
-            this.g1GOODSID.HeaderText = "GOODSID";
-            this.g1GOODSID.Name = "g1GOODSID";
-            this.g1GOODSID.ReadOnly = true;
-            this.g1GOODSID.Visible = false;
-            // 
-            // g1goodstypename2
-            // 
-            this.g1goodstypename2.DataPropertyName = "goodstypename2";
-            this.g1goodstypename2.HeaderText = "产品大类";
-            this.g1goodstypename2.Name = "g1goodstypename2";
-            this.g1goodstypename2.ReadOnly = true;
-            // 
-            // goodstypename
-            // 
-            this.goodstypename.DataPropertyName = "goodstypename";
-            this.goodstypename.HeaderText = "产品类别";
-            this.goodstypename.Name = "goodstypename";
-            this.goodstypename.ReadOnly = true;
-            // 
-            // g1GOODSCODE
-            // 
-            this.g1GOODSCODE.DataPropertyName = "GOODSCODE";
-            this.g1GOODSCODE.HeaderText = "产品编码";
-            this.g1GOODSCODE.Name = "g1GOODSCODE";
-            this.g1GOODSCODE.ReadOnly = true;
-            // 
-            // g1rdcount
-            // 
-            this.g1rdcount.DataPropertyName = "rdcount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.Format = "N0";
-            this.g1rdcount.DefaultCellStyle = dataGridViewCellStyle3;
-            this.g1rdcount.HeaderText = "存坯数";
-            this.g1rdcount.Name = "g1rdcount";
-            this.g1rdcount.ReadOnly = true;
-            // 
-            // g1gldcount
-            // 
-            this.g1gldcount.DataPropertyName = "gldcount";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Format = "N0";
-            this.g1gldcount.DefaultCellStyle = dataGridViewCellStyle4;
-            this.g1gldcount.HeaderText = "模具数";
-            this.g1gldcount.Name = "g1gldcount";
-            this.g1gldcount.ReadOnly = true;
-            // 
-            // g1rddays
-            // 
-            this.g1rddays.DataPropertyName = "rddays";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Format = "N2";
-            this.g1rddays.DefaultCellStyle = dataGridViewCellStyle5;
-            this.g1rddays.HeaderText = "存坯天数";
-            this.g1rddays.Name = "g1rddays";
-            this.g1rddays.ReadOnly = true;
-            // 
-            // g1reserveddays
-            // 
-            this.g1reserveddays.DataPropertyName = "reserveddays";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Format = "N0";
-            this.g1reserveddays.DefaultCellStyle = dataGridViewCellStyle6;
-            this.g1reserveddays.HeaderText = "应存天数";
-            this.g1reserveddays.Name = "g1reserveddays";
-            this.g1reserveddays.ReadOnly = true;
-            // 
-            // g1ProfitNum
-            // 
-            this.g1ProfitNum.DataPropertyName = "ProfitNum";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Format = "N0";
-            this.g1ProfitNum.DefaultCellStyle = dataGridViewCellStyle7;
-            this.g1ProfitNum.HeaderText = "盈亏坯数";
-            this.g1ProfitNum.Name = "g1ProfitNum";
-            this.g1ProfitNum.ReadOnly = true;
-            // 
             // F_RPT_030116
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -918,6 +936,17 @@
         private System.Windows.Forms.CheckBox chkGDate;
         private Basics.BaseControls.C_Label c_Label2;
         private Basics.BaseControls.C_DataGridView dgvG2;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1GOODSID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1goodstypename2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1GOODSCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1rdcount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1gldcount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1rddays;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1reserveddays;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1ProfitNum;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2GOODSID;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2goodstypename2;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2GOODSCODE;
@@ -925,27 +954,18 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn g2groutinglineCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2userid;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2usercode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2rdcount;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2gldcount;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2rddays;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2reserveddays;
         private System.Windows.Forms.DataGridViewTextBoxColumn g2ProfitNum;
-		private Basics.BaseControls.C_Label lblGoodsType;
-		private Controls.SearchBox.ScbGoodsType scbGoodsType;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3barcode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3groutinglinecode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3GroutingMouldCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3goodscode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3usercode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn g3groutingdate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1GOODSID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1goodstypename2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1GOODSCODE;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1rdcount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1gldcount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1rddays;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1reserveddays;
-        private System.Windows.Forms.DataGridViewTextBoxColumn g1ProfitNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3barcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3groutinglinecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3GroutingMouldCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3goodscode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3usercode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn glMONITORName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g3groutingdate;
     }
 }

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

@@ -242,6 +242,9 @@
   <metadata name="g2usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g2rdcount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -272,6 +275,9 @@
   <metadata name="g3usercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="glMONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g3groutingdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -326,6 +326,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 "       GDD.DeliverTime," +
                 // 交坯标识
                 "       GDD.DeliverFlag," +
+                // 成型班长
+                "       MU.UserName AS MONITORName," +
                 // 创建时间
                 "       GDD.CreateTime," +
                 // 创建工号
@@ -344,6 +346,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 // 创建工号
                 " INNER JOIN TP_MST_User U" +
                 "    ON U.UserID = GDD.CreateUserID" +
+                // 成型线
+                " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = GDD.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID" +
                 // 未注浆原因
                 "  LEFT JOIN TP_MST_DataDictionary DD" +
                 "    ON DD.DictionaryID = GDD.NoGroutingRreason" +
@@ -3341,7 +3349,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 }
 
                 sql.Append(" GROUP BY GDD.GroutingLineCode, GDD.GroutingLineName, GDD.GroutingDate, GDD.GroutingBatchNo,GDD.DeliverTime, GDD.UserCode, " +
-                            "       GDD.GoodsCode, GDD.GoodsName, GDD.GroutingMouldCode, GMS.GMouldStatusName, GDD.GroutingCount, " +
+                            "       GDD.GoodsCode, GDD.GoodsName, GDD.GroutingMouldCode, GMS.GMouldStatusName, GDD.GroutingCount, mu.username," +
                             "       GDD.Remarks, GMT.GMouldTypeName, GDD.BarCode, P.ProcedureName, IP.ProcedureTime, GDD.IsPublicBody");
                 sql.Append(" ) ");
 
@@ -3399,7 +3407,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 "       GoodsCode, GoodsName, GroutingMouldCode, GMouldStatusName," +
                 "       GroutingCount, Remarks, GMouldTypeName, BarCode, ProcedureName, ProcedureTime," +
                 "       IsPublicBody," +
-                "       DMCreateTime," +
+                "       DMCreateTime,MONITORName," +
                 "       WorkUserCodes,BarCodeRecord" +
                 "  FROM (" +
                   //"SELECT GDD.GroutingDailyDetailID," +
@@ -3429,6 +3437,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 "       GDD.Remarks," +
                 // 成型线类型
                 "       GMT.GMouldTypeName," +
+                // 成型班长
+                "       mu.username as MONITORName," +
                 // 绑定条码
                 "       GDD.BarCode," +
                 // 当前工序名称
@@ -3456,6 +3466,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 // 模具状态
                 " INNER JOIN TP_SYS_GMouldStatus GMS" +
                 "    ON GMS.GMouldStatusID = GDD.GMouldStatus" +
+                // 成型线
+                " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = GDD.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID" +
                 // 历史条码
                 "  LEFT JOIN TP_PM_BarCodeRecord BCR" +
                 "    ON BCR.FinalBarCode = GDD.BarCode" +
@@ -3887,6 +3903,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 "       GMS.GMouldStatusName," +
                 // 注浆次数
                 "       GDD.GroutingCount," +
+                // 成型班长
+                "       mu.username as MONITORName," +
                 // 成型线类型
                 "       GMT.GMouldTypeName " +
                 "  FROM TP_PM_BarCodeRecord BCR" +
@@ -3902,6 +3920,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 // 模具状态
                 " INNER JOIN TP_SYS_GMouldStatus GMS" +
                 "    ON GMS.GMouldStatusID = GDD.GMouldStatus" +
+                // 成型线
+                " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = GDD.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID" +
                 // 工序
                 "  LEFT JOIN TP_PC_Procedure P" +
                 "    ON P.ProcedureID = BCR.ProcedureID" +

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -157,14 +157,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					// 成型线IDS
 					if (!string.IsNullOrEmpty(se.GroutingLineIDS))
 					{
-						sql.Append("AND instr(','||:GroutingLineIDS||',',','||TP_PM_GroutingDailyDetail.GroutingLineId||',')>0 ");
+						sql.Append("AND instr(','||:GroutingLineIDS||',',','||gdd.GroutingLineId||',')>0 ");
 						parameters.Add(new OracleParameter(":GroutingLineIDS", OracleDbType.NVarchar2, se.GroutingLineIDS, ParameterDirection.Input));
 					}
 
 					// 产品IDS
 					if (!string.IsNullOrEmpty(se.GoodsIDS))
 					{
-						sql.Append("AND instr(','||:GoodsIDS||',',','||TP_PM_GroutingDailyDetail.GoodsId||',')>0 ");
+						sql.Append("AND instr(','||:GoodsIDS||',',','||gdd.GoodsId||',')>0 ");
 						parameters.Add(new OracleParameter(":GoodsIDS", OracleDbType.NVarchar2, se.GoodsIDS, ParameterDirection.Input));
 					}
 
@@ -179,34 +179,34 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					// 模具号
 					if (!string.IsNullOrEmpty(se.GroutingMouldCode))
 					{
-						sql.Append("AND instr(TP_PM_GroutingDailyDetail.GroutingMouldCode,:GroutingMouldCode)>0 ");
+						sql.Append("AND instr(gdd.GroutingMouldCode,:GroutingMouldCode)>0 ");
 						parameters.Add(new OracleParameter(":GroutingMouldCode", OracleDbType.NVarchar2, se.GroutingMouldCode, ParameterDirection.Input));
 					}
 
 					// 注浆时间-开始 
 					if (se.GroutingDateStart.HasValue)
 					{
-						sql.Append("AND TP_PM_GroutingDailyDetail.GroutingDate >= :GroutingDateStart ");
+						sql.Append("AND gdd.GroutingDate >= :GroutingDateStart ");
 						parameters.Add(new OracleParameter(":GroutingDateStart", OracleDbType.Date, se.GroutingDateStart.Value, ParameterDirection.Input));
 					}
 
 					// 模具类型IDS
 					if (se.GroutingDateEnd.HasValue)
 					{
-						sql.Append("AND TP_PM_GroutingDailyDetail.GroutingDate <= :GroutingDateEnd ");
+						sql.Append("AND gdd.GroutingDate <= :GroutingDateEnd ");
 						parameters.Add(new OracleParameter(":GroutingDateEnd", OracleDbType.Date, se.GroutingDateEnd.Value, ParameterDirection.Input));
 					}
 					if (se.GroutingBatchNo.HasValue)
 					{
 						//sql.Append(" AND TP_PM_GroutingDailyDetail.GroutingBatchNo = :GroutingBatchNo");
-						sql.Append(" AND instr(TP_PM_GroutingDailyDetail.GroutingBatchNo,:GroutingBatchNo)>0");
+						sql.Append(" AND instr(gdd.GroutingBatchNo,:GroutingBatchNo)>0");
 						parameters.Add(new OracleParameter(":GroutingBatchNo", OracleDbType.Int32, se.GroutingBatchNo, ParameterDirection.Input));
 					}
 
 					// 成型工号IDS
 					if (!string.IsNullOrEmpty(se.GroutingUserIDS))
 					{
-						sql.Append("and instr(',' || :GroutingUserIDS || ',' ,','||TP_PM_GroutingDailyDetail.UserID||',' )>0 ");
+						sql.Append("and instr(',' || :GroutingUserIDS || ',' ,','||gdd.UserID||',' )>0 ");
 						parameters.Add(new OracleParameter(":GroutingUserIDS", OracleDbType.Clob, se.GroutingUserIDS, ParameterDirection.Input));
 					}
 
@@ -220,26 +220,26 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					// 生产工号IDS
 					if (!string.IsNullOrEmpty(se.CreateUserIDS))
 					{
-						sql.Append("and instr(',' || :CreateUserIDS || ',' ,','||TP_PM_GroutingDailyDetail.CreateUserID||',' )>0 ");
+						sql.Append("and instr(',' || :CreateUserIDS || ',' ,','||gdd.CreateUserID||',' )>0 ");
 						parameters.Add(new OracleParameter(":CreateUserIDS", OracleDbType.NVarchar2, se.CreateUserIDS, ParameterDirection.Input));
 					}
 
 					// 备注
 					if (!string.IsNullOrEmpty(se.Remarks))
 					{
-						sql.Append(" AND INSTR(TP_PM_GroutingDailyDetail.Remarks, :Remarks) > 0");
+						sql.Append(" AND INSTR(gdd.Remarks, :Remarks) > 0");
 						parameters.Add(new OracleParameter(":Remarks", OracleDbType.NVarchar2, se.Remarks, ParameterDirection.Input));
 					}
 					// 注浆标识
 					if (!string.IsNullOrEmpty(se.GroutingFlag))
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.GroutingFlag = :GroutingFlag");
+						sql.Append(" AND gdd.GroutingFlag = :GroutingFlag");
 						parameters.Add(new OracleParameter(":GroutingFlag", OracleDbType.Char, se.GroutingFlag, ParameterDirection.Input));
 					}
 					// 损坯标识
 					if (!string.IsNullOrEmpty(se.ScrapFlag))
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.ScrapFlag = :ScrapFlag");
+						sql.Append(" AND gdd.ScrapFlag = :ScrapFlag");
 						parameters.Add(new OracleParameter(":ScrapFlag", OracleDbType.Char, se.ScrapFlag, ParameterDirection.Input));
 					}
 					// 绑定条码
@@ -247,65 +247,65 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					{
 						if ("1" == se.BarCodeFlag)
 						{
-							sql.Append(" AND LENGTH(TP_PM_GroutingDailyDetail.BarCode) > 0");
+							sql.Append(" AND LENGTH(gdd.BarCode) > 0");
 						}
 						else
 						{
-							sql.Append(" AND (TP_PM_GroutingDailyDetail.BarCode IS NULL OR LENGTH(TP_PM_GroutingDailyDetail.BarCode) = 0)");
+							sql.Append(" AND (gdd.BarCode IS NULL OR LENGTH(gdd.BarCode) = 0)");
 						}
 					}
 
 					// 交坯日期-开始
 					if (se.DeliverTimeBegin.HasValue)
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.DeliverTime >= :DeliverTimeBegin");
+						sql.Append(" AND gdd.DeliverTime >= :DeliverTimeBegin");
 						parameters.Add(new OracleParameter(":DeliverTimeBegin", OracleDbType.Date, se.DeliverTimeBegin.Value, ParameterDirection.Input));
 					}
 					// 交坯日期-结束
 					if (se.DeliverTimeEnd.HasValue)
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.DeliverTime <= :DeliverTimeEnd");
+						sql.Append(" AND gdd.DeliverTime <= :DeliverTimeEnd");
 						parameters.Add(new OracleParameter(":DeliverTimeEnd", OracleDbType.Date, se.DeliverTimeEnd.Value, ParameterDirection.Input));
 					}
 					// 交坯标识
 					if (!string.IsNullOrEmpty(se.DeliverFlag))
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.DeliverFlag = :DeliverFlag");
+						sql.Append(" AND gdd.DeliverFlag = :DeliverFlag");
 						parameters.Add(new OracleParameter(":DeliverFlag", OracleDbType.Char, se.DeliverFlag, ParameterDirection.Input));
 					}
 					// 损坯日期-开始
 					if (se.ScrapTimeBegin.HasValue)
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.ScrapTime >= :ScrapTimeBegin");
+						sql.Append(" AND gdd.ScrapTime >= :ScrapTimeBegin");
 						parameters.Add(new OracleParameter(":ScrapTimeBegin", OracleDbType.Date, se.ScrapTimeBegin.Value, ParameterDirection.Input));
 					}
 					// 损坯日期-结束
 					if (se.ScrapTimeEnd.HasValue)
 					{
-						sql.Append(" AND TP_PM_GroutingDailyDetail.ScrapTime <= :ScrapTimeEnd");
+						sql.Append(" AND gdd.ScrapTime <= :ScrapTimeEnd");
 						parameters.Add(new OracleParameter(":ScrapTimeEnd", OracleDbType.Date, se.ScrapTimeEnd.Value, ParameterDirection.Input));
                     }
                     // 注浆操作时间-开始
                     if (se.GCTimeBegin.HasValue)
                     {
-                        sql.Append(" AND TP_PM_GroutingDailyDetail.CreateTime >= :GCTimeBegin");
+                        sql.Append(" AND gdd.CreateTime >= :GCTimeBegin");
                         parameters.Add(new OracleParameter(":GCTimeBegin", OracleDbType.Date, se.GCTimeBegin.Value, ParameterDirection.Input));
                     }
                     // 注浆操作时间-结束
                     if (se.GCTimeEnd.HasValue)
                     {
-                        sql.Append(" AND TP_PM_GroutingDailyDetail.CreateTime <= :GCTimeEnd");
+                        sql.Append(" AND gdd.CreateTime <= :GCTimeEnd");
                         parameters.Add(new OracleParameter(":GCTimeEnd", OracleDbType.Date, se.GCTimeEnd.Value, 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= TP_PM_GroutingDailyDetail.GroutingLineID))");
+                    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))");
 					parameters.Add(new OracleParameter(":UserID", OracleDbType.NVarchar2, user.UserID, ParameterDirection.Input));
 				}
-				sql.Append(" order by TP_PM_GroutingDailyDetail.GroutingDate desc, ");
-				sql.Append("          TP_PM_GroutingDailyDetail.GroutingLineCode, ");
-				sql.Append("          TP_PM_GroutingDailyDetail.GroutingBatchNo, ");
-				sql.Append("          TP_PM_GroutingDailyDetail.GroutingMouldCode");
+				sql.Append(" order by gdd.GroutingDate desc, ");
+				sql.Append("          gdd.GroutingLineCode, ");
+				sql.Append("          gdd.GroutingBatchNo, ");
+				sql.Append("          gdd.GroutingMouldCode");
 				DataTable data = conn.GetSqlResultToDt(sql.ToString(), parameters.ToArray());
 
 				ServiceResultEntity sre = new ServiceResultEntity();
@@ -340,48 +340,48 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 		{
 			string selSql =
 							"select " +
-							"      TP_PM_GroutingDailyDetail.GroutingDate, " +
-							"      TP_PM_GroutingDailyDetail.GroutingBatchNo, " +
-							"      TP_PM_GroutingDailyDetail.GroutingLineCode, " +
+                            "      gdd.GroutingDate, " +
+                            "      gdd.GroutingBatchNo, " +
+                            "      gdd.GroutingLineCode, " +
 							"      TP_MST_GMouldType.Gmouldtypename, " +
 							"      TP_MST_GOODSTYPE.GOODSTYPENAME, " +
-							"      TP_PM_GroutingDailyDetail.GoodsCode, " +
+                            "      gdd.GoodsCode, " +
 							"      TP_MST_GOODS.GOODSSPECIFICATION, " +
-							"      TP_PM_GroutingDailyDetail.GroutingMouldCode, " +
+                            "      gdd.GroutingMouldCode, " +
 							"      TP_MST_DataDictionary.DICTIONARYVALUE, " +
-							"      TP_PM_GroutingDailyDetail.Groutingcount, " +
-							"      TP_PM_GroutingDailyDetail.Barcode, " +
+                            "      gdd.Groutingcount, " +
+                            "      gdd.Barcode, " +
 							"      tp_mst_user.UserCode CreateUserCode, " +
 							"      tp_mst_user.username CreateUserName, " +
-							"      TP_PM_GroutingDailyDetail.UserCode, " +
-							"      TP_PM_GroutingDailyDetail.SCRAPFLAG, " +
-							"      TP_PM_GroutingDailyDetail.GoodsName, " +
-							"      TP_PM_GroutingDailyDetail.GROUTINGFLAG, " +
-							"      TP_PM_GroutingDailyDetail.GMOULDSTATUS, " +
-							"      TP_PM_GroutingDailyDetail.DeliverTime, " +
-							"      TP_PM_GroutingDailyDetail.DeliverFlag, " +
+                            "      gdd.UserCode, " +
+                            "      gdd.SCRAPFLAG, " +
+                            "      gdd.GoodsName, " +
+                            "      gdd.GROUTINGFLAG, " +
+                            "      gdd.GMOULDSTATUS, " +
+                            "      gdd.DeliverTime, " +
+                            "      gdd.DeliverFlag, " +
 							"      tp_sys_gmouldstatus.gmouldstatusname, " +
 							"      b.dictionaryvalue AS NoGroutingRreason, " +
-							"      TP_PM_GroutingDailyDetail.SCRAPTIME, " +
-                            "      TP_PM_GroutingDailyDetail.CreateTime GCTime, " +
+                            "      gdd.SCRAPTIME, " +
+                            "      gdd.CreateTime GCTime, " +
                             "      mu.usercode MONITORCODE, " +
                             "      mu.username MONITORNAME, " +
                             "      replace((TP_MST_Logo.Logoname||'['||TP_MST_Logo.Logocode||']'),'[]','')  as LogoCodeName " +
-							"from TP_PM_GroutingDailyDetail " +
-                            "inner join TP_PM_GroutingDaily gd on gd.GroutingDailyID = TP_PM_GroutingDailyDetail.GroutingDailyID " +
+							"from TP_PM_GroutingDailyDetail gdd " +
+                            "inner join TP_PM_GroutingDaily gd on gd.GroutingDailyID = gdd.GroutingDailyID " +
                             "left  join tp_mst_user mu on mu.userid = gd.MONITORID " +
-                            "inner join TP_PC_GroutingLine on TP_PC_GroutingLine.GroutingLineID=TP_PM_GroutingDailyDetail.GroutingLineID " +
-							"inner join TP_MST_GMouldType on TP_MST_GMouldType.GMOULDTYPEID=TP_PC_GroutingLine.GMOULDTYPEID " +
-							"inner join TP_MST_Goods on TP_MST_Goods.Goodsid=TP_PM_GroutingDailyDetail.GoodsID " +
+                            "inner join TP_PC_GroutingLine on TP_PC_GroutingLine.GroutingLineID=gdd.GroutingLineID " +
+                            "inner join TP_MST_GMouldType on TP_MST_GMouldType.GMOULDTYPEID=TP_PC_GroutingLine.GMOULDTYPEID " +
+                            "inner join TP_MST_Goods on TP_MST_Goods.Goodsid=gdd.GoodsID " +
 							"inner join TP_MST_DataDictionary on TP_MST_DataDictionary.Dictionaryid=TP_MST_Goods.Glazetypeid " +
 							"inner join TP_MST_GOODSTYPE on TP_MST_GOODSTYPE.GOODSTYPEID=TP_MST_Goods.Goodstypeid " +
-							"inner join tp_sys_gmouldstatus on TP_PM_GroutingDailyDetail.gmouldstatus = tp_sys_gmouldstatus.gmouldstatusid " +
-							"left join tp_mst_user on TP_PM_GroutingDailyDetail.CreateUserID=tp_mst_user.userid " +
-							"left join TP_MST_DataDictionary b on TP_PM_GroutingDailyDetail.NoGroutingRreason=b.DictionaryID " +
-							"left join TP_MST_logo  on TP_PM_GroutingDailyDetail.logoid=TP_MST_logo.logoid " +
+                            "inner join tp_sys_gmouldstatus on gdd.gmouldstatus = tp_sys_gmouldstatus.gmouldstatusid " +
+                            "left join tp_mst_user on gdd.CreateUserID=tp_mst_user.userid " +
+							"left join TP_MST_DataDictionary b on gdd.NoGroutingRreason=b.DictionaryID " +
+                            "left join TP_MST_logo  on gdd.logoid=TP_MST_logo.logoid " +
 							"Where 1=1 " +
-							"and TP_PM_GroutingDailyDetail.Valueflag=1 " +
-							"and TP_PM_GroutingDailyDetail.AccountID=:AccountID ";
+                            "and gdd.Valueflag=1 " +
+                            "and gdd.AccountID=:AccountID ";
 
 			return selSql;
 		}
@@ -611,8 +611,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				+ "pd.GroutingUserID,"
 				//---注浆工号用户编号
 				+ "pd.GroutingUserCode, "
-				//--公坯标识
-				+ " pd.ISPUBLICBODY, "
+
+             // 成型班长
+             + "       mu.username as MONITORName,"
+
+                //--公坯标识
+                + " pd.ISPUBLICBODY, "
 				//--注浆次数
 				+ " gdd.GROUTINGCOUNT, "
 
@@ -621,8 +625,16 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				+ " , uc.usercode check1 "
 				//生产数据
 				+ "from TP_PM_PRODUCTIONDATA pd "
-				//注浆明细
-				+ " inner join TP_PM_GROUTINGDAILYDETAIL gdd on  pd.GROUTINGDAILYDETAILID=gdd.GROUTINGDAILYDETAILID "
+
+                // 成型线
+             + " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = pd.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID"
+
+                //注浆明细
+                + " inner join TP_PM_GROUTINGDAILYDETAIL gdd on  pd.GROUTINGDAILYDETAILID=gdd.GROUTINGDAILYDETAILID "
 				//模具类型
 				+ "inner join TP_MST_GMouldType gt "
 				+ "on pd.GMOULDTYPEID=gt.GMouldTypeID "
@@ -803,7 +815,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					"                INNER JOIN tp_mst_user gmu\n" +
 					"                   ON gmu.userid = gu.userid\n" +
 					"                WHERE gu.groutinglineid = gl.groutinglineid)) groutingusercode\n" +
-					"      ,g.goodscode\n" +
+                // 成型班长
+                "       ,mnu.username as MONITORName" +
+                    "      ,g.goodscode\n" +
 					"      ,g.goodsspecification\n" +
 					"      ,gt.goodstypename\n" +
 					"       --,gl.mouldquantity\n" +
@@ -864,7 +878,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					"    ON gms.gmouldstatusid = gl.gmouldstatus\n" +
 					" INNER JOIN tp_mst_user mu\n" +
 					"    ON mu.userid = gl.userid\n" +
-					" WHERE gl.accountid = :AccountID\n" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mnu" +
+                "    ON mnu.userid = gl.MONITORID" +
+
+                    " WHERE gl.accountid = :AccountID\n" +
 					"   AND gl.valueflag = '1'\n" +
 					"           AND (:Remarks is null or instr(gl.Remarks, :Remarks) > 0)\n" +
 					"           AND (:groutinglinecode is null or instr(gl.groutinglinecode, :groutinglinecode) > 0)\n" +
@@ -1513,12 +1531,17 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 			   + " TP_PM_GROUTINGDAILYDETAIL.GoodsName,  "
 			   + " TP_PC_PROCEDURE.PROCEDURECODE, "
 			   + " TP_PC_PROCEDURE.PROCEDURENAME, "
-			   + " TP_MST_USER.USERNAME, "
+                // 成型班长
+               + "       mu.username as MONITORName,"
+               + " TP_MST_USER.USERNAME, "
 			   + " replace((TP_MST_Logo.Logoname||'['||TP_MST_Logo.Logocode||']'),'[]','')  as LogoCodeName "
 			   + " from TP_PM_BarCodeRecord "
 			   + " left join TP_PM_GROUTINGDAILYDETAIL  on TP_PM_BarCodeRecord.FinalBarCode=TP_PM_GROUTINGDAILYDETAIL.Barcode "
 			   + " inner join TP_PC_GroutingLine on TP_PC_GroutingLine.GroutingLineID=TP_PM_GroutingDailyDetail.GroutingLineID "
-			   + " inner join TP_MST_GMouldType on TP_MST_GMouldType.GMOULDTYPEID=TP_PC_GroutingLine.GMOULDTYPEID "
+                // 成型班长
+               + " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = TP_PC_GroutingLine.MONITORID"
+               + " inner join TP_MST_GMouldType on TP_MST_GMouldType.GMOULDTYPEID=TP_PC_GroutingLine.GMOULDTYPEID "
 			   + " left join TP_PC_PROCEDURE  on TP_PM_BarCodeRecord.Procedureid=TP_PC_PROCEDURE.PROCEDUREID "
 			   + " left join TP_MST_USER  ON TP_PM_BarCodeRecord.CreateUserID=TP_MST_USER.USERID "
 			   + " left join TP_MST_logo  ON TP_MST_logo.logoid=TP_PM_GROUTINGDAILYDETAIL.logoid "
@@ -7776,7 +7799,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"              g.goodscode,\n" +
 				"              '--') goodscode\n" +
 				"      ,decode(g.gid, 0, g.usercode, '--') usercode\n" +
-				"      ,g.groutingcount\n" +
+                "      ,decode(g.gid, 0, g.MONITORName, '--') MONITORName\n" +
+                "      ,g.groutingcount\n" +
 				"      ,g.barcodecount\n" +
 				"      ,g.scrapcount\n" +
 				"      ,g.barscrapcount\n" +
@@ -7787,14 +7811,16 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"              ,gdd.goodstypename\n" +
 				"              ,gdd.goodscode\n" +
 				"              ,gdd.usercode\n" +
-				"              ,SUM(groutingcount) groutingcount\n" +
+                "              ,gdd.MONITORName\n" +
+                "              ,SUM(groutingcount) groutingcount\n" +
 				"              ,SUM(barcodecount) barcodecount\n" +
 				"              ,SUM(scrapcount) scrapcount\n" +
 				"              ,SUM(barscrapcount) barscrapcount\n" +
 				"              ,SUM(delivercount) delivercount\n" +
 				"          FROM (SELECT gt2.goodstypename goodstypename2\n" +
 				"                      ,gdd.usercode\n" +
-				"                      ,goods.goodscode\n" +
+                "                      ,mu.usercode as MONITORName\n" +
+                "                      ,goods.goodscode\n" +
 				"                      ,gt.goodstypename\n" +
 				"                      , CASE\n" +
 				"                          WHEN gdd.groutingdate >= :gdatabegin AND\n" +
@@ -7838,7 +7864,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"                  FROM tp_pm_groutingdailydetail gdd\n" +
 				"                  LEFT JOIN tp_mst_goods goods\n" +
 				"                    ON goods.goodsid = gdd.goodsid\n" +
-				"                  LEFT JOIN tp_mst_goodstype gt\n" +
+
+                // 成型线
+                " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = GDD.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID " +
+
+                "                  LEFT JOIN tp_mst_goodstype gt\n" +
 				"                    ON gt.goodstypeid = goods.goodstypeid\n" +
 				"                  LEFT JOIN tp_mst_goodstype gt2\n" +
 				"                    ON gt2.goodstypecode = substr(gt.goodstypecode, 1, 6)\n" +
@@ -7862,7 +7896,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"                         ,gt.goodstypename\n" +
 				"                         ,goods.goodscode\n" +
 				"                         ,gdd.usercode) gdd\n" +
-				"         GROUP BY GROUPING SETS((gdd.goodstypename2, gdd.goodstypename, gdd.goodscode, gdd.usercode),(gdd.goodstypename2, gdd.goodstypename, gdd.goodscode),(gdd.goodstypename2),())\n" +
+                "         GROUP BY GROUPING SETS((gdd.goodstypename2, gdd.goodstypename, gdd.goodscode, gdd.usercode,gdd.MONITORName),(gdd.goodstypename2, gdd.goodstypename, gdd.goodscode),(gdd.goodstypename2),())\n" +
 				"         ORDER BY gdd.goodstypename2\n" +
 				"                 ,gdd.goodstypename\n" +
 				"                 ,gdd.goodscode\n" +
@@ -14379,7 +14413,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"      ,t.groutinglinecode\n" +
 				"      ,t.userid\n" +
 				"      ,t.usercode\n" +
-				"      ,SUM(t.rdcount) rdcount\n" +
+                "      ,t.MONITORName\n" +
+                "      ,SUM(t.rdcount) rdcount\n" +
 				"      ,t.gldcount -- 模具数\n" +
 				"      ,t.rddays -- 存坯天数\n" +
 				"      ,t.reserveddays -- 应存天数\n" +
@@ -14392,7 +14427,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"              ,gdrd.groutinglinecode\n" +
 				"              ,gdrd.userid\n" +
 				"              ,gdrd.usercode\n" +
-				"              ,gdrd.gddc rdcount -- 存坯数\n" +
+                "              ,mu.username MONITORName\n" +
+                "              ,gdrd.gddc rdcount -- 存坯数\n" +
 				"              ,rdd.gldcount -- 模具数\n" +
 				"              , CASE\n" +
 				"                  WHEN rdd.gldcount IS NOT NULL AND rdd.gldcount > 0 THEN\n" +
@@ -14442,7 +14478,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"                         ,g.reserveddays) gdrd\n" +
 				"          LEFT JOIN (SELECT gld.goodsid\n" +
 				"                          ,gld.groutinglineid\n" +
-				"                          ,COUNT(*) gldcount\n" +
+                "                          ,gl.MONITORID\n" +
+                "                          ,COUNT(*) gldcount\n" +
 				"                      FROM tp_pc_groutinglinedetail gld\n" +
 				"                     INNER JOIN tp_pc_groutingline gl\n" +
 				"                        ON gl.groutinglineid = gld.groutinglineid\n" +
@@ -14451,17 +14488,20 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"                       AND gl.accountid = :accountid\n" +
 				"                       AND gl.valueflag = '1'\n" +
 				"                       AND gl.gmouldstatus = 1\n" +
-				"                     GROUP BY gld.goodsid, gld.groutinglineid) rdd\n" +
+                "                     GROUP BY gld.goodsid, gld.groutinglineid,gl.MONITORID) rdd\n" +
 				"            ON rdd.goodsid = gdrd.goodsid\n" +
 				"           AND rdd.groutinglineid = gdrd.groutinglineid\n" +
-				"         INNER JOIN tp_mst_goodstype gt2\n" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu\n" +
+                "    ON mu.userid = rdd.MONITORID\n" +
+                "         INNER JOIN tp_mst_goodstype gt2\n" +
 				"            ON gt2.accountid = :accountid\n" +
 				"           AND gt2.goodstypecode = gdrd.goodstypecode2\n" +
 				"         ORDER BY gt2.goodstypecode\n" +
 				"                 ,gdrd.goodscode\n" +
 				"                 ,gdrd.groutinglinecode\n" +
 				"                 ,gdrd.usercode) t\n" +
-				" GROUP BY GROUPING SETS((t.goodstypecode2, t.goodstypename2, t.goodsid, t.goodscode, t.groutinglineid, t.groutinglinecode, t.userid, t.usercode, t.gldcount, t.rddays, t.reserveddays),(t.goodstypecode2, t.goodstypename2),())";
+                " GROUP BY GROUPING SETS((t.goodstypecode2, t.goodstypename2, t.goodsid, t.goodscode, t.groutinglineid, t.groutinglinecode, t.userid, t.usercode,t.MONITORName, t.gldcount, t.rddays, t.reserveddays),(t.goodstypecode2, t.goodstypename2),())";
 
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{
@@ -14515,10 +14555,18 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				//"      ,gdd.userid\n" +
 				"      ,gdd.usercode\n" +
 				"      ,gdd.groutingdate\n" +
-				"  FROM tp_pm_groutingdailydetail gdd\n" +
+                // 成型班长
+                "       ,mu.username as MONITORName" +
+                "  FROM tp_pm_groutingdailydetail gdd\n" +
 				" INNER JOIN tp_mst_goods g\n" +
 				"    ON g.goodsid = gdd.goodsid\n" +
-				" INNER JOIN tp_mst_goodstype gt\n" +
+                // 成型线
+                " LEFT JOIN tp_pc_groutingline gl" +
+                "    ON gl.groutinglineid = GDD.GroutingLineID" +
+                // 成型班长
+                " LEFT JOIN tp_mst_user mu" +
+                "    ON mu.userid = gl.MONITORID " +
+                " INNER JOIN tp_mst_goodstype gt\n" +
 				"    ON g.goodstypeid = gt.goodstypeid\n" +
 				" WHERE gdd.accountid = :accountid\n" +
 				"   AND gdd.valueflag = '1'\n" +