From de1850438cd83a27bb00b7e960e169603572c3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=AF=20=E7=8E=8B?= <648428741@qq.com> Date: Wed, 7 Jul 2021 08:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WinformGeneralDeveloperFrame/v16/.suo | Bin 622592 -> 528896 bytes DB/script.sql | Bin 7494116 -> 7598490 bytes WinformGeneralDeveloperFrame/DB/MESDB.cs | 4 + .../productMaterialInWarehouseDetailInfo.cs | 61 ++ .../Entity/productMaterialInWarehouseInfo.cs | 34 + .../Form/FrmbuyerInWarehouse.designer.cs | 48 +- .../Form/FrmbuyerOutWarehouse.designer.cs | 102 +-- .../Form/FrmproductMaterialInWarehouse.cs | 300 +++++++ .../FrmproductMaterialInWarehouse.designer.cs | 801 ++++++++++++++++++ .../Form/FrmproductMaterialInWarehouse.resx | 123 +++ .../FrmproductionMaterialReturn.designer.cs | 50 +- .../Form/Frmworkorder.cs | 2 +- .../WinformGeneralDeveloperFrame.csproj | 11 + 13 files changed, 1435 insertions(+), 101 deletions(-) create mode 100644 WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseDetailInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Entity/productMaterialInWarehouseInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.designer.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmproductMaterialInWarehouse.resx diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index 5ecc6a0508535c7fbd52adeb46bc4703b09fc24f..2fd8af165ce1cf6317e14ae341ee467df083ec99 100644 GIT binary patch delta 10680 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 delta 28423 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 O1MdmGf%iPg_y0dRz-eXx delta 2179 zcmaJ>U2GIp7~R|5Zil6;g2gQk!OE#7Q(kD*i+vVc~&T6xsm6*Z^5x8Xp?t?1Dbc^yMb^e&^hC zzMp$L?_6=;HGXl&_3`B{#WmA4$2IT&wfxJz&$I2$5BJ>>$+gVS_0o;TPdNv3cxt+z zUoI|l02`_4XFU!vi<&EvNiEmtEp70Mt^^D4%he_J=zbBN7Yi7}i?h5A0Io03=OaUn zJp6tK*B5w>xWhbB>o=6TVYdV2?CL}|mo^mehwB{@=r^Pdc@7Ee;e#mVx1zFfZ&Qzx z1dnVD7>8O8*}CSBKKauK#(vAO^Op{al+GmM{(DhJx=4Pt*gc{1TK^xemukPk%U zQk&O^?5p;Q=oMDLPaLx?wI%x?4an!mFE;VQZIy=h=|S6B$RID=U{ejPD8P7!^oQvB zf%&+yUEvq ztBct0Jo%Soj0{P(iW!8FdbDJWU5Oq?m66@H^OcDT?Ok`^+;O&Itm6eodtx#_%^Hss z%3^nR%x6Z%v2I5<10oWNN#eqI<}*ivtjM;AY3U3wXciT)za8xjh`~wLOytFy#Q6}5 z^7^IaJi0ev`W1Fy6p}K-auEM;mvpp~_pV?1NF9ScHJNJ;e5ng3)^|OsbTf z8AUi;r}{*2GW*)BsbC?;o(>3oK=qkB=Ci1+;NiYKVsHX0N!(QngeB=Sd&4Zi>^fvx zmHgKBlE*cU*D=ZbXc?=wHS?d48DGf?ZSPM%qSksAG<#OD*%LG0sHrEIXJ+Ob5Zyho z5Z8{Cn1k2YI+oaJS-q8Hx{`UB!tc)Vik_ZWab`=%BDe`2LN>um$RS9CF$5oBEFqUL zj^HOeMUV+k69R6XaD})NdY{DEuC1EaM9$`MAim-sNknk!YOjtyy zCM+f_AuJ`lMp#CuAuK1XAk-4-2rCKogjIwHVKt$F@H(N9@CKoYu!hh~SW8$(SWf_9 z17RcKO+u8giLjaQ7GVovE1`w3jj)~YHlda94q*pjCn0tY>gEd3+!U)4)<_0LjV~)K zlrPkPnZH~;;}_vt)g$(LV$;OX8nq$4l#5iYI?+7XtVUEZq-0eJ8LDiy+*F5|kbhRC zG1ab0*DTjuSD9d6u?3>zf$A5jn`%-hD>TWB52}fDZ@psnjaW!@469pA`JQ^xC&C)@ znlo;z&2ICXl={!YjIG3cE#EvpSJP`mvb()obY0RkzA+@3;UBeolSQhv-DB#Wwwel| z$-7RAcuiZ2h<~Pa3OVp(Yj!PdYdj#Lc^0xa)z({*A&Ka<_LKWNTH4KymR$uO{|gKo Bm3ROE 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