From ce14eba61c3d70c192fc56706da239919790cc3c Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期四, 24 七月 2025 13:50:40 +0800 Subject: [PATCH] 到冲物料维护模块增加 --- DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs | 154 +++++++++++++++++++++----------------- DevApp/Gs.DevApp/Gs.DevApp.csproj | 63 +++++++++++++++ DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs | 5 3 files changed, 152 insertions(+), 70 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs index 15b20ef..8f0a9b2 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs @@ -52,6 +52,7 @@ 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(); @@ -115,18 +116,17 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); 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.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); 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.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -135,15 +135,17 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_gxOrder = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + 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); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -215,19 +217,33 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit(); 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.repositoryItemCheckEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptGx)).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(); 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 // @@ -1086,24 +1102,13 @@ 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.Tag = "edit"; - this.gv_workers.Width = 113; - // // gv_hours // this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級"; this.gv_hours.FieldName = "hours"; this.gv_hours.MinWidth = 22; this.gv_hours.Name = "gv_hours"; - this.gv_hours.Tag = "query_a.hours"; + this.gv_hours.Tag = "edit"; this.gv_hours.Width = 82; // // gv_capacity @@ -1118,7 +1123,6 @@ this.gv_capacity.FieldName = "capacity"; this.gv_capacity.MinWidth = 44; this.gv_capacity.Name = "gv_capacity"; - this.gv_capacity.OptionsColumn.ReadOnly = true; this.gv_capacity.Tag = "edit"; this.gv_capacity.Width = 100; // @@ -1140,28 +1144,11 @@ this.gv_sCapacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gv_sCapacity.AppearanceHeader.Options.UseForeColor = true; this.gv_sCapacity.Caption = "鏍囧噯浜ц兘"; - this.gv_sCapacity.ColumnEdit = this.repositoryItemComboBox4; this.gv_sCapacity.FieldName = "sCapacity"; this.gv_sCapacity.MinWidth = 22; this.gv_sCapacity.Name = "gv_sCapacity"; - this.gv_sCapacity.OptionsColumn.ReadOnly = true; this.gv_sCapacity.Tag = "edit"; this.gv_sCapacity.Width = 80; - // - // 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; // // gv_lineType // @@ -1175,7 +1162,6 @@ this.gv_lineType.FieldName = "lineType"; this.gv_lineType.MinWidth = 131; this.gv_lineType.Name = "gv_lineType"; - this.gv_lineType.OptionsColumn.ReadOnly = true; this.gv_lineType.Tag = "edit"; this.gv_lineType.Width = 131; // @@ -1184,6 +1170,10 @@ 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; // @@ -1198,7 +1188,6 @@ this.gv_changeTime.FieldName = "changeTime"; this.gv_changeTime.MinWidth = 44; this.gv_changeTime.Name = "gv_changeTime"; - this.gv_changeTime.OptionsColumn.ReadOnly = true; this.gv_changeTime.Tag = "edit"; this.gv_changeTime.Width = 78; // @@ -1229,6 +1218,21 @@ 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); @@ -1252,7 +1256,9 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemComboBox2, - this.rptGx}); + this.rptGx, + this.repositoryItemCheckEdit1, + this.repositoryItemCheckEdit2}); this.gcMx1.Size = new System.Drawing.Size(618, 363); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1338,7 +1344,6 @@ 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 = "signingFlag"; this.gvMx1daa003.MinWidth = 44; this.gvMx1daa003.Name = "gvMx1daa003"; @@ -1348,16 +1353,10 @@ this.gvMx1daa003.VisibleIndex = 4; this.gvMx1daa003.Width = 100; // - // repositoryItemComboBox1 + // repositoryItemCheckEdit1 // - 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; + this.repositoryItemCheckEdit1.AutoHeight = false; + this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1"; // // gridColumn1 // @@ -1366,7 +1365,6 @@ this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gridColumn1.AppearanceHeader.Options.UseForeColor = true; this.gridColumn1.Caption = "鍏ュ簱鏍囪瘑"; - this.gridColumn1.ColumnEdit = this.repositoryItemComboBox2; this.gridColumn1.FieldName = "storageFlag"; this.gridColumn1.MinWidth = 22; this.gridColumn1.Name = "gridColumn1"; @@ -1376,20 +1374,10 @@ this.gridColumn1.VisibleIndex = 5; this.gridColumn1.Width = 80; // - // repositoryItemComboBox2 + // repositoryItemCheckEdit2 // - 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; + this.repositoryItemCheckEdit2.AutoHeight = false; + this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2"; // // gvMx1daa004 // @@ -1463,6 +1451,32 @@ this.gridColumn3.MinWidth = 22; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Width = 82; + // + // 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; // // picCheckBox // @@ -1556,16 +1570,18 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit(); 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.repositoryItemCheckEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptGx)).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(); this.ResumeLayout(false); @@ -1648,7 +1664,6 @@ 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; @@ -1666,5 +1681,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraGrid.Columns.GridColumn gv_gxOrder; private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1; + private DevExpress.XtraGrid.Columns.GridColumn gv_workers; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit2; } } \ 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 52d95f2..ec53fe5 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs @@ -62,8 +62,9 @@ { DataRow _row = _Table.NewRow(); _row["fSeq"] = dym.fSeq; - _row["statStatus"] = "Y-鏄�"; - _row["collectionName"] = "绌�"; + _row["signingFlag"] = false; + _row["storageFlag"] = true; + _row["frontProcessNo"] = "绌�"; _row["processNo"] = dym.processNo; _row["processName"] = dym.processName; _Table.Rows.Add(_row); diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index e87c1b1..5cf3c41 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -851,6 +851,30 @@ <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" /> <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" /> + <Compile Include="DevFrm\WOM\FrmBackFlash.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs"> + <DependentUpon>FrmBackFlash.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGx.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGx.Designer.cs"> + <DependentUpon>Frm_MesProcGx.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGx0.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGx0.Designer.cs"> + <DependentUpon>Frm_MesProcGx0.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGxShow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_MesProcGxShow.Designer.cs"> + <DependentUpon>Frm_MesProcGxShow.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\WOM\Frm_MesScrkDj.cs"> <SubType>Form</SubType> </Compile> @@ -862,6 +886,12 @@ </Compile> <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\WOM\MesProcInfo.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\MesProcInfo.Designer.cs"> + <DependentUpon>MesProcInfo.cs</DependentUpon> </Compile> <Compile Include="DevFrm\WOM\ShowJieAn.cs"> <SubType>Form</SubType> @@ -933,6 +963,12 @@ </Compile> <Compile Include="UserControl\SelectDeleteBar.Designer.cs"> <DependentUpon>SelectDeleteBar.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\SelectKw.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="UserControl\SelectKw.Designer.cs"> + <DependentUpon>SelectKw.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionaryComBox.cs"> <SubType>UserControl</SubType> @@ -1207,6 +1243,12 @@ </Compile> <Compile Include="UserControl\UcLookItems.Designer.cs"> <DependentUpon>UcLookItems.cs</DependentUpon> + </Compile> + <Compile Include="UserControl\UcLookKw.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcLookKw.Designer.cs"> + <DependentUpon>UcLookKw.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcLookOrg.cs"> <SubType>UserControl</SubType> @@ -1612,11 +1654,26 @@ <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx"> <DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx"> + <DependentUpon>FrmBackFlash.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_MesProcGx.resx"> + <DependentUpon>Frm_MesProcGx.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_MesProcGx0.resx"> + <DependentUpon>Frm_MesProcGx0.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_MesProcGxShow.resx"> + <DependentUpon>Frm_MesProcGxShow.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrkDj.resx"> <DependentUpon>Frm_MesScrkDj.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\MesProcInfo.resx"> + <DependentUpon>MesProcInfo.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx"> <DependentUpon>ShowJieAn.cs</DependentUpon> @@ -1650,6 +1707,9 @@ </EmbeddedResource> <EmbeddedResource Include="UserControl\SelectDeleteBar.resx"> <DependentUpon>SelectDeleteBar.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="UserControl\SelectKw.resx"> + <DependentUpon>SelectKw.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx"> <DependentUpon>UcDictionaryComBox.cs</DependentUpon> @@ -1786,6 +1846,9 @@ <EmbeddedResource Include="UserControl\UcLookItems.resx"> <DependentUpon>UcLookItems.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcLookKw.resx"> + <DependentUpon>UcLookKw.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\UcLookOrg.resx"> <DependentUpon>UcLookOrg.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.9.3