diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index 5ecc6a0..2fd8af1 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v16/.suo and b/.vs/WinformGeneralDeveloperFrame/v16/.suo differ diff --git a/DB/script.sql b/DB/script.sql index 32f4e33..b5255ed 100644 Binary files a/DB/script.sql and b/DB/script.sql differ diff --git a/WinformGeneralDeveloperFrame/DB/MESDB.cs b/WinformGeneralDeveloperFrame/DB/MESDB.cs index 27e4a03..767a769 100644 --- a/WinformGeneralDeveloperFrame/DB/MESDB.cs +++ b/WinformGeneralDeveloperFrame/DB/MESDB.cs @@ -94,5 +94,9 @@ namespace MES public virtual DbSet productMaterialOutWarehouseInfo { set; get; } + public virtual DbSet productMaterialInWarehouseDetailInfo { get; set; } + + public virtual DbSet productMaterialInWarehouseInfo { set; get; } + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseDetailInfo.cs b/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseDetailInfo.cs new file mode 100644 index 0000000..4ff2363 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseDetailInfo.cs @@ -0,0 +1,61 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("productMaterialInWarehouseDetail")] + public partial class productMaterialInWarehouseDetailInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + ///主表id + [ModelBindControl("txtmasterid")] + public int masterid{set;get;} + ///生产退料入库单号 + [ModelBindControl("txtmasercode")] + public string masercode{set;get;} + ///生产退料入库明细单号 + [ModelBindControl("txtdetailcode")] + public string detailcode{set;get;} + ///生产退料单号 + [ModelBindControl("txtproductionMaterialReturnCode")] + public string productionMaterialReturnCode{set;get;} + ///生产退料明细单号 + [ModelBindControl("txtproductionMaterialReturnDetailCode")] + public string productionMaterialReturnDetailCode{set;get;} + ///物料 + [ModelBindControl("txtmaterialid")] + public int materialid{set;get;} + ///物料编码 + [ModelBindControl("txtmaterialcode")] + public string materialcode{set;get;} + ///规格型号 + [ModelBindControl("txtmaterialspec")] + public string materialspec{set;get;} + ///退料原因 + [ModelBindControl("txtreason")] + public string reason{set;get;} + ///入库数量 + [ModelBindControl("txtnumber")] + public decimal number{set;get;} + ///计量单位 + [ModelBindControl("txtunit")] + public int unit{set;get;} + ///仓库 + [ModelBindControl("txtwarehouse")] + public int warehouse{set;get;} + ///工单号 + [ModelBindControl("txtwocode")] + public string wocode{set;get;} + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseInfo.cs b/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseInfo.cs new file mode 100644 index 0000000..006cccb --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseInfo.cs @@ -0,0 +1,34 @@ +using WinformGeneralDeveloperFrame.Commons; + +namespace MES.Entity +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("productMaterialInWarehouse")] + public partial class productMaterialInWarehouseInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + ///入库单号 + [ModelBindControl("txtcode")] + public string code{set;get;} + ///入库日期 + [ModelBindControl("txtintime")] + public DateTime intime{set;get;}=DateTime.Now; + ///退料单位 + [ModelBindControl("txtdept")] + public int dept{set;get;} + ///制单人 + [ModelBindControl("txtcreatorId")] + public int creatorId{set;get;} + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmbuyerInWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmbuyerInWarehouse.designer.cs index a12bb77..eaee749 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmbuyerInWarehouse.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmbuyerInWarehouse.designer.cs @@ -233,7 +233,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1305, 746); + this.tabDataList.Size = new System.Drawing.Size(1304, 743); this.tabDataList.Text = "数据列表"; // // grdList @@ -242,7 +242,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1305, 746); + this.grdList.Size = new System.Drawing.Size(1304, 743); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -267,7 +267,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1305, 746); + this.tabDataDetail.Size = new System.Drawing.Size(1304, 743); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -276,7 +276,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1305, 746); + this.panelControl2.Size = new System.Drawing.Size(1304, 743); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -293,7 +293,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1301, 742); + this.layoutControl1.Size = new System.Drawing.Size(1300, 739); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // @@ -302,7 +302,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 108); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1277, 622); + this.xtraTabControl2.Size = new System.Drawing.Size(1276, 619); this.xtraTabControl2.TabIndex = 8; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -311,7 +311,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.gridControl1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1272, 596); + this.xtraTabPage1.Size = new System.Drawing.Size(1270, 590); this.xtraTabPage1.Text = "入库明细"; // // gridControl1 @@ -327,7 +327,7 @@ namespace MES.Form this.repositoryItemMarqueeProgressBar1, this.repositoryItemLookUpEditwarehouse, this.repositoryItemTextEditbuyerdetailcode}); - this.gridControl1.Size = new System.Drawing.Size(1272, 596); + this.gridControl1.Size = new System.Drawing.Size(1270, 590); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -536,13 +536,13 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(75, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(573, 20); + this.txtid.Size = new System.Drawing.Size(572, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // // txtcode // - this.txtcode.Location = new System.Drawing.Point(715, 12); + this.txtcode.Location = new System.Drawing.Point(714, 12); this.txtcode.Name = "txtcode"; this.txtcode.Size = new System.Drawing.Size(574, 20); this.txtcode.StyleController = this.layoutControl1; @@ -559,7 +559,7 @@ namespace MES.Form this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(573, 20); + this.txtcreatorId.Size = new System.Drawing.Size(572, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 3; // @@ -574,14 +574,14 @@ namespace MES.Form this.txtsupplierid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtsupplierid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtsupplierid.Properties.ValueMember = "ID"; - this.txtsupplierid.Size = new System.Drawing.Size(573, 20); + this.txtsupplierid.Size = new System.Drawing.Size(572, 20); this.txtsupplierid.StyleController = this.layoutControl1; this.txtsupplierid.TabIndex = 4; this.txtsupplierid.EditValueChanged += new System.EventHandler(this.txtsupplierid_EditValueChanged); // // txtsuppliercode // - this.txtsuppliercode.Location = new System.Drawing.Point(715, 36); + this.txtsuppliercode.Location = new System.Drawing.Point(714, 36); this.txtsuppliercode.Name = "txtsuppliercode"; this.txtsuppliercode.Size = new System.Drawing.Size(574, 20); this.txtsuppliercode.StyleController = this.layoutControl1; @@ -591,7 +591,7 @@ namespace MES.Form // this.txtintime.EditValue = null; this.txtintime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtintime.Location = new System.Drawing.Point(715, 60); + this.txtintime.Location = new System.Drawing.Point(714, 60); this.txtintime.Name = "txtintime"; this.txtintime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -608,7 +608,7 @@ namespace MES.Form // this.txtremark.Location = new System.Drawing.Point(75, 84); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(1214, 20); + this.txtremark.Size = new System.Drawing.Size(1213, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 7; // @@ -626,7 +626,7 @@ namespace MES.Form this.layoutControlItem3, this.layoutControlItem8}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1301, 742); + this.layoutControlGroup1.Size = new System.Drawing.Size(1300, 739); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -635,7 +635,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(639, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14); // @@ -645,7 +645,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "供应商"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 24); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(639, 24); this.layoutControlItem4.Text = "供应商"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14); // @@ -653,7 +653,7 @@ namespace MES.Form // this.layoutControlItem6.Control = this.txtintime; this.layoutControlItem6.CustomizationFormText = "入库日期"; - this.layoutControlItem6.Location = new System.Drawing.Point(640, 48); + this.layoutControlItem6.Location = new System.Drawing.Point(639, 48); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.Size = new System.Drawing.Size(641, 24); this.layoutControlItem6.Text = "入库日期"; @@ -665,7 +665,7 @@ namespace MES.Form this.layoutControlItem7.CustomizationFormText = "备注"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1281, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(1280, 24); this.layoutControlItem7.Text = "备注"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14); // @@ -673,7 +673,7 @@ namespace MES.Form // this.layoutControlItem2.Control = this.txtcode; this.layoutControlItem2.CustomizationFormText = "入库单号"; - this.layoutControlItem2.Location = new System.Drawing.Point(640, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(639, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Size = new System.Drawing.Size(641, 24); this.layoutControlItem2.Text = "入库单号"; @@ -683,7 +683,7 @@ namespace MES.Form // this.layoutControlItem5.Control = this.txtsuppliercode; this.layoutControlItem5.CustomizationFormText = "供应商编码"; - this.layoutControlItem5.Location = new System.Drawing.Point(640, 24); + this.layoutControlItem5.Location = new System.Drawing.Point(639, 24); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.Size = new System.Drawing.Size(641, 24); this.layoutControlItem5.Text = "供应商编码"; @@ -695,7 +695,7 @@ namespace MES.Form this.layoutControlItem3.CustomizationFormText = "制单人"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(639, 24); this.layoutControlItem3.Text = "制单人"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14); // @@ -704,7 +704,7 @@ namespace MES.Form this.layoutControlItem8.Control = this.xtraTabControl2; this.layoutControlItem8.Location = new System.Drawing.Point(0, 96); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1281, 626); + this.layoutControlItem8.Size = new System.Drawing.Size(1280, 623); this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // diff --git a/WinformGeneralDeveloperFrame/Form/FrmbuyerOutWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmbuyerOutWarehouse.designer.cs index 63391f7..bc11e57 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmbuyerOutWarehouse.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmbuyerOutWarehouse.designer.cs @@ -53,6 +53,9 @@ namespace MES.Form this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gridControl1 = new DevExpress.XtraGrid.GridControl(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -90,9 +93,6 @@ namespace MES.Form this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtsupplierid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -109,6 +109,7 @@ namespace MES.Form this.xtraTabControl2.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditbuyerreturndetailcode)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit(); @@ -132,7 +133,6 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // gridColumn1 @@ -233,7 +233,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1295, 740); + this.tabDataList.Size = new System.Drawing.Size(1294, 737); this.tabDataList.Text = "数据列表"; // // grdList @@ -242,7 +242,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1295, 740); + this.grdList.Size = new System.Drawing.Size(1294, 737); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -267,7 +267,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1295, 740); + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -276,7 +276,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1295, 740); + this.panelControl2.Size = new System.Drawing.Size(1294, 737); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -293,7 +293,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1291, 736); + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // @@ -302,7 +302,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 108); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1267, 616); + this.xtraTabControl2.Size = new System.Drawing.Size(1266, 613); this.xtraTabControl2.TabIndex = 8; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -311,7 +311,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.gridControl1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1262, 590); + this.xtraTabPage1.Size = new System.Drawing.Size(1260, 584); this.xtraTabPage1.Text = "出库明细"; // // gridControl1 @@ -327,11 +327,33 @@ namespace MES.Form this.repositoryItemLookUpEditwarehouse, this.repositoryItemLookUpEdit1, this.repositoryItemTextEditbuyerreturndetailcode}); - this.gridControl1.Size = new System.Drawing.Size(1262, 590); + this.gridControl1.Size = new System.Drawing.Size(1260, 584); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItemAdd, + this.toolStripMenuItemDel}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); + // + // toolStripMenuItemAdd + // + this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemAdd.Text = "新增行"; + this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); + // + // toolStripMenuItemDel + // + this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; + this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemDel.Text = "删除行"; + this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); + // // gridView1 // this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { @@ -537,13 +559,13 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(111, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(532, 20); + this.txtid.Size = new System.Drawing.Size(531, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // // txtcode // - this.txtcode.Location = new System.Drawing.Point(746, 12); + this.txtcode.Location = new System.Drawing.Point(745, 12); this.txtcode.Name = "txtcode"; this.txtcode.Size = new System.Drawing.Size(533, 20); this.txtcode.StyleController = this.layoutControl1; @@ -553,7 +575,7 @@ namespace MES.Form // this.txtouttime.EditValue = null; this.txtouttime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtouttime.Location = new System.Drawing.Point(746, 60); + this.txtouttime.Location = new System.Drawing.Point(745, 60); this.txtouttime.Name = "txtouttime"; this.txtouttime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -576,14 +598,14 @@ namespace MES.Form this.txtsupplierid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtsupplierid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtsupplierid.Properties.ValueMember = "ID"; - this.txtsupplierid.Size = new System.Drawing.Size(532, 20); + this.txtsupplierid.Size = new System.Drawing.Size(531, 20); this.txtsupplierid.StyleController = this.layoutControl1; this.txtsupplierid.TabIndex = 4; this.txtsupplierid.EditValueChanged += new System.EventHandler(this.txtsupplierid_EditValueChanged); // // txtsuppliercode // - this.txtsuppliercode.Location = new System.Drawing.Point(746, 36); + this.txtsuppliercode.Location = new System.Drawing.Point(745, 36); this.txtsuppliercode.Name = "txtsuppliercode"; this.txtsuppliercode.Size = new System.Drawing.Size(533, 20); this.txtsuppliercode.StyleController = this.layoutControl1; @@ -600,7 +622,7 @@ namespace MES.Form this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(532, 20); + this.txtcreatorId.Size = new System.Drawing.Size(531, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 6; // @@ -608,7 +630,7 @@ namespace MES.Form // this.txtremark.Location = new System.Drawing.Point(111, 84); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(1168, 20); + this.txtremark.Size = new System.Drawing.Size(1167, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 7; // @@ -626,7 +648,7 @@ namespace MES.Form this.layoutControlItem8, this.layoutControlItem5}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1291, 736); + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -635,7 +657,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(634, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(96, 14); // @@ -645,7 +667,7 @@ namespace MES.Form this.layoutControlItem6.CustomizationFormText = "制单人"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 48); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(634, 24); this.layoutControlItem6.Text = "制单人"; this.layoutControlItem6.TextSize = new System.Drawing.Size(96, 14); // @@ -655,7 +677,7 @@ namespace MES.Form this.layoutControlItem7.CustomizationFormText = "备注"; this.layoutControlItem7.Location = new System.Drawing.Point(0, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1271, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24); this.layoutControlItem7.Text = "备注"; this.layoutControlItem7.TextSize = new System.Drawing.Size(96, 14); // @@ -663,7 +685,7 @@ namespace MES.Form // this.layoutControlItem2.Control = this.txtcode; this.layoutControlItem2.CustomizationFormText = "采购退货出库单号"; - this.layoutControlItem2.Location = new System.Drawing.Point(635, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(634, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Size = new System.Drawing.Size(636, 24); this.layoutControlItem2.Text = "采购退货出库单号"; @@ -675,7 +697,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "供应商"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 24); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(634, 24); this.layoutControlItem4.Text = "供应商"; this.layoutControlItem4.TextSize = new System.Drawing.Size(96, 14); // @@ -683,7 +705,7 @@ namespace MES.Form // this.layoutControlItem3.Control = this.txtouttime; this.layoutControlItem3.CustomizationFormText = "出库日期"; - this.layoutControlItem3.Location = new System.Drawing.Point(635, 48); + this.layoutControlItem3.Location = new System.Drawing.Point(634, 48); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Size = new System.Drawing.Size(636, 24); this.layoutControlItem3.Text = "出库日期"; @@ -694,7 +716,7 @@ namespace MES.Form this.layoutControlItem8.Control = this.xtraTabControl2; this.layoutControlItem8.Location = new System.Drawing.Point(0, 96); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(1271, 620); + this.layoutControlItem8.Size = new System.Drawing.Size(1270, 617); this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // @@ -702,34 +724,12 @@ namespace MES.Form // this.layoutControlItem5.Control = this.txtsuppliercode; this.layoutControlItem5.CustomizationFormText = "供应商编码"; - this.layoutControlItem5.Location = new System.Drawing.Point(635, 24); + this.layoutControlItem5.Location = new System.Drawing.Point(634, 24); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.Size = new System.Drawing.Size(636, 24); this.layoutControlItem5.Text = "供应商编码"; this.layoutControlItem5.TextSize = new System.Drawing.Size(96, 14); // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItemAdd, - this.toolStripMenuItemDel}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); - // - // toolStripMenuItemAdd - // - this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; - this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); - this.toolStripMenuItemAdd.Text = "新增行"; - this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); - // - // toolStripMenuItemDel - // - this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; - this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); - this.toolStripMenuItemDel.Text = "删除行"; - this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); - // // FrmbuyerOutWarehouse // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); @@ -756,6 +756,7 @@ namespace MES.Form this.xtraTabControl2.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditbuyerreturndetailcode)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit(); @@ -779,7 +780,6 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.cs b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.cs new file mode 100644 index 0000000..c489ecb --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.cs @@ -0,0 +1,300 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using WinformGeneralDeveloperFrame; +using WinformGeneralDeveloperFrame.Commons; +using DevExpress.XtraLayout; +using MES.Entity; +using System.Data.Entity.Migrations; +using System.Data.Entity; +namespace MES.Form +{ + public partial class FrmproductMaterialInWarehouse : FrmBaseForm + { + private Dictionary fieldDictionary = new Dictionary(); + public FrmproductMaterialInWarehouse() + { + InitializeComponent(); + } + private void FrmproductMaterialInWarehouse_Load(object sender, EventArgs e) + { + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productMaterialInWarehouseInfo(),gridControl1,new []{"txtcode"}); + InitSearchDicData(); + repositoryItemTextEditproductionMaterialReturnDetailCode.KeyDown += RepositoryItemTextEditproductionMaterialReturnDetailCode_KeyDown; + } + + private void RepositoryItemTextEditproductionMaterialReturnDetailCode_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Tab) + { + using (var db = new MESDB()) + { + string code = gridView1.EditingValue.ToString(); + if (!string.IsNullOrEmpty(code)) + { + productionMaterialReturnDetailInfo buyerdetailInfo = db.productionMaterialReturnDetailInfo + .Where(p => p.detailcode == code).FirstOrDefault(); + if (buyerdetailInfo == null) + { + "单号不存在".ShowWarning(); + } + else + { + gridView1.GetFocusedDataRow()["productionMaterialReturnDetailCode"] = buyerdetailInfo.detailcode; + gridView1.GetFocusedDataRow()["productionMaterialReturnCode"] = buyerdetailInfo.mastercode; + gridView1.GetFocusedDataRow()["wocode"] = buyerdetailInfo.wocode; + gridView1.GetFocusedDataRow()["materialid"] = buyerdetailInfo.materialid; + gridView1.GetFocusedDataRow()["materialcode"] = buyerdetailInfo.materialcode; + gridView1.GetFocusedDataRow()["materialspec"] = buyerdetailInfo.materialspec; + gridView1.GetFocusedDataRow()["unit"] = buyerdetailInfo.unit; + gridView1.GetFocusedDataRow()["warehouse"] = buyerdetailInfo.warehouse; + } + } + } + } + } + + /// + /// 数据源初始化 + /// + /// + private void Init() + { + txtdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门"); + repositoryItemtxtdept.DataSource= GetDataTableUtils.SqlTable("部门"); + txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); + repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户"); + repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料"); + repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库"); + repositoryItemLookUpEditunit.DataSource = GetDataTableUtils.SqlTable("计量单位"); + + } + /// + /// 搜索字段 + /// + /// + private void InitSearchDicData() + { + fieldDictionary.Add("入库单号","code"); + } + + public override void InitgrdListDataSource() + { + using (var con=new MESDB())/// + { + grdList.DataSource=con.productMaterialInWarehouseInfo.ToList(); + } + Init(); + } + /// + /// 字段为空校验 + /// + /// + public override bool CheckInput() + { + if(string.IsNullOrEmpty(txtintime.EditValue.ToString())) + { + "入库日期不能为空".ShowWarning(); + txtintime.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtdept.EditValue.ToString())) + { + "退料单位不能为空".ShowWarning(); + txtdept.Focus(); + return false; + } + if(string.IsNullOrEmpty(txtcreatorId.EditValue.ToString())) + { + "制单人不能为空".ShowWarning(); + txtcreatorId.Focus(); + return false; + } + return true; + } + /// + /// 保存 + /// + /// + public override bool SaveFunction() + { + string code = "MMR" + DateTime.Now.GetDateTimeCode(); + + DataTable dt = gridControl1.DataSource as DataTable; + try + { + productMaterialInWarehouseInfo info = (productMaterialInWarehouseInfo)this.ControlDataToModel(new productMaterialInWarehouseInfo()); + using (var db = new MESDB()) + { + using (var tran = db.Database.BeginTransaction()) + { + try + { + Dictionary> dic = + dt.GetDataTableData(); + if (info.id == 0) //新增 + { + info.code = code; + db.productMaterialInWarehouseInfo.Add(info); + db.SaveChanges(); + txtid.Text = info.id.ToString(); + txtcode.Text = code; + if (dt != null) + { + List detaiListAdd = + dic["Add"]; + int num = 0; + detaiListAdd.ForEach(a => + { + num++; + string codedetail = code + num; + a.masterid = info.id; + a.masercode = info.code; + a.detailcode = codedetail; + }); + db.productMaterialInWarehouseDetailInfo.AddRange(detaiListAdd); + db.SaveChanges(); + } + } + else //更新 + { + db.Entry(info).State = EntityState.Modified; + db.SaveChanges(); + if (dt != null) + { + List detaiListAdd = + dic["Add"]; + int num = 0; + detaiListAdd.ForEach(a => + { + a.masterid = info.id; + a.masercode = info.code; + num++; + string codedetail = code+ num; + a.detailcode = codedetail; + }); + db.productMaterialInWarehouseDetailInfo.AddRange(detaiListAdd); + + List detaiListEdit = + dic["Edit"]; + + detaiListEdit.ForEach((a) => + { + //a.buyercode = info.buyercode; + db.Entry(a).State = EntityState.Modified; + }); + + List detaiListDel = + dic["Del"]; + detaiListDel.ForEach((a) => { db.Entry(a).State = EntityState.Deleted; }); + db.SaveChanges(); + } + } + + tran.Commit(); + } + catch (Exception ex) + { + tran.Rollback(); + ex.Message.ShowError(); + return false; + } + finally + { + tran.Dispose(); + } + } + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + + return true; + } + /// + /// 删除 + /// + /// + public override bool DelFunction() + { + try + { + productMaterialInWarehouseInfo info = (productMaterialInWarehouseInfo)this.ControlDataToModel(new productMaterialInWarehouseInfo()); + using (var db = new MESDB()) + { + db.Entry(info).State=EntityState.Deleted; + List list = db.productMaterialInWarehouseDetailInfo + .Where(p => p.masterid == info.id).ToList(); + db.productMaterialInWarehouseDetailInfo.RemoveRange(list); + gridControl1.DataSource = null; + db.SaveChanges(); + } + } + catch (Exception ex) + { + ex.Message.ShowError(); + return false; + } + return true; + } + /// + /// 搜索 + /// + /// + public override void SearchFunction() + { + FrmSearch frm = new FrmSearch(fieldDictionary); + if (frm.ShowDialog()==DialogResult.OK) + { + string sql = frm.sql; + using (var db = new MESDB()) + { + if (string.IsNullOrEmpty(sql)) + { + grdList.DataSource = db.productMaterialInWarehouseInfo.SqlQuery("select * from productMaterialInWarehouse").ToList(); + } + else + { + grdList.DataSource = db.productMaterialInWarehouseInfo.SqlQuery($"select * from productMaterialInWarehouse where {sql}").ToList(); + } + } + } + } + + public override void AddFunction() + { + gridControl1.DataSource = new List().ToDataTable(); + } + + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + productMaterialInWarehouseInfo info = grdListView.GetFocusedRow() as productMaterialInWarehouseInfo; + if (info != null) + { + using (var db = new MESDB()) + { + gridControl1.DataSource = db.productMaterialInWarehouseDetailInfo.Where(p => p.masterid == info.id).ToList().ToDataTable(); + gridView1.BestFitColumns(); + } + } + } + + private void toolStripMenuItemAdd_Click(object sender, EventArgs e) + { + gridView1.AddNewRow(); + } + + private void toolStripMenuItemDel_Click(object sender, EventArgs e) + { + gridView1.DeleteRow(gridView1.FocusedRowHandle); + } + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.designer.cs new file mode 100644 index 0000000..60fbccf --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.designer.cs @@ -0,0 +1,801 @@ + +using DevExpress.XtraEditors; +using DevExpress.XtraLayout; +using DevExpress.XtraTab; + +namespace MES.Form +{ + partial class FrmproductMaterialInWarehouse + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtdept = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.tabDataList = new DevExpress.XtraTab.XtraTabPage(); + this.grdList = new DevExpress.XtraGrid.GridControl(); + this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); + this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtcode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtintime = new DevExpress.XtraEditors.DateEdit(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtdept = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txtremark = new DevExpress.XtraEditors.TextEdit(); + this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl1 = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditproductionMaterialReturnDetailCode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); + this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtdept)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.tabDataList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit(); + this.tabDataDetail.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit(); + this.panelControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtintime.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtintime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdept.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); + this.xtraTabControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + this.xtraTabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditproductionMaterialReturnDetailCode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // gridColumn1 + // + this.gridColumn1.Caption = "id"; + this.gridColumn1.FieldName = "id"; + this.gridColumn1.Name = "gridColumn1"; + // + // gridColumn2 + // + this.gridColumn2.Caption = "入库单号"; + this.gridColumn2.FieldName = "code"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 201; + // + // gridColumn3 + // + this.gridColumn3.Caption = "入库日期"; + this.gridColumn3.DisplayFormat.FormatString = "G"; + this.gridColumn3.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn3.FieldName = "intime"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 201; + // + // gridColumn4 + // + this.gridColumn4.Caption = "退料单位"; + this.gridColumn4.ColumnEdit = this.repositoryItemtxtdept; + this.gridColumn4.FieldName = "dept"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.Width = 201; + // + // repositoryItemtxtdept + // + this.repositoryItemtxtdept.AutoHeight = false; + this.repositoryItemtxtdept.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtdept.DisplayMember = "Name"; + this.repositoryItemtxtdept.Name = "repositoryItemtxtdept"; + this.repositoryItemtxtdept.ValueMember = "ID"; + // + // gridColumn5 + // + this.gridColumn5.Caption = "制单人"; + this.gridColumn5.ColumnEdit = this.repositoryItemtxtcreatorId; + this.gridColumn5.FieldName = "creatorId"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 201; + // + // repositoryItemtxtcreatorId + // + this.repositoryItemtxtcreatorId.AutoHeight = false; + this.repositoryItemtxtcreatorId.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemtxtcreatorId.DisplayMember = "Name"; + this.repositoryItemtxtcreatorId.Name = "repositoryItemtxtcreatorId"; + this.repositoryItemtxtcreatorId.ValueMember = "ID"; + // + // gridColumn6 + // + this.gridColumn6.Caption = "备注"; + this.gridColumn6.FieldName = "remark"; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 201; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 34); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.tabDataList; + this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.TabIndex = 1; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabDataList, + this.tabDataDetail}); + // + // tabDataList + // + this.tabDataList.Controls.Add(this.grdList); + this.tabDataList.Name = "tabDataList"; + this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Text = "数据列表"; + // + // grdList + // + this.grdList.Dock = System.Windows.Forms.DockStyle.Fill; + this.grdList.Location = new System.Drawing.Point(0, 0); + this.grdList.MainView = this.grdListView; + this.grdList.Name = "grdList"; + this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.TabIndex = 0; + this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.grdListView}); + // + // grdListView + // + this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4, + this.gridColumn5, + this.gridColumn6}); + this.grdListView.GridControl = this.grdList; + this.grdListView.Name = "grdListView"; + this.grdListView.OptionsBehavior.Editable = false; + this.grdListView.OptionsView.ColumnAutoWidth = false; + // + // tabDataDetail + // + this.tabDataDetail.Controls.Add(this.panelControl2); + this.tabDataDetail.Name = "tabDataDetail"; + this.tabDataDetail.Size = new System.Drawing.Size(1294, 737); + this.tabDataDetail.Text = "数据编辑"; + // + // panelControl2 + // + this.panelControl2.Controls.Add(this.layoutControl1); + this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelControl2.Location = new System.Drawing.Point(0, 0); + this.panelControl2.Name = "panelControl2"; + this.panelControl2.Size = new System.Drawing.Size(1294, 737); + this.panelControl2.TabIndex = 0; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.xtraTabControl2); + this.layoutControl1.Controls.Add(this.txtid); + this.layoutControl1.Controls.Add(this.txtcode); + this.layoutControl1.Controls.Add(this.txtintime); + this.layoutControl1.Controls.Add(this.txtdept); + this.layoutControl1.Controls.Add(this.txtcreatorId); + this.layoutControl1.Controls.Add(this.txtremark); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(2, 2); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup1; + this.layoutControl1.Size = new System.Drawing.Size(1290, 733); + this.layoutControl1.TabIndex = 6; + this.layoutControl1.Text = "layoutControl1"; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem3, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem2, + this.layoutControlItem4, + this.layoutControlItem7}); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txtid; + this.layoutControlItem1.CustomizationFormText = "id"; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem1.Text = "id"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); + // + // txtid + // + this.txtid.Location = new System.Drawing.Point(63, 12); + this.txtid.Name = "txtid"; + this.txtid.Size = new System.Drawing.Size(580, 20); + this.txtid.StyleController = this.layoutControl1; + this.txtid.TabIndex = 1; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtcode; + this.layoutControlItem2.CustomizationFormText = "入库单号"; + this.layoutControlItem2.Location = new System.Drawing.Point(635, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem2.Text = "入库单号"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); + // + // txtcode + // + this.txtcode.Location = new System.Drawing.Point(698, 12); + this.txtcode.Name = "txtcode"; + this.txtcode.Size = new System.Drawing.Size(580, 20); + this.txtcode.StyleController = this.layoutControl1; + this.txtcode.TabIndex = 2; + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtintime; + this.layoutControlItem3.CustomizationFormText = "入库日期"; + this.layoutControlItem3.Location = new System.Drawing.Point(635, 24); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem3.Text = "入库日期"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); + // + // txtintime + // + this.txtintime.EditValue = null; + this.txtintime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtintime.Location = new System.Drawing.Point(698, 36); + this.txtintime.Name = "txtintime"; + this.txtintime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtintime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtintime.Properties.DisplayFormat.FormatString = "G"; + this.txtintime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtintime.Size = new System.Drawing.Size(580, 20); + this.txtintime.StyleController = this.layoutControl1; + this.txtintime.TabIndex = 3; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txtdept; + this.layoutControlItem4.CustomizationFormText = "退料单位"; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 24); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem4.Text = "退料单位"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); + // + // txtdept + // + this.txtdept.EditValue = ""; + this.txtdept.Location = new System.Drawing.Point(63, 36); + this.txtdept.Name = "txtdept"; + this.txtdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtdept.Properties.DisplayMember = "Name"; + this.txtdept.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtdept.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtdept.Properties.ValueMember = "ID"; + this.txtdept.Size = new System.Drawing.Size(580, 20); + this.txtdept.StyleController = this.layoutControl1; + this.txtdept.TabIndex = 4; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtcreatorId; + this.layoutControlItem5.CustomizationFormText = "制单人"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 48); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem5.Text = "制单人"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); + // + // txtcreatorId + // + this.txtcreatorId.EditValue = ""; + this.txtcreatorId.Location = new System.Drawing.Point(63, 60); + this.txtcreatorId.Name = "txtcreatorId"; + this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txtcreatorId.Properties.DisplayMember = "Name"; + this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; + this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; + this.txtcreatorId.Properties.ValueMember = "ID"; + this.txtcreatorId.Size = new System.Drawing.Size(1215, 20); + this.txtcreatorId.StyleController = this.layoutControl1; + this.txtcreatorId.TabIndex = 5; + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtremark; + this.layoutControlItem6.CustomizationFormText = "备注"; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem6.Text = "备注"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); + // + // txtremark + // + this.txtremark.Location = new System.Drawing.Point(63, 84); + this.txtremark.Name = "txtremark"; + this.txtremark.Size = new System.Drawing.Size(1215, 20); + this.txtremark.StyleController = this.layoutControl1; + this.txtremark.TabIndex = 6; + // + // xtraTabControl2 + // + this.xtraTabControl2.Location = new System.Drawing.Point(12, 108); + this.xtraTabControl2.Name = "xtraTabControl2"; + this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl2.Size = new System.Drawing.Size(1266, 613); + this.xtraTabControl2.TabIndex = 7; + this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1}); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.xtraTabControl2; + this.layoutControlItem7.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.Size = new System.Drawing.Size(1270, 617); + this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem7.TextVisible = false; + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gridControl1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1260, 584); + this.xtraTabPage1.Text = "入库明细"; + // + // gridControl1 + // + this.gridControl1.ContextMenuStrip = this.contextMenuStrip1; + this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl1.Location = new System.Drawing.Point(0, 0); + this.gridControl1.MainView = this.gridView1; + this.gridControl1.Name = "gridControl1"; + this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemTextEditproductionMaterialReturnDetailCode, + this.repositoryItemLookUpEditmaterialid, + this.repositoryItemLookUpEditunit, + this.repositoryItemLookUpEditwarehouse}); + this.gridControl1.Size = new System.Drawing.Size(1260, 584); + this.gridControl1.TabIndex = 1; + this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn7, + this.gridColumn8, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn14, + this.gridColumn15, + this.gridColumn16, + this.gridColumn17, + this.gridColumn18, + this.gridColumn19, + this.gridColumn20, + this.gridColumn21}); + this.gridView1.GridControl = this.gridControl1; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsBehavior.Editable = false; + this.gridView1.OptionsView.ColumnAutoWidth = false; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridColumn7 + // + this.gridColumn7.Caption = "id"; + this.gridColumn7.FieldName = "id"; + this.gridColumn7.Name = "gridColumn7"; + // + // gridColumn8 + // + this.gridColumn8.Caption = "主表id"; + this.gridColumn8.FieldName = "masterid"; + this.gridColumn8.Name = "gridColumn8"; + // + // gridColumn9 + // + this.gridColumn9.Caption = "生产退料入库单号"; + this.gridColumn9.FieldName = "masercode"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 11; + this.gridColumn9.Width = 201; + // + // gridColumn10 + // + this.gridColumn10.Caption = "生产退料入库明细单号"; + this.gridColumn10.FieldName = "detailcode"; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 12; + this.gridColumn10.Width = 201; + // + // gridColumn11 + // + this.gridColumn11.Caption = "生产退料单号"; + this.gridColumn11.FieldName = "productionMaterialReturnCode"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 1; + this.gridColumn11.Width = 201; + // + // gridColumn12 + // + this.gridColumn12.Caption = "生产退料明细单号"; + this.gridColumn12.ColumnEdit = this.repositoryItemTextEditproductionMaterialReturnDetailCode; + this.gridColumn12.FieldName = "productionMaterialReturnDetailCode"; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 0; + this.gridColumn12.Width = 201; + // + // gridColumn13 + // + this.gridColumn13.Caption = "物料"; + this.gridColumn13.ColumnEdit = this.repositoryItemLookUpEditmaterialid; + this.gridColumn13.FieldName = "materialid"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 2; + this.gridColumn13.Width = 201; + // + // gridColumn14 + // + this.gridColumn14.Caption = "物料编码"; + this.gridColumn14.FieldName = "materialcode"; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 3; + this.gridColumn14.Width = 201; + // + // gridColumn15 + // + this.gridColumn15.Caption = "规格型号"; + this.gridColumn15.FieldName = "materialspec"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 4; + this.gridColumn15.Width = 201; + // + // gridColumn16 + // + this.gridColumn16.Caption = "退料原因"; + this.gridColumn16.FieldName = "reason"; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 5; + this.gridColumn16.Width = 201; + // + // gridColumn17 + // + this.gridColumn17.Caption = "入库数量"; + this.gridColumn17.FieldName = "number"; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 6; + this.gridColumn17.Width = 201; + // + // gridColumn18 + // + this.gridColumn18.Caption = "计量单位"; + this.gridColumn18.ColumnEdit = this.repositoryItemLookUpEditunit; + this.gridColumn18.FieldName = "unit"; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 7; + this.gridColumn18.Width = 201; + // + // gridColumn19 + // + this.gridColumn19.Caption = "仓库"; + this.gridColumn19.ColumnEdit = this.repositoryItemLookUpEditwarehouse; + this.gridColumn19.FieldName = "warehouse"; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 8; + this.gridColumn19.Width = 201; + // + // gridColumn20 + // + this.gridColumn20.Caption = "工单号"; + this.gridColumn20.FieldName = "wocode"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 9; + this.gridColumn20.Width = 201; + // + // gridColumn21 + // + this.gridColumn21.Caption = "备注"; + this.gridColumn21.FieldName = "remark"; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 10; + this.gridColumn21.Width = 201; + // + // repositoryItemTextEditproductionMaterialReturnDetailCode + // + this.repositoryItemTextEditproductionMaterialReturnDetailCode.AutoHeight = false; + this.repositoryItemTextEditproductionMaterialReturnDetailCode.Name = "repositoryItemTextEditproductionMaterialReturnDetailCode"; + // + // repositoryItemLookUpEditmaterialid + // + this.repositoryItemLookUpEditmaterialid.AutoHeight = false; + this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name"; + this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid"; + this.repositoryItemLookUpEditmaterialid.NullText = ""; + this.repositoryItemLookUpEditmaterialid.ValueMember = "ID"; + // + // repositoryItemLookUpEditunit + // + this.repositoryItemLookUpEditunit.AutoHeight = false; + this.repositoryItemLookUpEditunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditunit.DisplayMember = "Name"; + this.repositoryItemLookUpEditunit.Name = "repositoryItemLookUpEditunit"; + this.repositoryItemLookUpEditunit.NullText = ""; + this.repositoryItemLookUpEditunit.ValueMember = "ID"; + // + // repositoryItemLookUpEditwarehouse + // + this.repositoryItemLookUpEditwarehouse.AutoHeight = false; + this.repositoryItemLookUpEditwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditwarehouse.DisplayMember = "Name"; + this.repositoryItemLookUpEditwarehouse.Name = "repositoryItemLookUpEditwarehouse"; + this.repositoryItemLookUpEditwarehouse.NullText = ""; + this.repositoryItemLookUpEditwarehouse.ValueMember = "ID"; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItemAdd, + this.toolStripMenuItemDel}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); + // + // toolStripMenuItemAdd + // + this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItemAdd.Text = "新增行"; + this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); + // + // toolStripMenuItemDel + // + this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; + this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuItemDel.Text = "删除行"; + this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); + // + // FrmproductMaterialInWarehouse + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1300, 800); + this.Controls.Add(this.xtraTabControl1); + this.Name = "FrmproductMaterialInWarehouse"; + this.Text = "生产退料入库单"; + this.Load += new System.EventHandler(this.FrmproductMaterialInWarehouse_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtdept)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.tabDataList.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit(); + this.tabDataDetail.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit(); + this.panelControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtintime.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtintime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdept.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); + this.xtraTabControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + this.xtraTabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditproductionMaterialReturnDetailCode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private XtraTabControl xtraTabControl1; + private XtraTabPage tabDataList; + private XtraTabPage tabDataDetail; + private DevExpress.XtraGrid.GridControl grdList; + private DevExpress.XtraGrid.Views.Grid.GridView grdListView; + private PanelControl panelControl2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtid; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtcode; + /////////////////////////////// + private DevExpress.XtraEditors.DateEdit txtintime; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtdept; + + private DevExpress.XtraEditors.LookUpEdit txtdept; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId; + + private DevExpress.XtraEditors.LookUpEdit txtcreatorId; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtremark; + + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private XtraTabControl xtraTabControl2; + private XtraTabPage xtraTabPage1; + private LayoutControlItem layoutControlItem7; + private DevExpress.XtraGrid.GridControl gridControl1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditproductionMaterialReturnDetailCode; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialid; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditunit; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel; + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.resx b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.resx new file mode 100644 index 0000000..ad53752 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionMaterialReturn.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionMaterialReturn.designer.cs index 04a00c9..02f2225 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmproductionMaterialReturn.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmproductionMaterialReturn.designer.cs @@ -234,7 +234,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1304, 743); this.tabDataList.Text = "数据列表"; // // grdList @@ -243,7 +243,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1304, 743); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -267,7 +267,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1305, 746); + this.tabDataDetail.Size = new System.Drawing.Size(1304, 743); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -276,7 +276,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1305, 746); + this.panelControl2.Size = new System.Drawing.Size(1304, 743); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -292,7 +292,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup1; - this.layoutControl1.Size = new System.Drawing.Size(1301, 742); + this.layoutControl1.Size = new System.Drawing.Size(1300, 739); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // @@ -301,7 +301,7 @@ namespace MES.Form this.xtraTabControl2.Location = new System.Drawing.Point(12, 84); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1277, 646); + this.xtraTabControl2.Size = new System.Drawing.Size(1276, 643); this.xtraTabControl2.TabIndex = 7; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -310,7 +310,7 @@ namespace MES.Form // this.xtraTabPage1.Controls.Add(this.gridControl1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1272, 620); + this.xtraTabPage1.Size = new System.Drawing.Size(1270, 614); this.xtraTabPage1.Text = "退料明细"; // // gridControl1 @@ -325,7 +325,7 @@ namespace MES.Form this.repositoryItemLookUpEditunit, this.repositoryItemLookUpEditwarehouse, this.repositoryItemTextEditpickdetailcode}); - this.gridControl1.Size = new System.Drawing.Size(1272, 620); + this.gridControl1.Size = new System.Drawing.Size(1270, 614); this.gridControl1.TabIndex = 1; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -336,19 +336,19 @@ namespace MES.Form this.toolStripMenuItemAdd, this.toolStripMenuItemDel}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70); // // toolStripMenuItemAdd // this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd"; - this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemAdd.Text = "新增行"; this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click); // // toolStripMenuItemDel // this.toolStripMenuItemDel.Name = "toolStripMenuItemDel"; - this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22); + this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItemDel.Text = "删除行"; this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click); // @@ -548,13 +548,13 @@ namespace MES.Form // this.txtid.Location = new System.Drawing.Point(63, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(585, 20); + this.txtid.Size = new System.Drawing.Size(584, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // // txtcode // - this.txtcode.Location = new System.Drawing.Point(703, 12); + this.txtcode.Location = new System.Drawing.Point(702, 12); this.txtcode.Name = "txtcode"; this.txtcode.Size = new System.Drawing.Size(586, 20); this.txtcode.StyleController = this.layoutControl1; @@ -564,7 +564,7 @@ namespace MES.Form // this.txtreturntime.EditValue = null; this.txtreturntime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtreturntime.Location = new System.Drawing.Point(703, 36); + this.txtreturntime.Location = new System.Drawing.Point(702, 36); this.txtreturntime.Name = "txtreturntime"; this.txtreturntime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -587,7 +587,7 @@ namespace MES.Form this.txtreturndept.Properties.DisplayMember = "Name"; this.txtreturndept.Properties.TreeList = this.txtreturndeptTreeList; this.txtreturndept.Properties.ValueMember = "ID"; - this.txtreturndept.Size = new System.Drawing.Size(585, 20); + this.txtreturndept.Size = new System.Drawing.Size(584, 20); this.txtreturndept.StyleController = this.layoutControl1; this.txtreturndept.TabIndex = 4; // @@ -611,7 +611,7 @@ namespace MES.Form this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtcreatorId.Properties.ValueMember = "ID"; - this.txtcreatorId.Size = new System.Drawing.Size(585, 20); + this.txtcreatorId.Size = new System.Drawing.Size(584, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 5; // @@ -619,7 +619,7 @@ namespace MES.Form // this.txtcreateTime.EditValue = null; this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtcreateTime.Location = new System.Drawing.Point(703, 60); + this.txtcreateTime.Location = new System.Drawing.Point(702, 60); this.txtcreateTime.Name = "txtcreateTime"; this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -645,7 +645,7 @@ namespace MES.Form this.layoutControlItem6, this.layoutControlItem7}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(1301, 742); + this.layoutControlGroup1.Size = new System.Drawing.Size(1300, 739); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -654,7 +654,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "id"; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(639, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); // @@ -662,7 +662,7 @@ namespace MES.Form // this.layoutControlItem3.Control = this.txtreturntime; this.layoutControlItem3.CustomizationFormText = "退料日期"; - this.layoutControlItem3.Location = new System.Drawing.Point(640, 24); + this.layoutControlItem3.Location = new System.Drawing.Point(639, 24); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.Size = new System.Drawing.Size(641, 24); this.layoutControlItem3.Text = "退料日期"; @@ -674,7 +674,7 @@ namespace MES.Form this.layoutControlItem5.CustomizationFormText = "制单人"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 48); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(639, 24); this.layoutControlItem5.Text = "制单人"; this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); // @@ -682,7 +682,7 @@ namespace MES.Form // this.layoutControlItem2.Control = this.txtcode; this.layoutControlItem2.CustomizationFormText = "退料单号"; - this.layoutControlItem2.Location = new System.Drawing.Point(640, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(639, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.Size = new System.Drawing.Size(641, 24); this.layoutControlItem2.Text = "退料单号"; @@ -694,7 +694,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "退料单位"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 24); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(640, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(639, 24); this.layoutControlItem4.Text = "退料单位"; this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); // @@ -702,7 +702,7 @@ namespace MES.Form // this.layoutControlItem6.Control = this.txtcreateTime; this.layoutControlItem6.CustomizationFormText = "制单日期"; - this.layoutControlItem6.Location = new System.Drawing.Point(640, 48); + this.layoutControlItem6.Location = new System.Drawing.Point(639, 48); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.Size = new System.Drawing.Size(641, 24); this.layoutControlItem6.Text = "制单日期"; @@ -713,7 +713,7 @@ namespace MES.Form this.layoutControlItem7.Control = this.xtraTabControl2; this.layoutControlItem7.Location = new System.Drawing.Point(0, 72); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(1281, 650); + this.layoutControlItem7.Size = new System.Drawing.Size(1280, 647); this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; // diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs index 80e6738..b20ae69 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs @@ -96,7 +96,7 @@ namespace MES.Form // txtwordordercode.Focus(); // return false; //} - //if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString())) + //if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString())) //{ // "销售单号不能为空".ShowWarning(); // txtsalecode.Focus(); diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj index 21159da..0451949 100644 --- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj +++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj @@ -158,6 +158,8 @@ + + @@ -258,6 +260,12 @@ FrmproductionRequisition.cs + + Form + + + FrmproductMaterialInWarehouse.cs + Form @@ -507,6 +515,9 @@ FrmproductionRequisition.cs + + FrmproductMaterialInWarehouse.cs + FrmproductMaterialOutWarehouse.cs