From e49fe625f2b87c50ca3b7294513a3e087d301bb6 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期六, 26 七月 2025 14:06:06 +0800
Subject: [PATCH] 产品维护模快更新
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs | 458 +++++++++++++++++++++-------------------
DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs | 64 +++--
DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs | 6
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs | 98 +++++++-
5 files changed, 361 insertions(+), 269 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 4aa1533..c9022bb 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
-<add key="WebApiUrl" value="http://192.168.1.187:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+<!--<add key="WebApiUrl" value="http://192.168.1.187:81/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.187:8081/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
index 8f0a9b2..b508aa5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
@@ -39,6 +39,7 @@
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -51,8 +52,6 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
- this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -112,42 +111,45 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_hours = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_capacity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gv_sCapacity = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
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.gv_gxOrder = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -211,39 +213,29 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
this.SuspendLayout();
- //
- // gv_workers
- //
- this.gv_workers.AppearanceCell.Options.UseFont = true;
- this.gv_workers.Caption = "鏍囧噯浜烘暟";
- this.gv_workers.FieldName = "workers";
- this.gv_workers.MinWidth = 44;
- this.gv_workers.Name = "gv_workers";
- this.gv_workers.OptionsEditForm.StartNewRow = true;
- this.gv_workers.ShowUnboundExpressionMenu = true;
- this.gv_workers.Tag = "edit";
- this.gv_workers.Width = 113;
//
// toolBarMenu1
//
@@ -270,7 +262,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(451, 30);
+ this.pageBar1.Size = new System.Drawing.Size(458, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -313,7 +305,7 @@
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1081, 491);
- this.split1.SplitterPosition = 451;
+ this.split1.SplitterPosition = 458;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -324,7 +316,7 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(451, 461);
+ this.gcMain1.Size = new System.Drawing.Size(458, 461);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -434,7 +426,7 @@
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(620, 491);
+ this.splitMx1.Size = new System.Drawing.Size(613, 491);
this.splitMx1.SplitterPosition = 92;
this.splitMx1.TabIndex = 1;
//
@@ -486,7 +478,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(620, 92);
+ this.layoutMx1.Size = new System.Drawing.Size(613, 92);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -527,7 +519,7 @@
this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(168, 22);
+ this.txt_itemName.Size = new System.Drawing.Size(166, 22);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "readonly";
@@ -545,11 +537,11 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(304, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(302, 12);
this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(170, 20);
+ this.txt_itemNo.Size = new System.Drawing.Size(166, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "readonly";
@@ -636,7 +628,7 @@
this.txt_orgName.Location = new System.Drawing.Point(72, 12);
this.txt_orgName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_orgName.Name = "txt_orgName";
- this.txt_orgName.Size = new System.Drawing.Size(168, 20);
+ this.txt_orgName.Size = new System.Drawing.Size(166, 20);
this.txt_orgName.StyleController = this.layoutMx1;
this.txt_orgName.TabIndex = 417;
this.txt_orgName.Tag = "readonly";
@@ -739,7 +731,7 @@
this.btnCopy.Location = new System.Drawing.Point(127, 64);
this.btnCopy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnCopy.Name = "btnCopy";
- this.btnCopy.Size = new System.Drawing.Size(113, 22);
+ this.btnCopy.Size = new System.Drawing.Size(111, 22);
this.btnCopy.StyleController = this.layoutMx1;
this.btnCopy.TabIndex = 426;
this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�";
@@ -978,7 +970,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(603, 150);
+ this.Root.Size = new System.Drawing.Size(596, 150);
this.Root.TextVisible = false;
//
// layoutControlItem14
@@ -987,18 +979,18 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(232, 26);
+ this.layoutControlItem14.Size = new System.Drawing.Size(230, 26);
this.layoutControlItem14.Text = "浣跨敤缁勭粐";
this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(232, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(230, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(234, 26);
+ this.layoutControlItem5.Size = new System.Drawing.Size(230, 26);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
//
@@ -1009,7 +1001,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(232, 26);
+ this.layoutControlItem1.Size = new System.Drawing.Size(230, 26);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
//
@@ -1020,7 +1012,7 @@
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(117, 26);
+ this.layoutControlItem10.Size = new System.Drawing.Size(115, 26);
this.layoutControlItem10.Text = "澶嶅埗";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -1039,24 +1031,23 @@
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
- // tabMx
+ // picCheckBox
//
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.xtraTabPage2;
- this.tabMx.Size = new System.Drawing.Size(620, 389);
- this.tabMx.TabIndex = 4;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1,
- this.xtraTabPage2});
+ this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+ this.picCheckBox.Location = new System.Drawing.Point(956, 23);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.gcMx2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(618, 363);
+ this.xtraTabPage2.Size = new System.Drawing.Size(611, 363);
this.xtraTabPage2.Text = "鏍囦骇淇℃伅";
//
// gcMx2
@@ -1075,10 +1066,63 @@
this.repositoryItemComboBox3,
this.repositoryItemComboBox4,
this.repositoryItemComboBox5});
- this.gcMx2.Size = new System.Drawing.Size(618, 363);
+ this.gcMx2.Size = new System.Drawing.Size(611, 363);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
+ //
+ // gridView2
+ //
+ this.gridView2.GridControl = this.gcMx2;
+ this.gridView2.Name = "gridView2";
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.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)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
+ // repositoryItemComboBox3
+ //
+ this.repositoryItemComboBox3.AutoHeight = false;
+ this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox3.Items.AddRange(new object[] {
+ "Y-鏄�",
+ "N-鍚�"});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+ this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemComboBox4
+ //
+ this.repositoryItemComboBox4.AutoHeight = false;
+ this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox4.Items.AddRange(new object[] {
+ "绌�",
+ "I-鎶曞叆",
+ "C-閲囬泦",
+ "F-瀹屽伐",
+ "E-涓嶈壇",
+ "J-妫�楠�"});
+ this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
+ this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemComboBox5
+ //
+ this.repositoryItemComboBox5.AutoHeight = false;
+ this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox5.Items.AddRange(new object[] {
+ "",
+ "鎵嬪伐绾�",
+ "鑷姩绾�"});
+ this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
+ this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx2
//
@@ -1102,6 +1146,18 @@
this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
+ // gv_workers
+ //
+ this.gv_workers.AppearanceCell.Options.UseFont = true;
+ this.gv_workers.Caption = "鏍囧噯浜烘暟";
+ this.gv_workers.FieldName = "workers";
+ this.gv_workers.MinWidth = 44;
+ this.gv_workers.Name = "gv_workers";
+ this.gv_workers.OptionsEditForm.StartNewRow = true;
+ this.gv_workers.ShowUnboundExpressionMenu = true;
+ this.gv_workers.Tag = "edit";
+ this.gv_workers.Width = 113;
+ //
// gv_hours
//
this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級";
@@ -1119,23 +1175,11 @@
this.gv_capacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gv_capacity.AppearanceHeader.Options.UseForeColor = true;
this.gv_capacity.Caption = "鍗曞皬鏃朵骇鑳�";
- this.gv_capacity.ColumnEdit = this.repositoryItemComboBox3;
this.gv_capacity.FieldName = "capacity";
this.gv_capacity.MinWidth = 44;
this.gv_capacity.Name = "gv_capacity";
this.gv_capacity.Tag = "edit";
this.gv_capacity.Width = 100;
- //
- // repositoryItemComboBox3
- //
- this.repositoryItemComboBox3.AutoHeight = false;
- this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox3.Items.AddRange(new object[] {
- "Y-鏄�",
- "N-鍚�"});
- this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
- this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gv_sCapacity
//
@@ -1165,18 +1209,6 @@
this.gv_lineType.Tag = "edit";
this.gv_lineType.Width = 131;
//
- // repositoryItemComboBox5
- //
- this.repositoryItemComboBox5.AutoHeight = false;
- this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox5.Items.AddRange(new object[] {
- "1",
- "22",
- "33"});
- this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
- this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
// gv_changeTime
//
this.gv_changeTime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1200,16 +1232,6 @@
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Width = 57;
//
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit2.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)});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
// gridColumn14
//
this.gridColumn14.Caption = "涓婚敭Guid";
@@ -1218,27 +1240,12 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Width = 82;
//
- // repositoryItemComboBox4
- //
- this.repositoryItemComboBox4.AutoHeight = false;
- this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox4.Items.AddRange(new object[] {
- "绌�",
- "I-鎶曞叆",
- "C-閲囬泦",
- "F-瀹屽伐",
- "E-涓嶈壇",
- "J-妫�楠�"});
- this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
- this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(618, 363);
+ this.tabMxPage1.Size = new System.Drawing.Size(611, 363);
this.tabMxPage1.Text = "宸ュ簭淇℃伅";
//
// gcMx1
@@ -1259,10 +1266,70 @@
this.rptGx,
this.repositoryItemCheckEdit1,
this.repositoryItemCheckEdit2});
- this.gcMx1.Size = new System.Drawing.Size(618, 363);
+ this.gcMx1.Size = new System.Drawing.Size(611, 363);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
+ //
+ // gridView3
+ //
+ this.gridView3.GridControl = this.gcMx1;
+ this.gridView3.Name = "gridView3";
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // repositoryItemCheckEdit1
+ //
+ this.repositoryItemCheckEdit1.AutoHeight = false;
+ this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+ //
+ // repositoryItemCheckEdit2
+ //
+ this.repositoryItemCheckEdit2.AutoHeight = false;
+ this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
//
// gvMx1
//
@@ -1332,6 +1399,7 @@
this.gv_gxOrder.Caption = "宸ュ簭椤哄簭鍙�";
this.gv_gxOrder.FieldName = "gxOrder";
this.gv_gxOrder.Name = "gv_gxOrder";
+ this.gv_gxOrder.Tag = "edit";
this.gv_gxOrder.Visible = true;
this.gv_gxOrder.VisibleIndex = 3;
this.gv_gxOrder.Width = 66;
@@ -1349,14 +1417,10 @@
this.gvMx1daa003.Name = "gvMx1daa003";
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "edit";
+ this.gvMx1daa003.UnboundDataType = typeof(bool);
this.gvMx1daa003.Visible = true;
this.gvMx1daa003.VisibleIndex = 4;
this.gvMx1daa003.Width = 100;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
//
// gridColumn1
//
@@ -1370,14 +1434,10 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "edit";
+ this.gridColumn1.UnboundDataType = typeof(bool);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 80;
- //
- // repositoryItemCheckEdit2
- //
- this.repositoryItemCheckEdit2.AutoHeight = false;
- this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
//
// gvMx1daa004
//
@@ -1396,14 +1456,6 @@
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 6;
this.gvMx1daa004.Width = 131;
- //
- // 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
//
@@ -1433,17 +1485,6 @@
this.gvMxDel.VisibleIndex = 8;
this.gvMxDel.Width = 57;
//
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
// gridColumn3
//
this.gridColumn3.Caption = "涓婚敭Guid";
@@ -1452,43 +1493,18 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 82;
//
- // repositoryItemComboBox1
+ // tabMx
//
- 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;
- //
- // 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;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(956, 23);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(613, 389);
+ this.tabMx.TabIndex = 4;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1,
+ this.xtraTabPage2});
//
// Frm_MesProcGx
//
@@ -1564,26 +1580,28 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1612,16 +1630,6 @@
private DevExpress.XtraEditors.TextEdit txt_fCapacity;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- 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 gvMx1daa003;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraEditors.ComboBoxEdit txt_fJingDu;
private DevExpress.XtraEditors.DateEdit txt_fBegDate;
private DevExpress.XtraEditors.DateEdit txt_fEndDate;
@@ -1629,12 +1637,8 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_fType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.SimpleButton btnSelect;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
@@ -1642,8 +1646,6 @@
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_isCheck;
private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
@@ -1657,32 +1659,50 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.SimpleButton btnCopy;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_workers;
private DevExpress.XtraGrid.Columns.GridColumn gv_hours;
private DevExpress.XtraGrid.Columns.GridColumn gv_capacity;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
private DevExpress.XtraGrid.Columns.GridColumn gv_sCapacity;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox5;
private DevExpress.XtraGrid.Columns.GridColumn gv_changeTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
+ 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 gv_gxOrder;
- private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workers;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
index ec53fe5..83c180e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
@@ -61,7 +61,7 @@
foreach (dynamic dym in lst)
{
DataRow _row = _Table.NewRow();
- _row["fSeq"] = dym.fSeq;
+ //_row["fSeq"] = dym.fSeq;
_row["signingFlag"] = false;
_row["storageFlag"] = true;
_row["frontProcessNo"] = "绌�";
@@ -306,16 +306,10 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- //fType = txt_fType.Text.Trim(),
- //fBegDate = txt_fBegDate.Text.Trim(),
- //fEndDate = txt_fEndDate.Text.Trim(),
- //fJingDu = txt_fJingDu.Text.Trim(),
- //fCapacity = txt_fCapacity.Text.Trim(),
- //fMaxWeight = txt_fMaxWeight.Text.Trim(),
- //fMinWeight = txt_fMinWeight.Text.Trim(),
- //fSumPeople = txt_fSumPeople.Text.Trim(),
- //remark = txt_remark.Text.Trim(),
+ orgName=txt_orgName.Text.Trim(),
+ itemNo=txt_itemNo.Text.Trim(),
list = new List<dynamic>(),
+ list2 = new List<dynamic>(),
};
gvMx1.CloseEditor();
gvMx1.PostEditor();
@@ -327,15 +321,39 @@
{
_obj.list.Add(new
{
- fSeq = row["fSeq"].ToString(),//搴忓彿
+ guid = row["guid"].ToString(),//搴忓彿
processNo = row["processNo"].ToString(),//宸ュ簭缂栧彿
- remark = row["gxOrder"].ToString(),//宸ュ簭椤哄簭鍙�
- statStatus = (row["signingFlag"].ToString()),//鎶ュ伐鏍囪瘑
- collectionName = row["storageFlag"].ToString(),//鍏ュ簱鏍囪瘑
+ gxOrder = row["gxOrder"].ToString(),//宸ュ簭椤哄簭鍙�
+ signingFlag = row["signingFlag"].ToString(),//鎶ュ伐鏍囪瘑
+ storageFlag = row["storageFlag"].ToString(),//鍏ュ簱鏍囪瘑
frontProcessNo = row["frontProcessNo"].ToString(),//涓婂伐搴忓彿
});
}
+
}
+
+ gvMx2.CloseEditor();
+ gvMx2.PostEditor();
+ gvMx2.UpdateCurrentRow();
+ for (var i = 0; i < gvMx2.DataRowCount; i++)
+ {
+ var row2 = gvMx2.GetDataRow(i);
+ if (row2 != null)
+ {
+ _obj.list2.Add(new
+ {
+ guid = row2["guid"].ToString(),//涓婚敭
+ workers = row2["workers"].ToString(),//鏍囧噯浜烘暟
+ hours = row2["hours"].ToString(),//鏍囧噯宸ユ椂
+ capacity = (row2["capacity"].ToString()),//鍗曞皬鏃朵骇鑳�
+ sCapacity = row2["sCapacity"].ToString(),//鏍囧噯浜ц兘
+ lineType = row2["lineType"].ToString(),//绾夸綋绫诲埆
+ changeTime = row2["changeTime"].ToString(),//鎹㈢嚎鏃堕棿
+ });
+ }
+
+ }
+
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
@@ -346,7 +364,9 @@
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+
toolBarMenu1.currentAction = "";
//Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
@@ -405,6 +425,7 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
this.btnCopy.Enabled = true;
JObject _job = JObject.Parse(strJson);
@@ -551,11 +572,56 @@
}
/// <summary>
+ /// 绉诲嚭浜ц兘
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx2.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//杩欐槸浜у搧鐨刧uid
+ mxGuid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteMode2OrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ /// <summary>
/// 璇诲彇宸ュ簭涓嬫媺
/// </summary>
private void _getListJyxm()
{
- var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", "");
+ var pgq = new PageQueryModel(1, 999999, "a.PROC_NO", "asc", "", "");
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -565,7 +631,7 @@
rptGx.Items.Add("绌�");
foreach (DataRow dr in dt.Rows)
{
- rptGx.Items.Add(dr["processNo"].ToString());
+ rptGx.Items.Add(dr["procNo"].ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs
index d9a7f99..34a83d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.Designer.cs
@@ -32,9 +32,9 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -46,10 +46,12 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(443, 542);
+ this.gcMain.Size = new System.Drawing.Size(388, 422);
this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -59,15 +61,16 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_guid,
this.gridColumn1,
this.gv_supplierItemCode,
this.gv_supplierItemName});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -77,69 +80,70 @@
//
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
- this.colChkInt.MinWidth = 25;
+ this.colChkInt.MinWidth = 22;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 94;
+ this.colChkInt.Width = 82;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 10;
+ this.gv_guid.MinWidth = 9;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.OptionsColumn.ReadOnly = true;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 82;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "宸ュ簭浠ｇ爜";
+ this.gridColumn1.FieldName = "procNo";
+ this.gridColumn1.MinWidth = 22;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 82;
//
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "宸ュ簭鍚嶇О";
- this.gv_supplierItemCode.FieldName = "processName";
- this.gv_supplierItemCode.MinWidth = 10;
+ this.gv_supplierItemCode.FieldName = "procName";
+ this.gv_supplierItemCode.MinWidth = 9;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
this.gv_supplierItemCode.VisibleIndex = 2;
- this.gv_supplierItemCode.Width = 100;
+ this.gv_supplierItemCode.Width = 87;
//
// gv_supplierItemName
//
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "宸ュ簭澶囨敞";
this.gv_supplierItemName.FieldName = "remark";
- this.gv_supplierItemName.MinWidth = 10;
+ this.gv_supplierItemName.MinWidth = 9;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
this.gv_supplierItemName.VisibleIndex = 3;
- this.gv_supplierItemName.Width = 120;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "宸ュ簭浠ｇ爜";
- this.gridColumn1.FieldName = "processNo";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
+ this.gv_supplierItemName.Width = 105;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 542);
+ this.panelControl1.Location = new System.Drawing.Point(0, 422);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(443, 43);
+ this.panelControl1.Size = new System.Drawing.Size(388, 33);
this.panelControl1.TabIndex = 9;
//
// btnIn
@@ -148,20 +152,22 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
- this.btnIn.Location = new System.Drawing.Point(347, 2);
+ this.btnIn.Location = new System.Drawing.Point(304, 2);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.Size = new System.Drawing.Size(82, 29);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
// SelectProcess
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(443, 585);
+ this.ClientSize = new System.Drawing.Size(388, 455);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "SelectProcess";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨宸ュ簭";
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
index 7ee1d8a..de95b06 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
@@ -41,8 +41,8 @@
list.Add(new
{
fSeq = fSeq,
- processNo = dr["processNo"].ToString(),
- processName = dr["processName"].ToString(),
+ processNo = dr["procNo"].ToString(),
+ processName = dr["procName"].ToString(),
});
idx++;
}
@@ -67,7 +67,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = "";
- var pgq = new PageQueryModel(curPage, 999999, "a.processNo", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "a.PROC_NO", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3