bug
lu
7 天以前 d157667c10afbda2cf8005459bffa78f40d1b033
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -30,18 +30,18 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            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.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            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_Wompba));
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -215,6 +215,7 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
@@ -228,8 +229,9 @@
            // split1.Panel2
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 551;
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 4;
            // 
            // gcMain1
@@ -238,7 +240,7 @@
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1126, 512);
            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -383,7 +385,7 @@
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 512);
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
@@ -414,6 +416,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(1126, 570);
            this.splitMx1.SplitterPosition = 109;
            this.splitMx1.TabIndex = 0;
@@ -464,7 +467,7 @@
            this.txt_pba013.IsReadly = false;
            this.txt_pba013.Location = new System.Drawing.Point(89, 43);
            this.txt_pba013.Name = "txt_pba013";
            this.txt_pba013.Size = new System.Drawing.Size(195, 24);
            this.txt_pba013.Size = new System.Drawing.Size(190, 24);
            this.txt_pba013.TabIndex = 459;
            // 
            // txt_erpSczz
@@ -472,54 +475,54 @@
            this.txt_erpSczz.IsReadly = false;
            this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
            this.txt_erpSczz.Name = "txt_erpSczz";
            this.txt_erpSczz.Size = new System.Drawing.Size(195, 24);
            this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
            this.txt_erpSczz.TabIndex = 460;
            // 
            // txt_hNo
            // 
            this.txt_hNo.Location = new System.Drawing.Point(365, 12);
            this.txt_hNo.Location = new System.Drawing.Point(360, 12);
            this.txt_hNo.Name = "txt_hNo";
            this.txt_hNo.Properties.Appearance.Options.UseFont = true;
            this.txt_hNo.Size = new System.Drawing.Size(195, 24);
            this.txt_hNo.Size = new System.Drawing.Size(190, 24);
            this.txt_hNo.StyleController = this.layoutMx1;
            this.txt_hNo.TabIndex = 458;
            this.txt_hNo.Tag = "readonly";
            // 
            // txt_pba009
            // 
            this.txt_pba009.Location = new System.Drawing.Point(365, 43);
            this.txt_pba009.Location = new System.Drawing.Point(360, 43);
            this.txt_pba009.Name = "txt_pba009";
            this.txt_pba009.Properties.Appearance.Options.UseFont = true;
            this.txt_pba009.Size = new System.Drawing.Size(471, 24);
            this.txt_pba009.Size = new System.Drawing.Size(461, 24);
            this.txt_pba009.StyleController = this.layoutMx1;
            this.txt_pba009.TabIndex = 240;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 273;
            this.txt_checkUser.Tag = "readonly";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(641, 12);
            this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(195, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 267;
            this.txt_checkDate.Tag = "readonly";
            // 
            // txt_fstatus
            // 
            this.txt_fstatus.Location = new System.Drawing.Point(840, 43);
            this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "审核状态";
            this.txt_fstatus.Size = new System.Drawing.Size(274, 24);
            this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
            this.txt_fstatus.StyleController = this.layoutMx1;
            this.txt_fstatus.TabIndex = 461;
            this.txt_fstatus.Tag = "readonly";
@@ -551,30 +554,30 @@
            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;
            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;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            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;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1126, 113);
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -582,27 +585,27 @@
            this.layoutControlItem1.Control = this.txt_erpSczz;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Text = "生产组织";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_hNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Text = "排产编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_checkDate;
            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Text = "审核日期 ";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -612,28 +615,28 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Text = "工作车间";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_checkUser;
            this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem5.Text = "审核人";
            this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem5.Text = "审核人员";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_fstatus;
            this.layoutControlItem6.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem6.Text = "审核状态";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
@@ -641,12 +644,12 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_pba009;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem7.Text = "排产备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -658,7 +661,7 @@
            this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem8.Text = "选择投料单";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -748,7 +751,7 @@
            // gvMx1guid
            // 
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid";
            this.gvMx1guid.Caption = "明细Guid";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 50;
            this.gvMx1guid.Name = "gvMx1guid";
@@ -837,7 +840,7 @@
            this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1daa016.Caption = "预计开工日时间";
            this.gvMx1daa016.Caption = "Mes预计开工";
            this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
            this.gvMx1daa016.FieldName = "mesStartProd";
            this.gvMx1daa016.MinWidth = 50;
@@ -854,6 +857,11 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemDateEdit2.DisplayFormat.FormatString = "D";
            this.repositoryItemDateEdit2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.repositoryItemDateEdit2.EditFormat.FormatString = "D";
            this.repositoryItemDateEdit2.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.repositoryItemDateEdit2.MaskSettings.Set("mask", "D");
            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
            // 
            // gvMx1daa018
@@ -863,7 +871,7 @@
            this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1daa018.Caption = "预计完工时间";
            this.gvMx1daa018.Caption = "Mes预计完工";
            this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
            this.gvMx1daa018.FieldName = "mesEndProd";
            this.gvMx1daa018.MinWidth = 50;
@@ -1175,6 +1183,11 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D";
            this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.repositoryItemDateEdit1.EditFormat.FormatString = "D";
            this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D");
            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
            // 
            // gridColumn3
@@ -1221,10 +1234,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            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, 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, 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);