产成品交接增加物料编码查询条件，增加全选

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

@@ -52,6 +52,10 @@
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -59,10 +63,6 @@
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_030112));
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.tblScrapTotalModule = new System.Windows.Forms.TabControl();
 			this.tapScrapTotalModule = new System.Windows.Forms.TabPage();
 			this.dgvOrder = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
@@ -117,6 +117,27 @@
 			this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.taptemp = new System.Windows.Forms.TabPage();
 			this.dgvtemporarily = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.Sel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_Column_CheckBox();
+			this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BANMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.FINISHEDLOADBATCHNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn39 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn40 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn41 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn42 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn44 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn45 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
 			this.tapLuoCi = new System.Windows.Forms.TabPage();
 			this.dgvlc = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.dataGridViewTextBoxColumn30 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -173,27 +194,9 @@
 			this.lblFHUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.lblGoodsModel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.lblOrderNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.Sel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BANMA = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.FINISHEDLOADBATCHNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn39 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn40 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn41 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn42 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn44 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn45 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.txtMaterialCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.tblScrapTotalModule.SuspendLayout();
 			this.tapScrapTotalModule.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvOrder)).BeginInit();
@@ -225,12 +228,12 @@
 			this.tblScrapTotalModule.Controls.Add(this.taptemp);
 			this.tblScrapTotalModule.Controls.Add(this.tapLuoCi);
 			this.tblScrapTotalModule.Controls.Add(this.tapLuoCiDetail);
-			this.tblScrapTotalModule.Location = new System.Drawing.Point(0, 109);
+			this.tblScrapTotalModule.Location = new System.Drawing.Point(0, 137);
 			this.tblScrapTotalModule.Margin = new System.Windows.Forms.Padding(0);
 			this.tblScrapTotalModule.Name = "tblScrapTotalModule";
 			this.tblScrapTotalModule.Padding = new System.Drawing.Point(0, 0);
 			this.tblScrapTotalModule.SelectedIndex = 0;
-			this.tblScrapTotalModule.Size = new System.Drawing.Size(1151, 427);
+			this.tblScrapTotalModule.Size = new System.Drawing.Size(1151, 399);
 			this.tblScrapTotalModule.TabIndex = 2;
 			// 
 			// tapScrapTotalModule
@@ -1007,7 +1010,7 @@
 			this.taptemp.Controls.Add(this.dgvtemporarily);
 			this.taptemp.Location = new System.Drawing.Point(4, 22);
 			this.taptemp.Name = "taptemp";
-			this.taptemp.Size = new System.Drawing.Size(1143, 401);
+			this.taptemp.Size = new System.Drawing.Size(1143, 373);
 			this.taptemp.TabIndex = 4;
 			this.taptemp.Text = "产成品交接未同步明细表";
 			this.taptemp.UseVisualStyleBackColor = true;
@@ -1090,15 +1093,218 @@
 			dataGridViewCellStyle28.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
 			this.dgvtemporarily.RowsDefaultCellStyle = dataGridViewCellStyle28;
 			this.dgvtemporarily.RowTemplate.Height = 21;
-			this.dgvtemporarily.Size = new System.Drawing.Size(1143, 401);
+			this.dgvtemporarily.Size = new System.Drawing.Size(1143, 373);
 			this.dgvtemporarily.SortOrderColumnName = null;
 			this.dgvtemporarily.TabIndex = 1;
 			this.dgvtemporarily.Tag = true;
 			this.dgvtemporarily.TotalSumColumns = null;
 			this.dgvtemporarily.ViewRowFilter = "";
 			this.dgvtemporarily.VirtualNodes = false;
+			this.dgvtemporarily.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvtemporarily_CellClick);
 			this.dgvtemporarily.CurrentCellDirtyStateChanged += new System.EventHandler(this.dgvtemporarily_CurrentCellDirtyStateChanged);
 			// 
+			// Sel
+			// 
+			this.Sel.DataPropertyName = "Sel";
+			this.Sel.HeaderText = "选择";
+			this.Sel.Name = "Sel";
+			this.Sel.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.Sel.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.Sel.Width = 65;
+			// 
+			// dataGridViewTextBoxColumn1
+			// 
+			this.dataGridViewTextBoxColumn1.DataPropertyName = "OrderNo";
+			this.dataGridViewTextBoxColumn1.HeaderText = "生产订单";
+			this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+			this.dataGridViewTextBoxColumn1.ReadOnly = true;
+			this.dataGridViewTextBoxColumn1.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn2
+			// 
+			this.dataGridViewTextBoxColumn2.DataPropertyName = "FHTime";
+			dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle24.Format = "yyyy-MM-dd HH:mm:ss";
+			this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle24;
+			this.dataGridViewTextBoxColumn2.HeaderText = "交接时间";
+			this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+			this.dataGridViewTextBoxColumn2.ReadOnly = true;
+			this.dataGridViewTextBoxColumn2.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn7
+			// 
+			this.dataGridViewTextBoxColumn7.DataPropertyName = "FHUserCode";
+			this.dataGridViewTextBoxColumn7.HeaderText = "交接工号";
+			this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+			this.dataGridViewTextBoxColumn7.ReadOnly = true;
+			this.dataGridViewTextBoxColumn7.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn8
+			// 
+			this.dataGridViewTextBoxColumn8.DataPropertyName = "BarCode";
+			this.dataGridViewTextBoxColumn8.HeaderText = "产品条码";
+			this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+			this.dataGridViewTextBoxColumn8.ReadOnly = true;
+			this.dataGridViewTextBoxColumn8.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn9
+			// 
+			this.dataGridViewTextBoxColumn9.DataPropertyName = "FinishedBarCode";
+			this.dataGridViewTextBoxColumn9.HeaderText = "包装条码";
+			this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+			this.dataGridViewTextBoxColumn9.ReadOnly = true;
+			this.dataGridViewTextBoxColumn9.Width = 150;
+			// 
+			// BANMA
+			// 
+			this.BANMA.DataPropertyName = "BANMA";
+			this.BANMA.HeaderText = "托盘码";
+			this.BANMA.Name = "BANMA";
+			this.BANMA.ReadOnly = true;
+			// 
+			// FINISHEDLOADBATCHNO
+			// 
+			this.FINISHEDLOADBATCHNO.DataPropertyName = "FINISHEDLOADBATCHNO";
+			this.FINISHEDLOADBATCHNO.HeaderText = "板码";
+			this.FINISHEDLOADBATCHNO.Name = "FINISHEDLOADBATCHNO";
+			this.FINISHEDLOADBATCHNO.ReadOnly = true;
+			// 
+			// dataGridViewTextBoxColumn10
+			// 
+			this.dataGridViewTextBoxColumn10.DataPropertyName = "SecurityCode";
+			this.dataGridViewTextBoxColumn10.HeaderText = "防伪码";
+			this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+			this.dataGridViewTextBoxColumn10.ReadOnly = true;
+			this.dataGridViewTextBoxColumn10.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn11
+			// 
+			this.dataGridViewTextBoxColumn11.DataPropertyName = "GoodsCode";
+			this.dataGridViewTextBoxColumn11.HeaderText = "产品编码";
+			this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+			this.dataGridViewTextBoxColumn11.ReadOnly = true;
+			this.dataGridViewTextBoxColumn11.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn12
+			// 
+			this.dataGridViewTextBoxColumn12.DataPropertyName = "goodsmodel";
+			this.dataGridViewTextBoxColumn12.HeaderText = "产品型号";
+			this.dataGridViewTextBoxColumn12.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+			this.dataGridViewTextBoxColumn12.ReadOnly = true;
+			this.dataGridViewTextBoxColumn12.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn13
+			// 
+			this.dataGridViewTextBoxColumn13.DataPropertyName = "mcode";
+			this.dataGridViewTextBoxColumn13.HeaderText = "物料编码";
+			this.dataGridViewTextBoxColumn13.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+			this.dataGridViewTextBoxColumn13.ReadOnly = true;
+			this.dataGridViewTextBoxColumn13.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn39
+			// 
+			this.dataGridViewTextBoxColumn39.DataPropertyName = "mremark";
+			this.dataGridViewTextBoxColumn39.HeaderText = "物料描述";
+			this.dataGridViewTextBoxColumn39.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
+			this.dataGridViewTextBoxColumn39.ReadOnly = true;
+			this.dataGridViewTextBoxColumn39.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn40
+			// 
+			this.dataGridViewTextBoxColumn40.DataPropertyName = "LogoName";
+			this.dataGridViewTextBoxColumn40.HeaderText = "产品商标";
+			this.dataGridViewTextBoxColumn40.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
+			this.dataGridViewTextBoxColumn40.ReadOnly = true;
+			this.dataGridViewTextBoxColumn40.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn41
+			// 
+			this.dataGridViewTextBoxColumn41.DataPropertyName = "GroutingUserCode";
+			this.dataGridViewTextBoxColumn41.HeaderText = "成型工号";
+			this.dataGridViewTextBoxColumn41.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
+			this.dataGridViewTextBoxColumn41.ReadOnly = true;
+			this.dataGridViewTextBoxColumn41.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn42
+			// 
+			this.dataGridViewTextBoxColumn42.DataPropertyName = "GroutingMouldCode";
+			this.dataGridViewTextBoxColumn42.HeaderText = "模具编号";
+			this.dataGridViewTextBoxColumn42.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
+			this.dataGridViewTextBoxColumn42.ReadOnly = true;
+			this.dataGridViewTextBoxColumn42.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn43
+			// 
+			this.dataGridViewTextBoxColumn43.DataPropertyName = "GroutingLineCode";
+			this.dataGridViewTextBoxColumn43.HeaderText = "成型线编码";
+			this.dataGridViewTextBoxColumn43.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
+			this.dataGridViewTextBoxColumn43.ReadOnly = true;
+			this.dataGridViewTextBoxColumn43.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn44
+			// 
+			this.dataGridViewTextBoxColumn44.DataPropertyName = "GroutingDate";
+			dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle25.Format = "yyyy-MM-dd ";
+			this.dataGridViewTextBoxColumn44.DefaultCellStyle = dataGridViewCellStyle25;
+			this.dataGridViewTextBoxColumn44.HeaderText = "注浆日期";
+			this.dataGridViewTextBoxColumn44.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44";
+			this.dataGridViewTextBoxColumn44.ReadOnly = true;
+			this.dataGridViewTextBoxColumn44.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn45
+			// 
+			this.dataGridViewTextBoxColumn45.DataPropertyName = "DeliverTime";
+			dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle26.Format = "yyyy-MM-dd HH:mm:ss";
+			this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle26;
+			this.dataGridViewTextBoxColumn45.HeaderText = "交坯日期";
+			this.dataGridViewTextBoxColumn45.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45";
+			this.dataGridViewTextBoxColumn45.ReadOnly = true;
+			this.dataGridViewTextBoxColumn45.Width = 150;
+			// 
+			// dataGridViewTextBoxColumn46
+			// 
+			this.dataGridViewTextBoxColumn46.DataPropertyName = "ProductFinishedTime";
+			dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle27.Format = "yyyy-MM-dd HH:mm:ss";
+			dataGridViewCellStyle27.NullValue = null;
+			this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle27;
+			this.dataGridViewTextBoxColumn46.HeaderText = "生产完成时间";
+			this.dataGridViewTextBoxColumn46.MinimumWidth = 8;
+			this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46";
+			this.dataGridViewTextBoxColumn46.ReadOnly = true;
+			this.dataGridViewTextBoxColumn46.Width = 150;
+			// 
+			// dataGridViewCheckBoxColumn2
+			// 
+			this.dataGridViewCheckBoxColumn2.DataPropertyName = "TestMouldFlag";
+			this.dataGridViewCheckBoxColumn2.FalseValue = "0";
+			this.dataGridViewCheckBoxColumn2.HeaderText = "试验标识";
+			this.dataGridViewCheckBoxColumn2.IndeterminateValue = "0";
+			this.dataGridViewCheckBoxColumn2.MinimumWidth = 8;
+			this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
+			this.dataGridViewCheckBoxColumn2.ReadOnly = true;
+			this.dataGridViewCheckBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.dataGridViewCheckBoxColumn2.TrueValue = "1";
+			this.dataGridViewCheckBoxColumn2.Width = 150;
+			// 
 			// tapLuoCi
 			// 
 			this.tapLuoCi.Controls.Add(this.dgvlc);
@@ -1514,6 +1720,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.c_Label4);
+			this.gbxCondition.Controls.Add(this.txtMaterialCode);
+			this.gbxCondition.Controls.Add(this.c_Label3);
 			this.gbxCondition.Controls.Add(this.chkTemporarilyFlag);
 			this.gbxCondition.Controls.Add(this.txtBarcode);
 			this.gbxCondition.Controls.Add(this.c_Label2);
@@ -1541,7 +1750,7 @@
 			this.gbxCondition.Location = new System.Drawing.Point(4, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(1147, 68);
+			this.gbxCondition.Size = new System.Drawing.Size(1147, 96);
 			this.gbxCondition.TabIndex = 1;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
@@ -1551,7 +1760,7 @@
 			this.chkTemporarilyFlag.BackColor = System.Drawing.SystemColors.Control;
 			this.chkTemporarilyFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTemporarilyFlag.BackgroundImage")));
 			this.chkTemporarilyFlag.FalseText = "否";
-			this.chkTemporarilyFlag.Location = new System.Drawing.Point(903, 16);
+			this.chkTemporarilyFlag.Location = new System.Drawing.Point(587, 45);
 			this.chkTemporarilyFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
 			this.chkTemporarilyFlag.Name = "chkTemporarilyFlag";
 			this.chkTemporarilyFlag.Size = new System.Drawing.Size(178, 16);
@@ -1571,7 +1780,7 @@
 			this.txtBarcode.Location = new System.Drawing.Point(445, 40);
 			this.txtBarcode.MaxLength = 21;
 			this.txtBarcode.Name = "txtBarcode";
-			this.txtBarcode.Size = new System.Drawing.Size(110, 21);
+			this.txtBarcode.Size = new System.Drawing.Size(134, 21);
 			this.txtBarcode.TabIndex = 47;
 			this.txtBarcode.TextValue = "";
 			// 
@@ -1589,12 +1798,12 @@
 			// 
 			// btnClearCondition
 			// 
-			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
 			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
 			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-			this.btnClearCondition.Location = new System.Drawing.Point(1045, 32);
+			this.btnClearCondition.Location = new System.Drawing.Point(1056, 58);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
 			this.btnClearCondition.TabIndex = 13;
@@ -1607,7 +1816,7 @@
 			this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
 			this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
 			this.chkTestMouldFlag.FalseText = "否";
-			this.chkTestMouldFlag.Location = new System.Drawing.Point(748, 16);
+			this.chkTestMouldFlag.Location = new System.Drawing.Point(748, 15);
 			this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
 			this.chkTestMouldFlag.Name = "chkTestMouldFlag";
 			this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
@@ -1622,7 +1831,7 @@
 			this.c_Label1.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label1.Location = new System.Drawing.Point(572, 45);
+			this.c_Label1.Location = new System.Drawing.Point(7, 71);
 			this.c_Label1.Name = "c_Label1";
 			this.c_Label1.Size = new System.Drawing.Size(53, 12);
 			this.c_Label1.TabIndex = 42;
@@ -1667,7 +1876,7 @@
 			this.dkLogoSearchBox1.Enabled = true;
 			this.dkLogoSearchBox1.IsEnablePurview = false;
 			this.dkLogoSearchBox1.IsMustInput = false;
-			this.dkLogoSearchBox1.Location = new System.Drawing.Point(748, 40);
+			this.dkLogoSearchBox1.Location = new System.Drawing.Point(189, 67);
 			this.dkLogoSearchBox1.LogoCode = "";
 			this.dkLogoSearchBox1.LogoID = null;
 			this.dkLogoSearchBox1.LogoIDS = null;
@@ -1678,7 +1887,7 @@
 			this.dkLogoSearchBox1.Purview = null;
 			this.dkLogoSearchBox1.PurviewType = ((byte)(0));
 			this.dkLogoSearchBox1.SelectMore = true;
-			this.dkLogoSearchBox1.Size = new System.Drawing.Size(157, 21);
+			this.dkLogoSearchBox1.Size = new System.Drawing.Size(173, 21);
 			this.dkLogoSearchBox1.TabIndex = 11;
 			this.dkLogoSearchBox1.Title = "产品商标";
 			this.dkLogoSearchBox1.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -1731,12 +1940,12 @@
 			// 
 			// btnSearch
 			// 
-			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnSearch.BackColor = System.Drawing.Color.Transparent;
 			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
-			this.btnSearch.Location = new System.Drawing.Point(954, 32);
+			this.btnSearch.Location = new System.Drawing.Point(965, 58);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(85, 30);
 			this.btnSearch.TabIndex = 12;
@@ -1767,10 +1976,10 @@
 			this.txtGoodsModel.ErrorMessage = "";
 			this.txtGoodsModel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGoodsModel.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGoodsModel.Location = new System.Drawing.Point(631, 41);
+			this.txtGoodsModel.Location = new System.Drawing.Point(66, 67);
 			this.txtGoodsModel.MaxLength = 21;
 			this.txtGoodsModel.Name = "txtGoodsModel";
-			this.txtGoodsModel.Size = new System.Drawing.Size(110, 21);
+			this.txtGoodsModel.Size = new System.Drawing.Size(116, 21);
 			this.txtGoodsModel.TabIndex = 10;
 			this.txtGoodsModel.TextValue = "";
 			// 
@@ -1825,209 +2034,44 @@
 			this.lblOrderNo.TabIndex = 0;
 			this.lblOrderNo.Text = "生产订单";
 			// 
-			// Sel
-			// 
-			this.Sel.DataPropertyName = "Sel";
-			this.Sel.FalseValue = "0";
-			this.Sel.HeaderText = "选择";
-			this.Sel.Name = "Sel";
-			this.Sel.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.Sel.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.Sel.TrueValue = "1";
-			this.Sel.Width = 65;
-			// 
-			// dataGridViewTextBoxColumn1
-			// 
-			this.dataGridViewTextBoxColumn1.DataPropertyName = "OrderNo";
-			this.dataGridViewTextBoxColumn1.HeaderText = "生产订单";
-			this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-			this.dataGridViewTextBoxColumn1.ReadOnly = true;
-			this.dataGridViewTextBoxColumn1.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn2
-			// 
-			this.dataGridViewTextBoxColumn2.DataPropertyName = "FHTime";
-			dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle24.Format = "yyyy-MM-dd HH:mm:ss";
-			this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle24;
-			this.dataGridViewTextBoxColumn2.HeaderText = "交接时间";
-			this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-			this.dataGridViewTextBoxColumn2.ReadOnly = true;
-			this.dataGridViewTextBoxColumn2.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn7
-			// 
-			this.dataGridViewTextBoxColumn7.DataPropertyName = "FHUserCode";
-			this.dataGridViewTextBoxColumn7.HeaderText = "交接工号";
-			this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-			this.dataGridViewTextBoxColumn7.ReadOnly = true;
-			this.dataGridViewTextBoxColumn7.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn8
-			// 
-			this.dataGridViewTextBoxColumn8.DataPropertyName = "BarCode";
-			this.dataGridViewTextBoxColumn8.HeaderText = "产品条码";
-			this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-			this.dataGridViewTextBoxColumn8.ReadOnly = true;
-			this.dataGridViewTextBoxColumn8.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn9
-			// 
-			this.dataGridViewTextBoxColumn9.DataPropertyName = "FinishedBarCode";
-			this.dataGridViewTextBoxColumn9.HeaderText = "包装条码";
-			this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-			this.dataGridViewTextBoxColumn9.ReadOnly = true;
-			this.dataGridViewTextBoxColumn9.Width = 150;
-			// 
-			// BANMA
-			// 
-			this.BANMA.DataPropertyName = "BANMA";
-			this.BANMA.HeaderText = "托盘码";
-			this.BANMA.Name = "BANMA";
-			this.BANMA.ReadOnly = true;
-			// 
-			// FINISHEDLOADBATCHNO
-			// 
-			this.FINISHEDLOADBATCHNO.DataPropertyName = "FINISHEDLOADBATCHNO";
-			this.FINISHEDLOADBATCHNO.HeaderText = "板码";
-			this.FINISHEDLOADBATCHNO.Name = "FINISHEDLOADBATCHNO";
-			this.FINISHEDLOADBATCHNO.ReadOnly = true;
-			// 
-			// dataGridViewTextBoxColumn10
-			// 
-			this.dataGridViewTextBoxColumn10.DataPropertyName = "SecurityCode";
-			this.dataGridViewTextBoxColumn10.HeaderText = "防伪码";
-			this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-			this.dataGridViewTextBoxColumn10.ReadOnly = true;
-			this.dataGridViewTextBoxColumn10.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn11
-			// 
-			this.dataGridViewTextBoxColumn11.DataPropertyName = "GoodsCode";
-			this.dataGridViewTextBoxColumn11.HeaderText = "产品编码";
-			this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
-			this.dataGridViewTextBoxColumn11.ReadOnly = true;
-			this.dataGridViewTextBoxColumn11.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn12
-			// 
-			this.dataGridViewTextBoxColumn12.DataPropertyName = "goodsmodel";
-			this.dataGridViewTextBoxColumn12.HeaderText = "产品型号";
-			this.dataGridViewTextBoxColumn12.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
-			this.dataGridViewTextBoxColumn12.ReadOnly = true;
-			this.dataGridViewTextBoxColumn12.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn13
-			// 
-			this.dataGridViewTextBoxColumn13.DataPropertyName = "mcode";
-			this.dataGridViewTextBoxColumn13.HeaderText = "物料编码";
-			this.dataGridViewTextBoxColumn13.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
-			this.dataGridViewTextBoxColumn13.ReadOnly = true;
-			this.dataGridViewTextBoxColumn13.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn39
-			// 
-			this.dataGridViewTextBoxColumn39.DataPropertyName = "mremark";
-			this.dataGridViewTextBoxColumn39.HeaderText = "物料描述";
-			this.dataGridViewTextBoxColumn39.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
-			this.dataGridViewTextBoxColumn39.ReadOnly = true;
-			this.dataGridViewTextBoxColumn39.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn40
-			// 
-			this.dataGridViewTextBoxColumn40.DataPropertyName = "LogoName";
-			this.dataGridViewTextBoxColumn40.HeaderText = "产品商标";
-			this.dataGridViewTextBoxColumn40.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
-			this.dataGridViewTextBoxColumn40.ReadOnly = true;
-			this.dataGridViewTextBoxColumn40.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn41
-			// 
-			this.dataGridViewTextBoxColumn41.DataPropertyName = "GroutingUserCode";
-			this.dataGridViewTextBoxColumn41.HeaderText = "成型工号";
-			this.dataGridViewTextBoxColumn41.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
-			this.dataGridViewTextBoxColumn41.ReadOnly = true;
-			this.dataGridViewTextBoxColumn41.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn42
-			// 
-			this.dataGridViewTextBoxColumn42.DataPropertyName = "GroutingMouldCode";
-			this.dataGridViewTextBoxColumn42.HeaderText = "模具编号";
-			this.dataGridViewTextBoxColumn42.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
-			this.dataGridViewTextBoxColumn42.ReadOnly = true;
-			this.dataGridViewTextBoxColumn42.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn43
-			// 
-			this.dataGridViewTextBoxColumn43.DataPropertyName = "GroutingLineCode";
-			this.dataGridViewTextBoxColumn43.HeaderText = "成型线编码";
-			this.dataGridViewTextBoxColumn43.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
-			this.dataGridViewTextBoxColumn43.ReadOnly = true;
-			this.dataGridViewTextBoxColumn43.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn44
-			// 
-			this.dataGridViewTextBoxColumn44.DataPropertyName = "GroutingDate";
-			dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle25.Format = "yyyy-MM-dd ";
-			this.dataGridViewTextBoxColumn44.DefaultCellStyle = dataGridViewCellStyle25;
-			this.dataGridViewTextBoxColumn44.HeaderText = "注浆日期";
-			this.dataGridViewTextBoxColumn44.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44";
-			this.dataGridViewTextBoxColumn44.ReadOnly = true;
-			this.dataGridViewTextBoxColumn44.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn45
-			// 
-			this.dataGridViewTextBoxColumn45.DataPropertyName = "DeliverTime";
-			dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle26.Format = "yyyy-MM-dd HH:mm:ss";
-			this.dataGridViewTextBoxColumn45.DefaultCellStyle = dataGridViewCellStyle26;
-			this.dataGridViewTextBoxColumn45.HeaderText = "交坯日期";
-			this.dataGridViewTextBoxColumn45.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45";
-			this.dataGridViewTextBoxColumn45.ReadOnly = true;
-			this.dataGridViewTextBoxColumn45.Width = 150;
-			// 
-			// dataGridViewTextBoxColumn46
-			// 
-			this.dataGridViewTextBoxColumn46.DataPropertyName = "ProductFinishedTime";
-			dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle27.Format = "yyyy-MM-dd HH:mm:ss";
-			dataGridViewCellStyle27.NullValue = null;
-			this.dataGridViewTextBoxColumn46.DefaultCellStyle = dataGridViewCellStyle27;
-			this.dataGridViewTextBoxColumn46.HeaderText = "生产完成时间";
-			this.dataGridViewTextBoxColumn46.MinimumWidth = 8;
-			this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46";
-			this.dataGridViewTextBoxColumn46.ReadOnly = true;
-			this.dataGridViewTextBoxColumn46.Width = 150;
-			// 
-			// dataGridViewCheckBoxColumn2
-			// 
-			this.dataGridViewCheckBoxColumn2.DataPropertyName = "TestMouldFlag";
-			this.dataGridViewCheckBoxColumn2.FalseValue = "0";
-			this.dataGridViewCheckBoxColumn2.HeaderText = "试验标识";
-			this.dataGridViewCheckBoxColumn2.IndeterminateValue = "0";
-			this.dataGridViewCheckBoxColumn2.MinimumWidth = 8;
-			this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
-			this.dataGridViewCheckBoxColumn2.ReadOnly = true;
-			this.dataGridViewCheckBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.dataGridViewCheckBoxColumn2.TrueValue = "1";
-			this.dataGridViewCheckBoxColumn2.Width = 150;
+			// txtMaterialCode
+			// 
+			this.txtMaterialCode.BackColor = System.Drawing.SystemColors.Window;
+			this.txtMaterialCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtMaterialCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtMaterialCode.ErrorMessage = "";
+			this.txtMaterialCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtMaterialCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.txtMaterialCode.Location = new System.Drawing.Point(444, 67);
+			this.txtMaterialCode.MaxLength = 21;
+			this.txtMaterialCode.Name = "txtMaterialCode";
+			this.txtMaterialCode.Size = new System.Drawing.Size(135, 21);
+			this.txtMaterialCode.TabIndex = 50;
+			this.txtMaterialCode.TextValue = "";
+			// 
+			// c_Label3
+			// 
+			this.c_Label3.AutoSize = true;
+			this.c_Label3.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label3.Location = new System.Drawing.Point(383, 71);
+			this.c_Label3.Name = "c_Label3";
+			this.c_Label3.Size = new System.Drawing.Size(53, 12);
+			this.c_Label3.TabIndex = 49;
+			this.c_Label3.Text = "物料编码";
+			// 
+			// c_Label4
+			// 
+			this.c_Label4.AutoSize = true;
+			this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label4.ForeColor = System.Drawing.Color.Red;
+			this.c_Label4.Location = new System.Drawing.Point(585, 71);
+			this.c_Label4.Name = "c_Label4";
+			this.c_Label4.Size = new System.Drawing.Size(197, 12);
+			this.c_Label4.TabIndex = 51;
+			this.c_Label4.Text = "（仅针对产成品交接未同步明细表）";
 			// 
 			// F_RPT_030112
 			// 
@@ -2177,7 +2221,7 @@
 		private Basics.BaseControls.C_DataGridView dgvtemporarily;
 		private System.Windows.Forms.ToolStripButton tsbtnSynLog;
 		private Basics.BaseControls.C_StatusCheckBox chkTemporarilyFlag;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn Sel;
+		private Basics.BaseControls.C_DGV_Column_CheckBox Sel;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
@@ -2198,5 +2242,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn45;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn46;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2;
+		private Basics.BaseControls.C_TextBox txtMaterialCode;
+		private Basics.BaseControls.C_Label c_Label3;
+		private Basics.BaseControls.C_Label c_Label4;
 	}
 }

DK.Client/ReportModule/R03/M01/F_RPT_030112.cs

@@ -301,7 +301,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 					cre.Properties["GoodsCode"] = this.txtGoodsCode.Text.Trim();
 					cre.Properties["GoodsModel"] = this.txtGoodsModel.Text.Trim();
 					cre.Properties["LogoIDS"] = this.dkLogoSearchBox1.LogoIDS;
-
+					cre.Properties["MaterialCode"] = this.txtMaterialCode.Text.Trim();
+ 
 					object[] testMouldFlags = this.chkTestMouldFlag.SelectedValues;
 					if (testMouldFlags.Length == 1)
 					{
@@ -862,6 +863,62 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
 			}
 		}
+		/// <summary>
+		/// 勾选事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void dgvtemporarily_CellClick(object sender, DataGridViewCellEventArgs e)
+		{
+			try
+			{
+				DataGridViewCell eCell = this.dgvtemporarily.CurrentCell;
+				string colName = this.dgvtemporarily.Columns[eCell.ColumnIndex].Name;
+				if ("Sel" != colName)
+				{
+					return;
+				}
+
+				int rightFlag = Convert.ToInt32(eCell.EditedFormattedValue);
+				DataRowView drv = this.dgvtemporarily.CurrentRow.DataBoundItem as DataRowView;
+				if (drv != null)
+				{
+					drv["Sel"] = rightFlag;
+					drv.EndEdit();
+				}
+
+				object finishedloadbatchno = this.dgvtemporarily.Rows[eCell.RowIndex].Cells["FINISHEDLOADBATCHNO"].Value;
+				if (finishedloadbatchno == null || finishedloadbatchno == DBNull.Value)
+				{
+					return;
+				}
+
+				DataTable returnData = (DataTable)this.dgvtemporarily.DataSource;
+				if (returnData != null)
+				{
+					DataRow[] rows = returnData.Select("FINISHEDLOADBATCHNO = '" + finishedloadbatchno.ToString() + "'");
+					if (rows == null || rows.Length == 0)
+					{
+						return;
+					}
+
+					this.dgvtemporarily.Tag = 1;
+					for (int i = 0; i < rows.Length; i++)
+					{
+						rows[i]["Sel"] = rightFlag;
+						rows[i].EndEdit();
+					}
+					this.dgvtemporarily.Tag = null;
+				}
+			}
+			catch (Exception ex)
+			{
+				this.dgvtemporarily.Tag = null;
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
 		#endregion
 
 

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -20427,8 +20427,14 @@ GROUP BY
             {
                 sqlString = sqlString + "  AND G.BarCode = :BarCode ";
                 parameters.Add(new OracleParameter(":BarCode", OracleDbType.NVarchar2, cre.Properties["BarCode"], ParameterDirection.Input));
-            } 
-             
+            }
+            // 物料编码
+            if (!string.IsNullOrEmpty(cre.Properties["MaterialCode"] as string))
+            {
+                sqlString = sqlString + "  AND instr(G.MaterialCode,:MaterialCode)>0 \n";
+                parameters.Add(new OracleParameter(":MaterialCode", OracleDbType.NVarchar2, cre.Properties["MaterialCode"], ParameterDirection.Input));
+            }
+
             return sqlString;
         }
     }