|
|
@@ -140,7 +140,7 @@
|
|
|
Infragistics.Win.Appearance appearance19 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.UltraWinTabControl.UltraTab ultraTab1 = new Infragistics.Win.UltraWinTabControl.UltraTab();
|
|
|
Infragistics.Win.UltraWinTabControl.UltraTab ultraTab5 = new Infragistics.Win.UltraWinTabControl.UltraTab();
|
|
|
- Infragistics.Win.UltraWinToolbars.UltraToolbar ultraToolbar2 = new Infragistics.Win.UltraWinToolbars.UltraToolbar("UltraToolbar1");
|
|
|
+ Infragistics.Win.UltraWinToolbars.UltraToolbar ultraToolbar1 = new Infragistics.Win.UltraWinToolbars.UltraToolbar("UltraToolbar1");
|
|
|
Infragistics.Win.UltraWinToolbars.LabelTool labelTool3 = new Infragistics.Win.UltraWinToolbars.LabelTool("时间类型");
|
|
|
Infragistics.Win.UltraWinToolbars.ControlContainerTool controlContainerTool1 = new Infragistics.Win.UltraWinToolbars.ControlContainerTool("ControlContainerTool1");
|
|
|
Infragistics.Win.UltraWinToolbars.LabelTool labelTool7 = new Infragistics.Win.UltraWinToolbars.LabelTool("时间");
|
|
|
@@ -245,11 +245,11 @@
|
|
|
Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn158 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("dryWgt");
|
|
|
Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn159 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("UNCK", 0);
|
|
|
Infragistics.Win.UltraWinGrid.SummarySettings summarySettings1 = new Infragistics.Win.UltraWinGrid.SummarySettings("", Infragistics.Win.UltraWinGrid.SummaryType.Sum, null, "netWeight", 48, true, "dtRailwayActual", 0, Infragistics.Win.UltraWinGrid.SummaryPosition.UseSummaryPositionColumn, null, -1, false);
|
|
|
- Infragistics.Win.Appearance appearance17 = new Infragistics.Win.Appearance();
|
|
|
+ Infragistics.Win.Appearance appearance7 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.UltraWinGrid.SummarySettings summarySettings2 = new Infragistics.Win.UltraWinGrid.SummarySettings("", Infragistics.Win.UltraWinGrid.SummaryType.Count, null, "receivingUintName", 14, true, "dtRailwayActual", 0, Infragistics.Win.UltraWinGrid.SummaryPosition.UseSummaryPositionColumn, null, -1, false);
|
|
|
- Infragistics.Win.Appearance appearance18 = new Infragistics.Win.Appearance();
|
|
|
+ Infragistics.Win.Appearance appearance8 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.UltraWinGrid.SummarySettings summarySettings3 = new Infragistics.Win.UltraWinGrid.SummarySettings("", Infragistics.Win.UltraWinGrid.SummaryType.Sum, null, "dryWgt", 69, true, "dtRailwayActual", 0, Infragistics.Win.UltraWinGrid.SummaryPosition.UseSummaryPositionColumn, null, -1, false);
|
|
|
- Infragistics.Win.Appearance appearance23 = new Infragistics.Win.Appearance();
|
|
|
+ Infragistics.Win.Appearance appearance9 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.Appearance appearance13 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.Appearance appearance14 = new Infragistics.Win.Appearance();
|
|
|
Infragistics.Win.Appearance appearance16 = new Infragistics.Win.Appearance();
|
|
|
@@ -440,6 +440,7 @@
|
|
|
this.uTab = new Infragistics.Win.UltraWinTabControl.UltraTabControl();
|
|
|
this.ultraTabSharedControlsPage1 = new Infragistics.Win.UltraWinTabControl.UltraTabSharedControlsPage();
|
|
|
this.panel12 = new System.Windows.Forms.Panel();
|
|
|
+ this.cbTimeType = new System.Windows.Forms.ComboBox();
|
|
|
this.txtWaterNum = new System.Windows.Forms.NumericUpDown();
|
|
|
this.panel12_Fill_Panel = new System.Windows.Forms.Panel();
|
|
|
this.dtStartTime = new System.Windows.Forms.DateTimePicker();
|
|
|
@@ -455,7 +456,6 @@
|
|
|
this.ultraGridNet = new Infragistics.Win.UltraWinGrid.UltraGrid();
|
|
|
this.plImgShow = new System.Windows.Forms.Panel();
|
|
|
this.pictureShow = new System.Windows.Forms.PictureBox();
|
|
|
- this.cbTimeType = new System.Windows.Forms.ComboBox();
|
|
|
this.ultraTabPageControl1.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
|
|
|
this.ultraTabPageControl5.SuspendLayout();
|
|
|
@@ -2315,6 +2315,19 @@
|
|
|
this.panel12.Size = new System.Drawing.Size(1702, 30);
|
|
|
this.panel12.TabIndex = 3;
|
|
|
//
|
|
|
+ // cbTimeType
|
|
|
+ //
|
|
|
+ this.cbTimeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
+ this.cbTimeType.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
+ this.cbTimeType.FormattingEnabled = true;
|
|
|
+ this.cbTimeType.Items.AddRange(new object[] {
|
|
|
+ "毛重时间",
|
|
|
+ "净重时间"});
|
|
|
+ this.cbTimeType.Location = new System.Drawing.Point(86, 2);
|
|
|
+ this.cbTimeType.Name = "cbTimeType";
|
|
|
+ this.cbTimeType.Size = new System.Drawing.Size(121, 25);
|
|
|
+ this.cbTimeType.TabIndex = 111;
|
|
|
+ //
|
|
|
// txtWaterNum
|
|
|
//
|
|
|
this.txtWaterNum.DecimalPlaces = 2;
|
|
|
@@ -2328,7 +2341,7 @@
|
|
|
//
|
|
|
this.panel12_Fill_Panel.Cursor = System.Windows.Forms.Cursors.Default;
|
|
|
this.panel12_Fill_Panel.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
|
- this.panel12_Fill_Panel.Location = new System.Drawing.Point(0, 55);
|
|
|
+ this.panel12_Fill_Panel.Location = new System.Drawing.Point(0, 30);
|
|
|
this.panel12_Fill_Panel.Name = "panel12_Fill_Panel";
|
|
|
this.panel12_Fill_Panel.Size = new System.Drawing.Size(1702, 0);
|
|
|
this.panel12_Fill_Panel.TabIndex = 0;
|
|
|
@@ -2367,7 +2380,7 @@
|
|
|
this._panel12_Toolbars_Dock_Area_Left.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(190)))), ((int)(((byte)(245)))));
|
|
|
this._panel12_Toolbars_Dock_Area_Left.DockedPosition = Infragistics.Win.UltraWinToolbars.DockedPosition.Left;
|
|
|
this._panel12_Toolbars_Dock_Area_Left.ForeColor = System.Drawing.SystemColors.ControlText;
|
|
|
- this._panel12_Toolbars_Dock_Area_Left.Location = new System.Drawing.Point(0, 55);
|
|
|
+ this._panel12_Toolbars_Dock_Area_Left.Location = new System.Drawing.Point(0, 30);
|
|
|
this._panel12_Toolbars_Dock_Area_Left.Name = "_panel12_Toolbars_Dock_Area_Left";
|
|
|
this._panel12_Toolbars_Dock_Area_Left.Size = new System.Drawing.Size(0, 0);
|
|
|
this._panel12_Toolbars_Dock_Area_Left.ToolbarsManager = this.ultraToolbarsManager1;
|
|
|
@@ -2378,8 +2391,8 @@
|
|
|
this.ultraToolbarsManager1.DockWithinContainer = this.panel12;
|
|
|
this.ultraToolbarsManager1.ShowFullMenusDelay = 500;
|
|
|
this.ultraToolbarsManager1.Style = Infragistics.Win.UltraWinToolbars.ToolbarStyle.Office2003;
|
|
|
- ultraToolbar2.DockedColumn = 0;
|
|
|
- ultraToolbar2.DockedRow = 0;
|
|
|
+ ultraToolbar1.DockedColumn = 0;
|
|
|
+ ultraToolbar1.DockedRow = 0;
|
|
|
controlContainerTool1.ControlName = "cbTimeType";
|
|
|
controlContainerTool1.InstanceProps.Width = 121;
|
|
|
labelTool7.InstanceProps.Width = 54;
|
|
|
@@ -2394,7 +2407,7 @@
|
|
|
buttonTool1.InstanceProps.IsFirstInGroup = true;
|
|
|
buttonTool2.InstanceProps.IsFirstInGroup = true;
|
|
|
buttonTool9.InstanceProps.IsFirstInGroup = true;
|
|
|
- ultraToolbar2.NonInheritedTools.AddRange(new Infragistics.Win.UltraWinToolbars.ToolBase[] {
|
|
|
+ ultraToolbar1.NonInheritedTools.AddRange(new Infragistics.Win.UltraWinToolbars.ToolBase[] {
|
|
|
labelTool3,
|
|
|
controlContainerTool1,
|
|
|
labelTool7,
|
|
|
@@ -2408,9 +2421,9 @@
|
|
|
buttonTool1,
|
|
|
buttonTool2,
|
|
|
buttonTool9});
|
|
|
- ultraToolbar2.Text = "UltraToolbar1";
|
|
|
+ ultraToolbar1.Text = "UltraToolbar1";
|
|
|
this.ultraToolbarsManager1.Toolbars.AddRange(new Infragistics.Win.UltraWinToolbars.UltraToolbar[] {
|
|
|
- ultraToolbar2});
|
|
|
+ ultraToolbar1});
|
|
|
appearance25.Image = ((object)(resources.GetObject("appearance25.Image")));
|
|
|
buttonTool7.SharedPropsInternal.AppearancesSmall.Appearance = appearance25;
|
|
|
buttonTool7.SharedPropsInternal.Caption = "查询";
|
|
|
@@ -2469,7 +2482,7 @@
|
|
|
this._panel12_Toolbars_Dock_Area_Right.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(190)))), ((int)(((byte)(245)))));
|
|
|
this._panel12_Toolbars_Dock_Area_Right.DockedPosition = Infragistics.Win.UltraWinToolbars.DockedPosition.Right;
|
|
|
this._panel12_Toolbars_Dock_Area_Right.ForeColor = System.Drawing.SystemColors.ControlText;
|
|
|
- this._panel12_Toolbars_Dock_Area_Right.Location = new System.Drawing.Point(1702, 55);
|
|
|
+ this._panel12_Toolbars_Dock_Area_Right.Location = new System.Drawing.Point(1702, 30);
|
|
|
this._panel12_Toolbars_Dock_Area_Right.Name = "_panel12_Toolbars_Dock_Area_Right";
|
|
|
this._panel12_Toolbars_Dock_Area_Right.Size = new System.Drawing.Size(0, 0);
|
|
|
this._panel12_Toolbars_Dock_Area_Right.ToolbarsManager = this.ultraToolbarsManager1;
|
|
|
@@ -2482,7 +2495,7 @@
|
|
|
this._panel12_Toolbars_Dock_Area_Top.ForeColor = System.Drawing.SystemColors.ControlText;
|
|
|
this._panel12_Toolbars_Dock_Area_Top.Location = new System.Drawing.Point(0, 0);
|
|
|
this._panel12_Toolbars_Dock_Area_Top.Name = "_panel12_Toolbars_Dock_Area_Top";
|
|
|
- this._panel12_Toolbars_Dock_Area_Top.Size = new System.Drawing.Size(1702, 55);
|
|
|
+ this._panel12_Toolbars_Dock_Area_Top.Size = new System.Drawing.Size(1702, 30);
|
|
|
this._panel12_Toolbars_Dock_Area_Top.ToolbarsManager = this.ultraToolbarsManager1;
|
|
|
//
|
|
|
// _panel12_Toolbars_Dock_Area_Bottom
|
|
|
@@ -2957,11 +2970,11 @@
|
|
|
ultraGridColumn159});
|
|
|
ultraGridBand6.RowLayoutStyle = Infragistics.Win.UltraWinGrid.RowLayoutStyle.ColumnLayout;
|
|
|
summarySettings1.DisplayFormat = "{0}";
|
|
|
- summarySettings1.GroupBySummaryValueAppearance = appearance17;
|
|
|
+ summarySettings1.GroupBySummaryValueAppearance = appearance7;
|
|
|
summarySettings2.DisplayFormat = "{0}";
|
|
|
- summarySettings2.GroupBySummaryValueAppearance = appearance18;
|
|
|
+ summarySettings2.GroupBySummaryValueAppearance = appearance8;
|
|
|
summarySettings3.DisplayFormat = "{0}";
|
|
|
- summarySettings3.GroupBySummaryValueAppearance = appearance23;
|
|
|
+ summarySettings3.GroupBySummaryValueAppearance = appearance9;
|
|
|
ultraGridBand6.Summaries.AddRange(new Infragistics.Win.UltraWinGrid.SummarySettings[] {
|
|
|
summarySettings1,
|
|
|
summarySettings2,
|
|
|
@@ -3016,19 +3029,6 @@
|
|
|
this.pictureShow.TabStop = false;
|
|
|
this.pictureShow.DoubleClick += new System.EventHandler(this.pictureShow_DoubleClick);
|
|
|
//
|
|
|
- // cbTimeType
|
|
|
- //
|
|
|
- this.cbTimeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
|
|
- this.cbTimeType.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.cbTimeType.FormattingEnabled = true;
|
|
|
- this.cbTimeType.Items.AddRange(new object[] {
|
|
|
- "毛重时间",
|
|
|
- "净重时间"});
|
|
|
- this.cbTimeType.Location = new System.Drawing.Point(86, 2);
|
|
|
- this.cbTimeType.Name = "cbTimeType";
|
|
|
- this.cbTimeType.Size = new System.Drawing.Size(121, 25);
|
|
|
- this.cbTimeType.TabIndex = 111;
|
|
|
- //
|
|
|
// frmMotoriaMaincs
|
|
|
//
|
|
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
BourneCao