~tjx/GsMesClient.git

			@@ -33,8 +33,10 @@
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -57,13 +59,12 @@
			this.gv_returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_changeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
			this.btnIn = new DevExpress.XtraEditors.SimpleButton();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			@@ -117,7 +118,8 @@
			this.gv_totalReturnedQty,
			this.gv_returnableReceivedQty,
			this.gv_returnableStoredQty,
			this.gv_changeFlag});
			this.gv_changeFlag,
			this.gridColumn2});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -147,6 +149,20 @@
			this.gv_guid.Tag = "query_a.guid";
			this.gv_guid.Width = 94;
			//
			// gv_ebelnK3id
			//
			this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
			this.gv_ebelnK3id.Caption = "ERP行ID号";
			this.gv_ebelnK3id.FieldName = "ebelnK3id";
			this.gv_ebelnK3id.MinWidth = 100;
			this.gv_ebelnK3id.Name = "gv_ebelnK3id";
			this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
			this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
			this.gv_ebelnK3id.Visible = true;
			this.gv_ebelnK3id.VisibleIndex = 1;
			this.gv_ebelnK3id.Width = 100;
			//
			// gv_billNo
			//
			this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			@@ -175,6 +191,16 @@
			this.gv_itemId.VisibleIndex = 3;
			this.gv_itemId.Width = 100;
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "物料ID";
			this.gridColumn1.FieldName = "itemId";
			this.gridColumn1.MinWidth = 80;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 4;
			this.gridColumn1.Width = 94;
			//
			// gv_purchaseUnit
			//
			this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			@@ -186,7 +212,7 @@
			this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
			this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
			this.gv_purchaseUnit.Visible = true;
			this.gv_purchaseUnit.VisibleIndex = 4;
			this.gv_purchaseUnit.VisibleIndex = 5;
			this.gv_purchaseUnit.Width = 100;
			//
			// gv_purchaseQty
			@@ -200,7 +226,7 @@
			this.gv_purchaseQty.OptionsColumn.AllowEdit = false;
			this.gv_purchaseQty.Tag = "query_a.PURCHASE_QTY";
			this.gv_purchaseQty.Visible = true;
			this.gv_purchaseQty.VisibleIndex = 5;
			this.gv_purchaseQty.VisibleIndex = 6;
			this.gv_purchaseQty.Width = 100;
			//
			// gv_inventoryUnit
			@@ -214,7 +240,7 @@
			this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
			this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
			this.gv_inventoryUnit.Visible = true;
			this.gv_inventoryUnit.VisibleIndex = 6;
			this.gv_inventoryUnit.VisibleIndex = 7;
			this.gv_inventoryUnit.Width = 100;
			//
			// gv_pricingUnit
			@@ -228,7 +254,7 @@
			this.gv_pricingUnit.OptionsColumn.AllowEdit = false;
			this.gv_pricingUnit.Tag = "query_a.PRICING_UNIT";
			this.gv_pricingUnit.Visible = true;
			this.gv_pricingUnit.VisibleIndex = 7;
			this.gv_pricingUnit.VisibleIndex = 8;
			this.gv_pricingUnit.Width = 100;
			//
			// gv_pricingQty
			@@ -242,7 +268,7 @@
			this.gv_pricingQty.OptionsColumn.AllowEdit = false;
			this.gv_pricingQty.Tag = "query_a.PRICING_QTY";
			this.gv_pricingQty.Visible = true;
			this.gv_pricingQty.VisibleIndex = 8;
			this.gv_pricingQty.VisibleIndex = 9;
			this.gv_pricingQty.Width = 100;
			//
			// gv_deliveryDate
			@@ -256,7 +282,7 @@
			this.gv_deliveryDate.OptionsColumn.AllowEdit = false;
			this.gv_deliveryDate.Tag = "query_a.DELIVERY_DATE";
			this.gv_deliveryDate.Visible = true;
			this.gv_deliveryDate.VisibleIndex = 9;
			this.gv_deliveryDate.VisibleIndex = 10;
			this.gv_deliveryDate.Width = 100;
			//
			// gv_earliestDeliveryDate
			@@ -270,7 +296,7 @@
			this.gv_earliestDeliveryDate.OptionsColumn.AllowEdit = false;
			this.gv_earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
			this.gv_earliestDeliveryDate.Visible = true;
			this.gv_earliestDeliveryDate.VisibleIndex = 10;
			this.gv_earliestDeliveryDate.VisibleIndex = 11;
			this.gv_earliestDeliveryDate.Width = 100;
			//
			// gv_latestDeliveryDate
			@@ -284,7 +310,7 @@
			this.gv_latestDeliveryDate.OptionsColumn.AllowEdit = false;
			this.gv_latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
			this.gv_latestDeliveryDate.Visible = true;
			this.gv_latestDeliveryDate.VisibleIndex = 11;
			this.gv_latestDeliveryDate.VisibleIndex = 12;
			this.gv_latestDeliveryDate.Width = 100;
			//
			// gv_isGift
			@@ -298,7 +324,7 @@
			this.gv_isGift.OptionsColumn.AllowEdit = false;
			this.gv_isGift.Tag = "query_a.IS_GIFT";
			this.gv_isGift.Visible = true;
			this.gv_isGift.VisibleIndex = 12;
			this.gv_isGift.VisibleIndex = 13;
			this.gv_isGift.Width = 94;
			//
			// gv_remarks
			@@ -312,7 +338,7 @@
			this.gv_remarks.OptionsColumn.AllowEdit = false;
			this.gv_remarks.Tag = "query_a.REMARKS";
			this.gv_remarks.Visible = true;
			this.gv_remarks.VisibleIndex = 13;
			this.gv_remarks.VisibleIndex = 14;
			this.gv_remarks.Width = 100;
			//
			// gv_supplierItemCode
			@@ -326,7 +352,7 @@
			this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
			this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
			this.gv_supplierItemCode.Visible = true;
			this.gv_supplierItemCode.VisibleIndex = 14;
			this.gv_supplierItemCode.VisibleIndex = 15;
			this.gv_supplierItemCode.Width = 100;
			//
			// gv_supplierItemName
			@@ -340,7 +366,7 @@
			this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
			this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
			this.gv_supplierItemName.Visible = true;
			this.gv_supplierItemName.VisibleIndex = 15;
			this.gv_supplierItemName.VisibleIndex = 16;
			this.gv_supplierItemName.Width = 100;
			//
			// gv_outsourcingOrderId
			@@ -354,7 +380,7 @@
			this.gv_outsourcingOrderId.OptionsColumn.AllowEdit = false;
			this.gv_outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
			this.gv_outsourcingOrderId.Visible = true;
			this.gv_outsourcingOrderId.VisibleIndex = 16;
			this.gv_outsourcingOrderId.VisibleIndex = 17;
			this.gv_outsourcingOrderId.Width = 94;
			//
			// gv_batchNumber
			@@ -368,7 +394,7 @@
			this.gv_batchNumber.OptionsColumn.AllowEdit = false;
			this.gv_batchNumber.Tag = "query_a.BATCH_NUMBER";
			this.gv_batchNumber.Visible = true;
			this.gv_batchNumber.VisibleIndex = 17;
			this.gv_batchNumber.VisibleIndex = 18;
			this.gv_batchNumber.Width = 94;
			//
			// gv_totalReceivedQty
			@@ -382,7 +408,7 @@
			this.gv_totalReceivedQty.OptionsColumn.AllowEdit = false;
			this.gv_totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
			this.gv_totalReceivedQty.Visible = true;
			this.gv_totalReceivedQty.VisibleIndex = 20;
			this.gv_totalReceivedQty.VisibleIndex = 19;
			this.gv_totalReceivedQty.Width = 100;
			//
			// gv_remainingReceivedQty
			@@ -396,7 +422,7 @@
			this.gv_remainingReceivedQty.OptionsColumn.AllowEdit = false;
			this.gv_remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
			this.gv_remainingReceivedQty.Visible = true;
			this.gv_remainingReceivedQty.VisibleIndex = 21;
			this.gv_remainingReceivedQty.VisibleIndex = 20;
			this.gv_remainingReceivedQty.Width = 100;
			//
			// gv_totalStoredQty
			@@ -410,7 +436,7 @@
			this.gv_totalStoredQty.OptionsColumn.AllowEdit = false;
			this.gv_totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
			this.gv_totalStoredQty.Visible = true;
			this.gv_totalStoredQty.VisibleIndex = 22;
			this.gv_totalStoredQty.VisibleIndex = 21;
			this.gv_totalStoredQty.Width = 100;
			//
			// gv_remainingStoredQty
			@@ -424,7 +450,7 @@
			this.gv_remainingStoredQty.OptionsColumn.AllowEdit = false;
			this.gv_remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
			this.gv_remainingStoredQty.Visible = true;
			this.gv_remainingStoredQty.VisibleIndex = 23;
			this.gv_remainingStoredQty.VisibleIndex = 22;
			this.gv_remainingStoredQty.Width = 100;
			//
			// gv_totalReturnedQty
			@@ -438,7 +464,7 @@
			this.gv_totalReturnedQty.OptionsColumn.AllowEdit = false;
			this.gv_totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
			this.gv_totalReturnedQty.Visible = true;
			this.gv_totalReturnedQty.VisibleIndex = 24;
			this.gv_totalReturnedQty.VisibleIndex = 23;
			this.gv_totalReturnedQty.Width = 100;
			//
			// gv_returnableReceivedQty
			@@ -452,7 +478,7 @@
			this.gv_returnableReceivedQty.OptionsColumn.AllowEdit = false;
			this.gv_returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
			this.gv_returnableReceivedQty.Visible = true;
			this.gv_returnableReceivedQty.VisibleIndex = 25;
			this.gv_returnableReceivedQty.VisibleIndex = 24;
			this.gv_returnableReceivedQty.Width = 100;
			//
			// gv_returnableStoredQty
			@@ -466,7 +492,7 @@
			this.gv_returnableStoredQty.OptionsColumn.AllowEdit = false;
			this.gv_returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
			this.gv_returnableStoredQty.Visible = true;
			this.gv_returnableStoredQty.VisibleIndex = 26;
			this.gv_returnableStoredQty.VisibleIndex = 25;
			this.gv_returnableStoredQty.Width = 100;
			//
			// gv_changeFlag
			@@ -480,22 +506,8 @@
			this.gv_changeFlag.OptionsColumn.AllowEdit = false;
			this.gv_changeFlag.Tag = "query_a.CHANGE_FLAG";
			this.gv_changeFlag.Visible = true;
			this.gv_changeFlag.VisibleIndex = 31;
			this.gv_changeFlag.VisibleIndex = 26;
			this.gv_changeFlag.Width = 100;
			//
			// gv_ebelnK3id
			//
			this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
			this.gv_ebelnK3id.Caption = "ERP行ID号";
			this.gv_ebelnK3id.FieldName = "ebelnK3id";
			this.gv_ebelnK3id.MinWidth = 100;
			this.gv_ebelnK3id.Name = "gv_ebelnK3id";
			this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
			this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
			this.gv_ebelnK3id.Visible = true;
			this.gv_ebelnK3id.VisibleIndex = 1;
			this.gv_ebelnK3id.Width = 100;
			//
			// xtraTabControl1
			//
			@@ -549,15 +561,15 @@
			this.pageBar1.TabIndex = 3;
			this.pageBar1.TotalPages = 0;
			//
			// gridColumn1
			// gridColumn2
			//
			this.gridColumn1.Caption = "物料ID";
			this.gridColumn1.FieldName = "itemId";
			this.gridColumn1.MinWidth = 80;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 4;
			this.gridColumn1.Width = 94;
			this.gridColumn2.Caption = "ERP头ID";
			this.gridColumn2.FieldName = "erpId";
			this.gridColumn2.MinWidth = 25;
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 27;
			this.gridColumn2.Width = 94;
			//
			// SelectCgMx
			//
			@@ -617,5 +629,6 @@
			private DevExpress.XtraEditors.PanelControl panelControl1;
			private DevExpress.XtraEditors.SimpleButton btnIn;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
			}
			}