From ab7e65d41b7b0d280d45a137a5c6520390a1d7a8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 24 五月 2025 07:58:43 +0800
Subject: [PATCH] 工艺
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs | 1044 ++++++++++++++++++++++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 7
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | 29
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 112 ++--
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs | 2
6 files changed, 801 insertions(+), 397 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 057f052..cee2aa3 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
index 203f654..6acc0ab 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
@@ -432,7 +432,7 @@
// wizardPage1
//
this.wizardPage1.Controls.Add(this.splitLeft);
- this.wizardPage1.DescriptionText = "浣犲彲浠ラ�夋嫨涓�涓垨澶氫釜";
+ this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
this.wizardPage1.Name = "wizardPage1";
this.wizardPage1.Size = new System.Drawing.Size(998, 540);
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index c614ad5..4b1e89d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -81,7 +81,6 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit();
this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -89,7 +88,6 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -122,6 +120,8 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -162,7 +162,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -170,7 +169,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -195,6 +193,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -408,12 +408,12 @@
this.layoutMx1.Controls.Add(this.btnCopy);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem16,
this.layoutControlItem24,
- this.layoutControlItem2});
+ this.layoutControlItem2,
+ this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(-31, 392, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(708, 197);
this.layoutMx1.TabIndex = 0;
@@ -430,7 +430,7 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 12);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(496, 12);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
this.txt_fMaxWeight.Size = new System.Drawing.Size(62, 24);
@@ -440,7 +440,7 @@
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(498, 43);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(496, 43);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
this.txt_fMinWeight.Size = new System.Drawing.Size(62, 24);
@@ -450,7 +450,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(82, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(200, 27);
@@ -470,7 +470,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 43);
+ this.txt_itemNo.Location = new System.Drawing.Point(82, 43);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
@@ -480,7 +480,7 @@
//
// txt_fSumPeople
//
- this.txt_fSumPeople.Location = new System.Drawing.Point(360, 74);
+ this.txt_fSumPeople.Location = new System.Drawing.Point(358, 74);
this.txt_fSumPeople.Name = "txt_fSumPeople";
this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true;
this.txt_fSumPeople.Size = new System.Drawing.Size(62, 24);
@@ -490,7 +490,7 @@
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(498, 74);
+ this.txt_fCapacity.Location = new System.Drawing.Point(496, 74);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
this.txt_fCapacity.Size = new System.Drawing.Size(62, 24);
@@ -500,7 +500,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 105);
+ this.txt_remark.Location = new System.Drawing.Point(82, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -511,7 +511,7 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(360, 43);
+ this.txt_fJingDu.Location = new System.Drawing.Point(358, 43);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -526,7 +526,7 @@
// txt_fBegDate
//
this.txt_fBegDate.EditValue = null;
- this.txt_fBegDate.Location = new System.Drawing.Point(360, 105);
+ this.txt_fBegDate.Location = new System.Drawing.Point(358, 105);
this.txt_fBegDate.Name = "txt_fBegDate";
this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -539,7 +539,7 @@
// txt_fEndDate
//
this.txt_fEndDate.EditValue = null;
- this.txt_fEndDate.Location = new System.Drawing.Point(360, 136);
+ this.txt_fEndDate.Location = new System.Drawing.Point(358, 136);
this.txt_fEndDate.Name = "txt_fEndDate";
this.txt_fEndDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -551,7 +551,7 @@
//
// txt_orgName
//
- this.txt_orgName.Location = new System.Drawing.Point(84, 12);
+ this.txt_orgName.Location = new System.Drawing.Point(82, 12);
this.txt_orgName.Name = "txt_orgName";
this.txt_orgName.Size = new System.Drawing.Size(200, 24);
this.txt_orgName.StyleController = this.layoutMx1;
@@ -561,7 +561,7 @@
// txt_fType
//
this.txt_fType.EditValue = "-璇烽�夋嫨-";
- this.txt_fType.Location = new System.Drawing.Point(360, 12);
+ this.txt_fType.Location = new System.Drawing.Point(358, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -579,7 +579,7 @@
this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
this.btnSelect.Appearance.Options.UseBackColor = true;
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(10, 136);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -588,15 +588,15 @@
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(274, 204);
+ this.txt_guid.Location = new System.Drawing.Point(664, 43);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(84, 24);
+ this.txt_guid.Size = new System.Drawing.Size(62, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 420;
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(636, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(634, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
this.txt_lastUpdateBy.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
@@ -605,7 +605,7 @@
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(636, 43);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(634, 43);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
this.txt_lastUpdateDate.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
@@ -614,7 +614,7 @@
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(636, 74);
+ this.txt_checkBy.Location = new System.Drawing.Point(634, 74);
this.txt_checkBy.Name = "txt_checkBy";
this.txt_checkBy.Size = new System.Drawing.Size(62, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
@@ -623,7 +623,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(636, 105);
+ this.txt_checkDate.Location = new System.Drawing.Point(634, 105);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Size = new System.Drawing.Size(62, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
@@ -632,7 +632,7 @@
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(564, 136);
+ this.txt_isCheck.Location = new System.Drawing.Point(562, 136);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_isCheck.Size = new System.Drawing.Size(134, 24);
@@ -645,23 +645,12 @@
this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
this.btnCopy.Appearance.Options.UseBackColor = true;
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16;
- this.btnCopy.Location = new System.Drawing.Point(150, 136);
+ this.btnCopy.Location = new System.Drawing.Point(148, 136);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(134, 27);
this.btnCopy.StyleController = this.layoutMx1;
this.btnCopy.TabIndex = 426;
this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�";
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_guid;
- this.layoutControlItem16.Location = new System.Drawing.Point(175, 192);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem16.Size = new System.Drawing.Size(175, 32);
- this.layoutControlItem16.Text = "浜у搧GUID";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem24
//
@@ -695,7 +684,6 @@
this.layoutControlItem5,
this.layoutControlItem14,
this.layoutControlItem20,
- this.layoutControlItem21,
this.layoutControlItem6,
this.layoutControlItem3,
this.layoutControlItem7,
@@ -709,7 +697,8 @@
this.layoutControlItem4,
this.layoutControlItem12,
this.layoutControlItem15,
- this.layoutControlItem10});
+ this.layoutControlItem10,
+ this.layoutControlItem21});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -789,17 +778,6 @@
this.layoutControlItem20.Size = new System.Drawing.Size(138, 31);
this.layoutControlItem20.Text = "鏇存柊浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
- this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
@@ -1204,6 +1182,28 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_guid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(576, 31);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem16.Size = new System.Drawing.Size(144, 31);
+ this.layoutControlItem16.Text = "浜у搧GUID";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_lastUpdateDate;
+ this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+ //
// Frm_WorkTechnique
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1254,7 +1254,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1262,7 +1261,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -1287,6 +1285,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
this.ResumeLayout(false);
}
@@ -1341,7 +1341,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.TextEdit txt_guid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
private DevExpress.XtraEditors.TextEdit txt_checkBy;
@@ -1351,7 +1350,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -1368,5 +1366,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.SimpleButton btnCopy;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 7544877..aaa2996 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -241,6 +241,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ this.btnCopy.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -364,6 +365,11 @@
getModel(rowGuid);
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -391,6 +397,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ this.btnCopy.Enabled = true;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
index 0a3094e..69029e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs
@@ -28,23 +28,70 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraGrid.GridLevelNode gridLevelNode2 = new DevExpress.XtraGrid.GridLevelNode();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fType = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fJingDu = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSumPeople = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fBegDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fEndDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fMaxWeight = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fMinWeight = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fCapacity = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -71,28 +118,51 @@
this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
- this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fType = new DevExpress.XtraEditors.TextEdit();
- this.txt_fJingDu = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fSumPeople = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fBegDate = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fEndDate = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
this.wizardControl1.SuspendLayout();
this.welcomeWizardPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.Panel2.SuspendLayout();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fMaxWeight.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fMinWeight.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCapacity.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.wizardPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit();
@@ -113,30 +183,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
- this.splitMx1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
- this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
- this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
this.SuspendLayout();
//
// wizardControl1
@@ -170,10 +216,557 @@
this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
this.welcomeWizardPage1.Text = "褰撳墠鐗╂枡宸ヨ壓淇℃伅";
//
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Controls.Add(this.tabMx);
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(898, 553);
+ this.splitMx1.SplitterPosition = 111;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_fType);
+ this.layoutMx1.Controls.Add(this.txt_fJingDu);
+ this.layoutMx1.Controls.Add(this.txt_fSumPeople);
+ this.layoutMx1.Controls.Add(this.txt_fBegDate);
+ this.layoutMx1.Controls.Add(this.txt_fEndDate);
+ this.layoutMx1.Controls.Add(this.txt_fMaxWeight);
+ this.layoutMx1.Controls.Add(this.txt_fMinWeight);
+ this.layoutMx1.Controls.Add(this.txt_fCapacity);
+ this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(897, 171, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(898, 111);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.ReadOnly = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(274, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 4;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(84, 42);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.ReadOnly = true;
+ this.txt_itemName.Size = new System.Drawing.Size(274, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 5;
+ //
+ // txt_remark
+ //
+ this.txt_remark.Location = new System.Drawing.Point(84, 72);
+ this.txt_remark.Name = "txt_remark";
+ this.txt_remark.Properties.ReadOnly = true;
+ this.txt_remark.Size = new System.Drawing.Size(274, 24);
+ this.txt_remark.StyleController = this.layoutMx1;
+ this.txt_remark.TabIndex = 6;
+ //
+ // txt_fType
+ //
+ this.txt_fType.Location = new System.Drawing.Point(434, 12);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.ReadOnly = true;
+ this.txt_fType.Size = new System.Drawing.Size(100, 24);
+ this.txt_fType.StyleController = this.layoutMx1;
+ this.txt_fType.TabIndex = 7;
+ //
+ // txt_fJingDu
+ //
+ this.txt_fJingDu.Location = new System.Drawing.Point(434, 42);
+ this.txt_fJingDu.Name = "txt_fJingDu";
+ this.txt_fJingDu.Properties.ReadOnly = true;
+ this.txt_fJingDu.Size = new System.Drawing.Size(100, 24);
+ this.txt_fJingDu.StyleController = this.layoutMx1;
+ this.txt_fJingDu.TabIndex = 8;
+ //
+ // txt_fSumPeople
+ //
+ this.txt_fSumPeople.Location = new System.Drawing.Point(434, 72);
+ this.txt_fSumPeople.Name = "txt_fSumPeople";
+ this.txt_fSumPeople.Properties.ReadOnly = true;
+ this.txt_fSumPeople.Size = new System.Drawing.Size(100, 24);
+ this.txt_fSumPeople.StyleController = this.layoutMx1;
+ this.txt_fSumPeople.TabIndex = 9;
+ //
+ // txt_fBegDate
+ //
+ this.txt_fBegDate.Location = new System.Drawing.Point(610, 72);
+ this.txt_fBegDate.Name = "txt_fBegDate";
+ this.txt_fBegDate.Properties.ReadOnly = true;
+ this.txt_fBegDate.Size = new System.Drawing.Size(100, 24);
+ this.txt_fBegDate.StyleController = this.layoutMx1;
+ this.txt_fBegDate.TabIndex = 10;
+ //
+ // txt_fEndDate
+ //
+ this.txt_fEndDate.Location = new System.Drawing.Point(786, 72);
+ this.txt_fEndDate.Name = "txt_fEndDate";
+ this.txt_fEndDate.Properties.ReadOnly = true;
+ this.txt_fEndDate.Size = new System.Drawing.Size(100, 24);
+ this.txt_fEndDate.StyleController = this.layoutMx1;
+ this.txt_fEndDate.TabIndex = 11;
+ //
+ // txt_fMaxWeight
+ //
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(610, 12);
+ this.txt_fMaxWeight.Name = "txt_fMaxWeight";
+ this.txt_fMaxWeight.Properties.ReadOnly = true;
+ this.txt_fMaxWeight.Size = new System.Drawing.Size(100, 24);
+ this.txt_fMaxWeight.StyleController = this.layoutMx1;
+ this.txt_fMaxWeight.TabIndex = 12;
+ //
+ // txt_fMinWeight
+ //
+ this.txt_fMinWeight.Location = new System.Drawing.Point(786, 12);
+ this.txt_fMinWeight.Name = "txt_fMinWeight";
+ this.txt_fMinWeight.Properties.ReadOnly = true;
+ this.txt_fMinWeight.Size = new System.Drawing.Size(100, 24);
+ this.txt_fMinWeight.StyleController = this.layoutMx1;
+ this.txt_fMinWeight.TabIndex = 13;
+ //
+ // txt_fCapacity
+ //
+ this.txt_fCapacity.Location = new System.Drawing.Point(610, 42);
+ this.txt_fCapacity.Name = "txt_fCapacity";
+ this.txt_fCapacity.Properties.ReadOnly = true;
+ this.txt_fCapacity.Size = new System.Drawing.Size(100, 24);
+ this.txt_fCapacity.StyleController = this.layoutMx1;
+ this.txt_fCapacity.TabIndex = 14;
+ //
+ // txt_checkDate
+ //
+ this.txt_checkDate.Location = new System.Drawing.Point(786, 42);
+ this.txt_checkDate.Name = "txt_checkDate";
+ this.txt_checkDate.Properties.ReadOnly = true;
+ this.txt_checkDate.Size = new System.Drawing.Size(100, 24);
+ this.txt_checkDate.StyleController = this.layoutMx1;
+ this.txt_checkDate.TabIndex = 15;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
+ this.layoutControlItem7,
+ this.layoutControlItem8});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(898, 111);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_itemNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem1.Size = new System.Drawing.Size(350, 30);
+ this.layoutControlItem1.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(350, 30);
+ this.layoutControlItem2.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_remark;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(350, 31);
+ this.layoutControlItem3.Text = "娴佺▼鎻忚堪";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fType;
+ this.layoutControlItem4.Location = new System.Drawing.Point(350, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem4.Text = "鐢熶骇绫诲瀷";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_fJingDu;
+ this.layoutControlItem5.Location = new System.Drawing.Point(350, 30);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem5.Text = "绠＄悊绮惧害";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fSumPeople;
+ this.layoutControlItem6.Location = new System.Drawing.Point(350, 60);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(176, 31);
+ this.layoutControlItem6.Text = "鎬诲畾鍛�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fMaxWeight;
+ this.layoutControlItem9.Location = new System.Drawing.Point(526, 0);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem9.Text = "閲嶉噺涓婇檺";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fMinWeight;
+ this.layoutControlItem10.Location = new System.Drawing.Point(702, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem10.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem10.Text = "閲嶉噺涓嬮檺";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_fCapacity;
+ this.layoutControlItem11.Location = new System.Drawing.Point(526, 30);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem11.Text = "鏍囧噯浜ц兘";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_checkDate;
+ this.layoutControlItem12.Location = new System.Drawing.Point(702, 30);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(176, 30);
+ this.layoutControlItem12.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_fBegDate;
+ this.layoutControlItem7.Location = new System.Drawing.Point(526, 60);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(176, 31);
+ this.layoutControlItem7.Text = "鐢熸晥鏃ユ湡";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fEndDate;
+ this.layoutControlItem8.Location = new System.Drawing.Point(702, 60);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(176, 31);
+ this.layoutControlItem8.Text = "澶辨晥鏃ユ湡";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(898, 430);
+ this.tabMx.TabIndex = 5;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(896, 398);
+ this.tabMxPage1.Text = "宸ュ簭淇℃伅";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ gridLevelNode2.RelationName = "Level1";
+ this.gcMx1.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+ gridLevelNode2});
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemComboBox1,
+ this.repositoryItemComboBox2,
+ this.rptGx});
+ this.gcMx1.Size = new System.Drawing.Size(896, 398);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1daa002,
+ this.gvMx1daa010,
+ this.gridColumn5,
+ this.gvMx1daa003,
+ this.gridColumn2,
+ this.gvMx1daa004,
+ this.gvMx1reporttime,
+ this.gridColumn3});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1daa002
+ //
+ this.gvMx1daa002.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa002.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa002.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa002.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa002.Caption = "搴忓彿";
+ this.gvMx1daa002.FieldName = "fSeq";
+ this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.Name = "gvMx1daa002";
+ this.gvMx1daa002.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa002.Tag = "edit";
+ this.gvMx1daa002.Visible = true;
+ this.gvMx1daa002.VisibleIndex = 0;
+ this.gvMx1daa002.Width = 54;
+ //
+ // gvMx1daa010
+ //
+ this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa010.Caption = "宸ュ簭浠ｇ爜";
+ this.gvMx1daa010.FieldName = "processNo";
+ this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.Name = "gvMx1daa010";
+ this.gvMx1daa010.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa010.Tag = "query_a.daa010";
+ this.gvMx1daa010.Visible = true;
+ this.gvMx1daa010.VisibleIndex = 1;
+ this.gvMx1daa010.Width = 129;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "宸ュ簭鍚嶇О";
+ this.gridColumn5.FieldName = "processName";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gvMx1daa003
+ //
+ this.gvMx1daa003.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa003.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa003.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa003.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa003.Caption = "鐢熶骇杩涘害缁熻鐐�";
+ this.gvMx1daa003.ColumnEdit = this.repositoryItemComboBox1;
+ this.gvMx1daa003.FieldName = "statStatus";
+ this.gvMx1daa003.MinWidth = 50;
+ this.gvMx1daa003.Name = "gvMx1daa003";
+ this.gvMx1daa003.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa003.Tag = "edit";
+ this.gvMx1daa003.Visible = true;
+ this.gvMx1daa003.VisibleIndex = 3;
+ this.gvMx1daa003.Width = 114;
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "Y-鏄�",
+ "N-鍚�"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn2.Caption = "鏁版嵁閲囬泦鐐�";
+ this.gridColumn2.ColumnEdit = this.repositoryItemComboBox2;
+ this.gridColumn2.FieldName = "collectionName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Tag = "edit";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 92;
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Items.AddRange(new object[] {
+ "绌�",
+ "I-鎶曞叆",
+ "C-閲囬泦",
+ "F-瀹屽伐",
+ "E-涓嶈壇",
+ "J-妫�楠�"});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+ this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMx1daa004
+ //
+ this.gvMx1daa004.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa004.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa004.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa004.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa004.Caption = "涓婂伐搴忕紪鍙�";
+ this.gvMx1daa004.ColumnEdit = this.rptGx;
+ this.gvMx1daa004.FieldName = "frontProcessNo";
+ this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.Name = "gvMx1daa004";
+ this.gvMx1daa004.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa004.Tag = "edit";
+ this.gvMx1daa004.Visible = true;
+ this.gvMx1daa004.VisibleIndex = 5;
+ this.gvMx1daa004.Width = 150;
+ //
+ // rptGx
+ //
+ this.rptGx.AutoHeight = false;
+ this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGx.Name = "rptGx";
+ this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMx1reporttime
+ //
+ this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
+ this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1reporttime.Caption = "澶囨敞";
+ this.gvMx1reporttime.FieldName = "remark";
+ this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.Name = "gvMx1reporttime";
+ this.gvMx1reporttime.OptionsColumn.ReadOnly = true;
+ this.gvMx1reporttime.Tag = "edit";
+ this.gvMx1reporttime.Visible = true;
+ this.gvMx1reporttime.VisibleIndex = 6;
+ this.gvMx1reporttime.Width = 89;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
// wizardPage1
//
this.wizardPage1.Controls.Add(this.splitLeft);
- this.wizardPage1.DescriptionText = "浣犲彲浠ラ�夋嫨涓�涓垨澶氫釜";
+ this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
this.wizardPage1.Name = "wizardPage1";
this.wizardPage1.Size = new System.Drawing.Size(998, 540);
@@ -258,7 +851,7 @@
this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "fSubsidiary";
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "org.FNumber";
+ this.gridColumn1.Tag = "b.name";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 50;
@@ -463,10 +1056,10 @@
// rptBtnDel
//
this.rptBtnDel.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBtnDel.Name = "rptBtnDel";
this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
@@ -488,245 +1081,6 @@
this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
//
- // splitMx1
- //
- this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitMx1.Horizontal = false;
- this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";
- //
- // splitMx1.splitMx1_Panel1
- //
- this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
- this.splitMx1.Panel1.Text = "Panel1";
- //
- // splitMx1.splitMx1_Panel2
- //
- this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(898, 553);
- this.splitMx1.SplitterPosition = 245;
- this.splitMx1.TabIndex = 0;
- //
- // layoutMx1
- //
- this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Controls.Add(this.txt_itemName);
- this.layoutMx1.Controls.Add(this.txt_remark);
- this.layoutMx1.Controls.Add(this.txt_fType);
- this.layoutMx1.Controls.Add(this.txt_fJingDu);
- this.layoutMx1.Controls.Add(this.txt_fSumPeople);
- this.layoutMx1.Controls.Add(this.txt_fBegDate);
- this.layoutMx1.Controls.Add(this.txt_fEndDate);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(897, 171, 812, 500);
- this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(898, 245);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "layoutControl1";
- //
- // Root
- //
- this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.Root.GroupBordersVisible = false;
- this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
- this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem4,
- this.layoutControlItem5,
- this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8});
- this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4,
- columnDefinition5});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(898, 245);
- this.Root.TextVisible = false;
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(84, 12);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(274, 24);
- this.txt_itemNo.StyleController = this.layoutMx1;
- this.txt_itemNo.TabIndex = 4;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_itemNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(350, 45);
- this.layoutControlItem1.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(84, 57);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(274, 24);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 5;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 45);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(350, 45);
- this.layoutControlItem2.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(84, 102);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Size = new System.Drawing.Size(274, 24);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 6;
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_remark;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 90);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(350, 45);
- this.layoutControlItem3.Text = "娴佺▼鎻忚堪";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(434, 12);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(100, 24);
- this.txt_fType.StyleController = this.layoutMx1;
- this.txt_fType.TabIndex = 7;
- //
- // txt_fJingDu
- //
- this.txt_fJingDu.Location = new System.Drawing.Point(434, 57);
- this.txt_fJingDu.Name = "txt_fJingDu";
- this.txt_fJingDu.Size = new System.Drawing.Size(100, 24);
- this.txt_fJingDu.StyleController = this.layoutMx1;
- this.txt_fJingDu.TabIndex = 8;
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fType;
- this.layoutControlItem4.Location = new System.Drawing.Point(350, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(176, 45);
- this.layoutControlItem4.Text = "鐢熶骇绫诲瀷";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_fJingDu;
- this.layoutControlItem5.Location = new System.Drawing.Point(350, 45);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(176, 45);
- this.layoutControlItem5.Text = "绠＄悊绮惧害";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_fSumPeople
- //
- this.txt_fSumPeople.Location = new System.Drawing.Point(434, 102);
- this.txt_fSumPeople.Name = "txt_fSumPeople";
- this.txt_fSumPeople.Size = new System.Drawing.Size(100, 24);
- this.txt_fSumPeople.StyleController = this.layoutMx1;
- this.txt_fSumPeople.TabIndex = 9;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fSumPeople;
- this.layoutControlItem6.Location = new System.Drawing.Point(350, 90);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(176, 45);
- this.layoutControlItem6.Text = "鎬诲畾鍛�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_fBegDate
- //
- this.txt_fBegDate.Location = new System.Drawing.Point(434, 147);
- this.txt_fBegDate.Name = "txt_fBegDate";
- this.txt_fBegDate.Size = new System.Drawing.Size(100, 24);
- this.txt_fBegDate.StyleController = this.layoutMx1;
- this.txt_fBegDate.TabIndex = 10;
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_fBegDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(350, 135);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(176, 45);
- this.layoutControlItem7.Text = "鐢熸晥鏃ユ湡";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_fEndDate
- //
- this.txt_fEndDate.Location = new System.Drawing.Point(434, 192);
- this.txt_fEndDate.Name = "txt_fEndDate";
- this.txt_fEndDate.Size = new System.Drawing.Size(100, 24);
- this.txt_fEndDate.StyleController = this.layoutMx1;
- this.txt_fEndDate.TabIndex = 11;
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fEndDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(350, 180);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem8.Size = new System.Drawing.Size(176, 45);
- this.layoutControlItem8.Text = "澶辨晥鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_WorkTechniqueShow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -743,6 +1097,48 @@
((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
this.wizardControl1.ResumeLayout(false);
this.welcomeWizardPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ this.splitMx1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fMaxWeight.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fMinWeight.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCapacity.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.wizardPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit();
this.splitLeft.Panel1.ResumeLayout(false);
@@ -763,30 +1159,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
- this.splitMx1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
- this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
- this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fJingDu.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSumPeople.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fBegDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
this.ResumeLayout(false);
}
@@ -838,7 +1210,31 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit txt_fBegDate;
private DevExpress.XtraEditors.TextEdit txt_fEndDate;
+ private DevExpress.XtraEditors.TextEdit txt_fMaxWeight;
+ private DevExpress.XtraEditors.TextEdit txt_fMinWeight;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.TextEdit txt_fCapacity;
+ private DevExpress.XtraEditors.TextEdit txt_checkDate;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
index edefcd9..4498cdd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -14,7 +13,7 @@
public partial class Frm_WorkTechniqueShow : DevExpress.XtraEditors.XtraForm
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
- private readonly string _webServiceName = "MesQmCheckitemManager/";
+ private readonly string _webServiceName = "WorkTechnique/";
private string sourceGuid = "";//婧恎uid
/// <summary>
///
@@ -198,19 +197,22 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModel",
+ _webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
- var _rtn =
- UtilityHelper.ReturnToDynamic(strJson);
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- var dy = _rtn.rtnData;
- var gvList = new List<GridView>();
+ dynamic dy = _rtn.rtnData;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- var _job = JObject.Parse(strJson);
- var array = new JArray();
- foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false, gvList);
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -220,9 +222,8 @@
}
else
{
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
- UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
}
else
{
--
Gitblit v1.9.3