From 1ad9dae18b806531a09a3a04373de358930d811f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=AF=20=E7=8E=8B?= <648428741@qq.com> Date: Mon, 19 Jul 2021 18:00:53 +0800 Subject: [PATCH] 123 --- .vs/WinformGeneralDeveloperFrame/v16/.suo | Bin 651776 -> 593920 bytes DB/script.sql | Bin 7598490 -> 7656224 bytes WinformGeneralDeveloperFrame/DB/MESDB.cs | 3 + .../Entity/buyerreturnInfo.cs | 1 + .../Entity/productInfo.cs | 7 +- .../Entity/saleInWarehouseDetailInfo.cs | 62 + .../Entity/saleInWarehouseInfo.cs | 34 + .../Form/FrmfinishProductInInWarehouse.cs | 31 +- .../FrmfinishProductInInWarehouse.designer.cs | 1 + .../Form/Frmproduct.cs | 51 +- .../Form/Frmproduct.designer.cs | 1001 +++++++++++++++-- .../Form/FrmsaleInWarehouse.cs | 333 ++++++ .../Form/FrmsaleInWarehouse.designer.cs | 831 ++++++++++++++ .../Form/FrmsaleInWarehouse.resx | 123 ++ .../Form/FrmsaleOutWarehouse.cs | 30 +- .../Form/FrmsaleOutWarehouse.designer.cs | 148 +-- .../WinformGeneralDeveloperFrame.csproj | 11 + 17 files changed, 2497 insertions(+), 170 deletions(-) create mode 100644 WinformGeneralDeveloperFrame/Entity/saleInWarehouseDetailInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Entity/saleInWarehouseInfo.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.designer.cs create mode 100644 WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.resx diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index af2e6f69500e1c08e550f20b0c7a5713f65f2325..11a3148439f421152daa6f13a2450a3c73630d89 100644 GIT binary patch delta 37348 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 z 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 delta 2799 zcmaLXe@s}C?=eaeTx0Yq#QQO`7nkD(j201&dE@dwOqa|5zO$IE#vZK zl0TeP2xZ|JlX8Td=QLTJhR?GYes!pb_l*SFEqOe!(joi>cg?zh@F-HgV-Bu{6}4L& z+`ZB!&aA34$;@3PeY|9?hs#Y3TrIb@A57=+d^gXmm?z};QO3KgVtGrY_wlWZOOI~5?SUIirjEs|mOCMv39pZj+Vw z$x^!L=}0y1Mn8EiQqIGJ$x{#8MCvCMCRzA!t5dXn<~7Nr50iJAl=Nu1-slTleQybs z#Y+x8u*1iLf5{Yxm+blvvHy$9CjIB~am3<6c|^NO2nD>-k_U-0#kP}$W<|-zU83*n zT$Al1lZ$#6NXd_C)>}|^HqN94q%M*o#f}SREz-x``g_Dyi@9&HkigAjJw7Q7`W-A-cl)4RNrnl2&RNYc7@#Q zCENJ@4c@hh!jYr@7Z@srN3D}dX_D-u&R}VepLBiAL9N5Zwi&!N4TBkW<4ITOT63MO zmCRu=2Ky#fz&ALpIU#HwCHC#(t!v@Tjpn+1=cA}hB805xBWGA_+ zSehObtL1EDam=8XdL>$66}xI$#c(wX*E}_>z@UopB*UASPs>qRl)?HFpRz5?NqAL7 zT6Y8M%-57&HX2I!WIDCjpV{516b!HyQom&>q#UwDQf>=7P5uNahYId6Hz|KITgOed zoctT4a6EXZjk7$$C)G*Kl2ky-Exp29EIF5Y&NJV`&q^}&{lf~m_f)brFk3nmP3282 zThEY6!F^V{Cg)2-;WYLE^HHEgvXWXPCF)ahdGFtLEoHqlIz>Ob4%%^~4wdPr_*$b> zvOCZyfd#BE2|^(ZY%m$ZVG7vc32?wvkRbvhVH!B$Nr-}Ih=Hdd7N$cS%m5d}gBubc z5oSUXJPpY(3q0@)q`%=71OGLOMJL^Wb^#K?Y>Pe8_?YkPQnV2NpptEQTep z6!PE&$cJUH9A1PKuo4R3B`AcK!4IooHM{~v@G2C;8qj;Y7S=&2l)-CI4(maI4Nw6a zp%SX#b$A1+VH4EAn@|gzp-u}l)+@6TC%GuFPp#E_d)1L?+Q8@P)-WyeEA@n|C-73|_i7n+ hHQ^csFRJ!?yW saleOutWarehouseInfo { get; set; } public virtual DbSet saleOutWarehouseDetailInfo { set; get; } + public virtual DbSet saleInWarehouseInfo { get; set; } + + public virtual DbSet saleInWarehouseDetailInfo { set; get; } } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/buyerreturnInfo.cs b/WinformGeneralDeveloperFrame/Entity/buyerreturnInfo.cs index b1acfe1..6c3d63d 100644 --- a/WinformGeneralDeveloperFrame/Entity/buyerreturnInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/buyerreturnInfo.cs @@ -1,3 +1,4 @@ + using WinformGeneralDeveloperFrame.Commons; namespace MES.Entity diff --git a/WinformGeneralDeveloperFrame/Entity/productInfo.cs b/WinformGeneralDeveloperFrame/Entity/productInfo.cs index 86e19de..f2ad023 100644 --- a/WinformGeneralDeveloperFrame/Entity/productInfo.cs +++ b/WinformGeneralDeveloperFrame/Entity/productInfo.cs @@ -37,7 +37,12 @@ namespace MES.Entity public string productcode{set;get;} ///库存 [ModelBindControl("txtstocknumber")] - public decimal stocknumber{set;get;} + public decimal stocknumber + { + // ReSharper disable once ArrangeAccessorOwnerBody + set { } + get {return productinnumber + customerreturnnumber - saleoutnumber; } + } ///期初数量 [ModelBindControl("txtstartnumber")] public decimal startnumber{set;get;} diff --git a/WinformGeneralDeveloperFrame/Entity/saleInWarehouseDetailInfo.cs b/WinformGeneralDeveloperFrame/Entity/saleInWarehouseDetailInfo.cs new file mode 100644 index 0000000..460744c --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/saleInWarehouseDetailInfo.cs @@ -0,0 +1,62 @@ +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("saleInWarehouseDetail")] + public partial class saleInWarehouseDetailInfo + { + ///id + [ModelBindControl("txtid")] + public int id{set;get;} + + ///id + [ModelBindControl("txtmasterid")] + public int masterid { set; get; } + ///销售出库单号 + [ModelBindControl("txtreturnsalecode")] + public string returnsalecode{set;get;} + ///销售出库明细单号 + [ModelBindControl("txtreturnsaledetailcode")] + public string returnsaledetailcode{set;get;} + ///销售退货入库单号 + [ModelBindControl("txtmastercode")] + public string mastercode{set;get;} + ///销售退货入库明细单号 + [ModelBindControl("txtdetailcode")] + public string detailcode{set;get;} + ///销售单号 + [ModelBindControl("txtsalecode")] + public string salecode{set;get;} + ///销售明细单号 + [ModelBindControl("txtsaledetailcode")] + public string saledetailcode{set;get;} + ///产品 + [ModelBindControl("txtproductID")] + public int productID{set;get;} + ///产品编号 + [ModelBindControl("txtproductcode")] + public string productcode{set;get;} + ///规格型号 + [ModelBindControl("txtspec")] + public string spec{set;get;} + ///入库数量 + [ModelBindControl("txtnumber")] + public decimal number{set;get;} + ///计量单位 + [ModelBindControl("txtunit")] + public int unit{set;get;} + ///warehouse + [ModelBindControl("txtwarehouse")] + public int warehouse{set;get;} + ///备注 + [ModelBindControl("txtremark")] + public string remark{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Entity/saleInWarehouseInfo.cs b/WinformGeneralDeveloperFrame/Entity/saleInWarehouseInfo.cs new file mode 100644 index 0000000..b6d4f57 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Entity/saleInWarehouseInfo.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("saleInWarehouse")] + public partial class saleInWarehouseInfo + { + ///id + [ModelBindControl("txtid")] + public int id{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("txtcreateTime")] + public DateTime createTime{set;get;}=DateTime.Now; + ///入库单号 + [ModelBindControl("txtcode")] + public string code{set;get;} + + } +} \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.cs b/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.cs index a356105..969ae69 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.cs @@ -12,6 +12,8 @@ using DevExpress.XtraLayout; using MES.Entity; using System.Data.Entity.Migrations; using System.Data.Entity; +using CCWin.SkinClass; + namespace MES.Form { public partial class FrmfinishProductInInWarehouse : FrmBaseForm @@ -169,6 +171,9 @@ namespace MES.Form a.masterid = info.id; a.mastercode = info.code; a.detailcode = codedetail; + //更新产品入库数量 + productInfo product = db.productInfo.Find(a.productid); + product.productinnumber += a.number; }); db.finishProductInInWarehouseDetailInfo.AddRange(detaiListAdd); db.SaveChanges(); @@ -190,6 +195,8 @@ namespace MES.Form num++; string codedetail = code + num; a.detailcode = codedetail; + productInfo product = db.productInfo.Find(a.productid); + product.productinnumber += a.number; }); db.finishProductInInWarehouseDetailInfo.AddRange(detaiListAdd); @@ -198,13 +205,28 @@ namespace MES.Form detaiListEdit.ForEach((a) => { - //a.buyercode = info.buyercode; + decimal oldnumber = + GetDataTableUtils + .SqlTableBySql( + $"select number from finishProductInInWarehouseDetail where id={a.id}") + .Rows[0]["number"].ToDecimal(0); + //a.buyercode = info.buyercode; + productInfo product = db.productInfo.Find(a.productid); + product.productinnumber += a.number; + product.productinnumber -= oldnumber; + db.Entry(a).State = EntityState.Modified; + }); List detaiListDel = dic["Del"]; - detaiListDel.ForEach((a) => { db.Entry(a).State = EntityState.Deleted; }); + detaiListDel.ForEach((a) => + { + productInfo product = db.productInfo.Find(a.productid); + product.productinnumber -= a.number; + db.Entry(a).State = EntityState.Deleted; + }); db.SaveChanges(); } } @@ -247,6 +269,11 @@ namespace MES.Form db.Entry(info).State=EntityState.Deleted; List list = db.finishProductInInWarehouseDetailInfo .Where(p => p.masterid == info.id).ToList(); + foreach (var item in list) + { + productInfo product = db.productInfo.Find(item.productid); + product.productinnumber -= item.number; + } db.finishProductInInWarehouseDetailInfo.RemoveRange(list); gridControl1.DataSource = null; db.SaveChanges(); diff --git a/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.designer.cs index 182ad67..698d21a 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmfinishProductInInWarehouse.designer.cs @@ -251,6 +251,7 @@ namespace MES.Form this.grdListView.Name = "grdListView"; this.grdListView.OptionsBehavior.Editable = false; this.grdListView.OptionsView.ColumnAutoWidth = false; + this.grdListView.OptionsView.ShowGroupPanel = false; // // tabDataDetail // diff --git a/WinformGeneralDeveloperFrame/Form/Frmproduct.cs b/WinformGeneralDeveloperFrame/Form/Frmproduct.cs index fb0456d..8a449f8 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmproduct.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmproduct.cs @@ -37,25 +37,36 @@ namespace ERP.Form { + txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); + repositoryItemtxtcreatorId.DataSource = GetDataTableUtils.SqlTable("用户"); + txteditorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); + repositoryItemtxteditorId.DataSource = GetDataTableUtils.SqlTable("用户"); + txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位"); + repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位"); + txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库"); + repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库"); + txtproducttype.Properties.DataSource = GetDataTableUtils.SqlTable("产品类别"); + repositoryItemtxtproducttype.DataSource= GetDataTableUtils.SqlTable("产品类别"); - txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); - repositoryItemtxtcreatorId.DataSource = GetDataTableUtils.SqlTable("用户"); - txteditorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); - repositoryItemtxteditorId.DataSource = GetDataTableUtils.SqlTable("用户"); - txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位"); - repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位"); - txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库"); - repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库"); - txtproducttype.Properties.DataSource = GetDataTableUtils.SqlTable("产品类别"); - repositoryItemtxtproducttype.DataSource= GetDataTableUtils.SqlTable("产品类别"); + repositoryItemLookUpEditproductid.DataSource = GetDataTableUtils.SqlTable("产品"); + repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库"); + gridColumn45.ColumnEdit = repositoryItemLookUpEditproductid; + gridColumn34.ColumnEdit = repositoryItemtxtunit; + gridColumn35.ColumnEdit = repositoryItemtxtwarehouse; + gridColumn59.ColumnEdit = repositoryItemLookUpEditproductid; + gridColumn49.ColumnEdit = repositoryItemtxtunit; + gridColumn50.ColumnEdit = repositoryItemtxtwarehouse; - } - /// + gridColumn63.ColumnEdit = repositoryItemtxtunit; + gridColumn64.ColumnEdit = repositoryItemtxtwarehouse; + + } + /// /// 搜索字段 /// /// - private void InitSearchDicData() + private void InitSearchDicData() { fieldDictionary.Add("产品名称","productname"); fieldDictionary.Add("仓库","warehouse"); @@ -254,5 +265,17 @@ namespace ERP.Form } } } - } + + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + productInfo info = grdListView.GetFocusedRow() as productInfo; + using (var db=new MESDB()) + { + gridControl1.DataSource = + db.finishProductInInWarehouseDetailInfo.Where(p => p.productid == info.id).ToList(); + gridControl2.DataSource= db.saleOutWarehouseDetailInfo.Where(p => p.productid == info.id).ToList(); + gridControl3.DataSource=db.saleInWarehouseDetailInfo.Where(p => p.productID == info.id).ToList(); + } + } + } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/Frmproduct.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmproduct.designer.cs index 96ca0ed..ed711d3 100644 --- a/WinformGeneralDeveloperFrame/Form/Frmproduct.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/Frmproduct.designer.cs @@ -65,6 +65,73 @@ namespace ERP.Form this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage(); this.panelControl2 = new DevExpress.XtraEditors.PanelControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl1 = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditcompletionProductInWarehouseDetailCode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditproductid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl2 = new DevExpress.XtraGrid.GridControl(); + this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditsaledeliverdetailcode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); + this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.gridControl3 = new DevExpress.XtraGrid.GridControl(); + this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditreturnsaledetailcode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); + this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn(); this.txtid = new DevExpress.XtraEditors.TextEdit(); this.txtproductname = new DevExpress.XtraEditors.TextEdit(); this.txtspec = new DevExpress.XtraEditors.TextEdit(); @@ -106,7 +173,7 @@ namespace ERP.Form this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproducttype)).BeginInit(); @@ -122,6 +189,29 @@ namespace ERP.Form this.panelControl2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); + this.xtraTabControl2.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditcompletionProductInWarehouseDetailCode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); + this.xtraTabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsaledeliverdetailcode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit3)).BeginInit(); + this.xtraTabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gridControl3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditreturnsaledetailcode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).BeginInit(); @@ -165,7 +255,7 @@ namespace ERP.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); this.SuspendLayout(); // // gridColumn1 @@ -405,7 +495,7 @@ namespace ERP.Form 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(787, 549); + this.xtraTabControl1.Size = new System.Drawing.Size(1129, 625); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -415,7 +505,7 @@ namespace ERP.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(771, 514); + this.tabDataList.Size = new System.Drawing.Size(1123, 596); this.tabDataList.Text = "数据列表"; // // grdList @@ -424,7 +514,7 @@ namespace ERP.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(771, 514); + this.grdList.Size = new System.Drawing.Size(1123, 596); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -461,7 +551,7 @@ namespace ERP.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(782, 523); + this.tabDataDetail.Size = new System.Drawing.Size(1123, 596); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -470,11 +560,12 @@ namespace ERP.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(782, 523); + this.panelControl2.Size = new System.Drawing.Size(1123, 596); this.panelControl2.TabIndex = 0; // // layoutControl1 // + this.layoutControl1.Controls.Add(this.xtraTabControl2); this.layoutControl1.Controls.Add(this.txtid); this.layoutControl1.Controls.Add(this.txtproductname); this.layoutControl1.Controls.Add(this.txtspec); @@ -499,15 +590,680 @@ namespace ERP.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(778, 519); + this.layoutControl1.Size = new System.Drawing.Size(1119, 592); this.layoutControl1.TabIndex = 6; this.layoutControl1.Text = "layoutControl1"; // + // xtraTabControl2 + // + this.xtraTabControl2.Location = new System.Drawing.Point(12, 276); + this.xtraTabControl2.Name = "xtraTabControl2"; + this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl2.Size = new System.Drawing.Size(1095, 304); + this.xtraTabControl2.TabIndex = 21; + this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2, + this.xtraTabPage3}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gridControl1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1089, 275); + this.xtraTabPage1.Text = "生产入库"; + // + // gridControl1 + // + 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.repositoryItemTextEditcompletionProductInWarehouseDetailCode, + this.repositoryItemLookUpEditproductid, + this.repositoryItemLookUpEditunit, + this.repositoryItemLookUpEditwarehouse}); + this.gridControl1.Size = new System.Drawing.Size(1089, 275); + this.gridControl1.TabIndex = 2; + this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn21, + this.gridColumn22, + this.gridColumn23, + this.gridColumn24, + this.gridColumn25, + this.gridColumn26, + this.gridColumn27, + this.gridColumn28, + this.gridColumn29, + this.gridColumn30, + this.gridColumn31, + this.gridColumn32, + this.gridColumn33, + this.gridColumn34, + this.gridColumn35, + this.gridColumn36}); + this.gridView1.GridControl = this.gridControl1; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsBehavior.Editable = false; + this.gridView1.OptionsView.ColumnAutoWidth = false; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridColumn21 + // + this.gridColumn21.Caption = "id"; + this.gridColumn21.FieldName = "id"; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Width = 201; + // + // gridColumn22 + // + this.gridColumn22.Caption = "主表id"; + this.gridColumn22.FieldName = "masterid"; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Width = 201; + // + // gridColumn23 + // + this.gridColumn23.Caption = "生产成品入库单号"; + this.gridColumn23.FieldName = "mastercode"; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 11; + this.gridColumn23.Width = 201; + // + // gridColumn24 + // + this.gridColumn24.Caption = "完工成品入库单号"; + this.gridColumn24.FieldName = "completionProductInWarehouseCode"; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Visible = true; + this.gridColumn24.VisibleIndex = 12; + this.gridColumn24.Width = 201; + // + // gridColumn25 + // + this.gridColumn25.Caption = "完工成品入库明细单号"; + this.gridColumn25.ColumnEdit = this.repositoryItemTextEditcompletionProductInWarehouseDetailCode; + this.gridColumn25.FieldName = "completionProductInWarehouseDetailCode"; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 13; + this.gridColumn25.Width = 201; + // + // repositoryItemTextEditcompletionProductInWarehouseDetailCode + // + this.repositoryItemTextEditcompletionProductInWarehouseDetailCode.AutoHeight = false; + this.repositoryItemTextEditcompletionProductInWarehouseDetailCode.Name = "repositoryItemTextEditcompletionProductInWarehouseDetailCode"; + // + // gridColumn26 + // + this.gridColumn26.Caption = "生产成品入库明细单号"; + this.gridColumn26.FieldName = "detailcode"; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 0; + this.gridColumn26.Width = 201; + // + // gridColumn27 + // + this.gridColumn27.Caption = "工单号"; + this.gridColumn27.FieldName = "wocode"; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 8; + this.gridColumn27.Width = 201; + // + // gridColumn28 + // + this.gridColumn28.Caption = "销售单号"; + this.gridColumn28.FieldName = "salecode"; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 9; + this.gridColumn28.Width = 201; + // + // gridColumn29 + // + this.gridColumn29.Caption = "销售明细单号"; + this.gridColumn29.FieldName = "saledetailcode"; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 10; + this.gridColumn29.Width = 201; + // + // gridColumn30 + // + this.gridColumn30.Caption = "产品"; + this.gridColumn30.ColumnEdit = this.repositoryItemLookUpEditproductid; + this.gridColumn30.FieldName = "productid"; + this.gridColumn30.Name = "gridColumn30"; + this.gridColumn30.Visible = true; + this.gridColumn30.VisibleIndex = 1; + this.gridColumn30.Width = 201; + // + // repositoryItemLookUpEditproductid + // + this.repositoryItemLookUpEditproductid.AutoHeight = false; + this.repositoryItemLookUpEditproductid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditproductid.DisplayMember = "Name"; + this.repositoryItemLookUpEditproductid.Name = "repositoryItemLookUpEditproductid"; + this.repositoryItemLookUpEditproductid.NullText = ""; + this.repositoryItemLookUpEditproductid.ValueMember = "ID"; + // + // gridColumn31 + // + this.gridColumn31.Caption = "产品编码"; + this.gridColumn31.FieldName = "productcode"; + this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.Visible = true; + this.gridColumn31.VisibleIndex = 2; + this.gridColumn31.Width = 201; + // + // gridColumn32 + // + this.gridColumn32.Caption = "规格型号"; + this.gridColumn32.FieldName = "productspec"; + this.gridColumn32.Name = "gridColumn32"; + this.gridColumn32.Visible = true; + this.gridColumn32.VisibleIndex = 3; + this.gridColumn32.Width = 201; + // + // gridColumn33 + // + this.gridColumn33.Caption = "入库数量"; + this.gridColumn33.FieldName = "number"; + this.gridColumn33.Name = "gridColumn33"; + this.gridColumn33.Visible = true; + this.gridColumn33.VisibleIndex = 4; + this.gridColumn33.Width = 201; + // + // gridColumn34 + // + this.gridColumn34.Caption = "计量单位"; + this.gridColumn34.ColumnEdit = this.repositoryItemLookUpEditunit; + this.gridColumn34.FieldName = "unit"; + this.gridColumn34.Name = "gridColumn34"; + this.gridColumn34.Visible = true; + this.gridColumn34.VisibleIndex = 5; + this.gridColumn34.Width = 201; + // + // 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"; + // + // gridColumn35 + // + this.gridColumn35.Caption = "仓库"; + this.gridColumn35.ColumnEdit = this.repositoryItemLookUpEditwarehouse; + this.gridColumn35.FieldName = "warehouse"; + this.gridColumn35.Name = "gridColumn35"; + this.gridColumn35.Visible = true; + this.gridColumn35.VisibleIndex = 6; + this.gridColumn35.Width = 201; + // + // 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"; + // + // gridColumn36 + // + this.gridColumn36.Caption = "备注"; + this.gridColumn36.FieldName = "remark"; + this.gridColumn36.Name = "gridColumn36"; + this.gridColumn36.Visible = true; + this.gridColumn36.VisibleIndex = 7; + this.gridColumn36.Width = 201; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.gridControl2); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.Size = new System.Drawing.Size(1089, 275); + this.xtraTabPage2.Text = "销售出库"; + // + // gridControl2 + // + this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl2.Location = new System.Drawing.Point(0, 0); + this.gridControl2.MainView = this.gridView2; + this.gridControl2.Name = "gridControl2"; + this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemLookUpEdit1, + this.repositoryItemLookUpEdit2, + this.repositoryItemLookUpEdit3, + this.repositoryItemTextEditsaledeliverdetailcode}); + this.gridControl2.Size = new System.Drawing.Size(1089, 275); + this.gridControl2.TabIndex = 2; + this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView2}); + // + // gridView2 + // + this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn37, + this.gridColumn38, + this.gridColumn39, + this.gridColumn40, + this.gridColumn41, + this.gridColumn42, + this.gridColumn43, + this.gridColumn44, + this.gridColumn45, + this.gridColumn46, + this.gridColumn47, + this.gridColumn48, + this.gridColumn49, + this.gridColumn50, + this.gridColumn51}); + this.gridView2.GridControl = this.gridControl2; + this.gridView2.Name = "gridView2"; + this.gridView2.OptionsBehavior.Editable = false; + this.gridView2.OptionsView.ColumnAutoWidth = false; + this.gridView2.OptionsView.ShowGroupPanel = false; + // + // gridColumn37 + // + this.gridColumn37.Caption = "id"; + this.gridColumn37.FieldName = "id"; + this.gridColumn37.Name = "gridColumn37"; + this.gridColumn37.Width = 201; + // + // gridColumn38 + // + this.gridColumn38.Caption = "主表id"; + this.gridColumn38.FieldName = "masterid"; + this.gridColumn38.Name = "gridColumn38"; + this.gridColumn38.Width = 201; + // + // gridColumn39 + // + this.gridColumn39.Caption = "销售出库单号"; + this.gridColumn39.FieldName = "mastercode"; + this.gridColumn39.Name = "gridColumn39"; + this.gridColumn39.Visible = true; + this.gridColumn39.VisibleIndex = 11; + this.gridColumn39.Width = 201; + // + // gridColumn40 + // + this.gridColumn40.Caption = "销售出库明细单号"; + this.gridColumn40.FieldName = "detailcode"; + this.gridColumn40.Name = "gridColumn40"; + this.gridColumn40.Visible = true; + this.gridColumn40.VisibleIndex = 0; + this.gridColumn40.Width = 201; + // + // gridColumn41 + // + this.gridColumn41.Caption = "销售出货单号"; + this.gridColumn41.FieldName = "saledelivercode"; + this.gridColumn41.Name = "gridColumn41"; + this.gridColumn41.Visible = true; + this.gridColumn41.VisibleIndex = 9; + this.gridColumn41.Width = 201; + // + // gridColumn42 + // + this.gridColumn42.Caption = "销售出货明细单号"; + this.gridColumn42.ColumnEdit = this.repositoryItemTextEditsaledeliverdetailcode; + this.gridColumn42.FieldName = "saledeliverdetailcode"; + this.gridColumn42.Name = "gridColumn42"; + this.gridColumn42.Visible = true; + this.gridColumn42.VisibleIndex = 10; + this.gridColumn42.Width = 201; + // + // repositoryItemTextEditsaledeliverdetailcode + // + this.repositoryItemTextEditsaledeliverdetailcode.AutoHeight = false; + this.repositoryItemTextEditsaledeliverdetailcode.Name = "repositoryItemTextEditsaledeliverdetailcode"; + // + // gridColumn43 + // + this.gridColumn43.Caption = "销售单号"; + this.gridColumn43.FieldName = "salecode"; + this.gridColumn43.Name = "gridColumn43"; + this.gridColumn43.Visible = true; + this.gridColumn43.VisibleIndex = 11; + this.gridColumn43.Width = 201; + // + // gridColumn44 + // + this.gridColumn44.Caption = "销售明细单号"; + this.gridColumn44.FieldName = "saledetailcode"; + this.gridColumn44.Name = "gridColumn44"; + this.gridColumn44.Visible = true; + this.gridColumn44.VisibleIndex = 12; + this.gridColumn44.Width = 201; + // + // gridColumn45 + // + this.gridColumn45.Caption = "产品"; + this.gridColumn45.ColumnEdit = this.repositoryItemLookUpEdit1; + this.gridColumn45.FieldName = "productid"; + this.gridColumn45.Name = "gridColumn45"; + this.gridColumn45.Visible = true; + this.gridColumn45.VisibleIndex = 1; + this.gridColumn45.Width = 201; + // + // repositoryItemLookUpEdit1 + // + this.repositoryItemLookUpEdit1.AutoHeight = false; + this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit1.DisplayMember = "Name"; + this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1"; + this.repositoryItemLookUpEdit1.NullText = ""; + this.repositoryItemLookUpEdit1.ValueMember = "ID"; + // + // gridColumn46 + // + this.gridColumn46.Caption = "产品编号"; + this.gridColumn46.FieldName = "productcode"; + this.gridColumn46.Name = "gridColumn46"; + this.gridColumn46.Visible = true; + this.gridColumn46.VisibleIndex = 5; + this.gridColumn46.Width = 201; + // + // gridColumn47 + // + this.gridColumn47.Caption = "规格型号"; + this.gridColumn47.FieldName = "spec"; + this.gridColumn47.Name = "gridColumn47"; + this.gridColumn47.Visible = true; + this.gridColumn47.VisibleIndex = 6; + this.gridColumn47.Width = 201; + // + // gridColumn48 + // + this.gridColumn48.Caption = "出库数量"; + this.gridColumn48.FieldName = "number"; + this.gridColumn48.Name = "gridColumn48"; + this.gridColumn48.Visible = true; + this.gridColumn48.VisibleIndex = 7; + this.gridColumn48.Width = 201; + // + // gridColumn49 + // + this.gridColumn49.Caption = "计量单位"; + this.gridColumn49.ColumnEdit = this.repositoryItemLookUpEdit2; + this.gridColumn49.FieldName = "unit"; + this.gridColumn49.Name = "gridColumn49"; + this.gridColumn49.Visible = true; + this.gridColumn49.VisibleIndex = 5; + this.gridColumn49.Width = 201; + // + // repositoryItemLookUpEdit2 + // + this.repositoryItemLookUpEdit2.AutoHeight = false; + this.repositoryItemLookUpEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit2.DisplayMember = "Name"; + this.repositoryItemLookUpEdit2.Name = "repositoryItemLookUpEdit2"; + this.repositoryItemLookUpEdit2.NullText = ""; + this.repositoryItemLookUpEdit2.ValueMember = "ID"; + // + // gridColumn50 + // + this.gridColumn50.Caption = "仓库"; + this.gridColumn50.ColumnEdit = this.repositoryItemLookUpEdit3; + this.gridColumn50.FieldName = "warehouse"; + this.gridColumn50.Name = "gridColumn50"; + this.gridColumn50.Visible = true; + this.gridColumn50.VisibleIndex = 6; + this.gridColumn50.Width = 201; + // + // repositoryItemLookUpEdit3 + // + this.repositoryItemLookUpEdit3.AutoHeight = false; + this.repositoryItemLookUpEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit3.DisplayMember = "Name"; + this.repositoryItemLookUpEdit3.Name = "repositoryItemLookUpEdit3"; + this.repositoryItemLookUpEdit3.NullText = ""; + this.repositoryItemLookUpEdit3.ValueMember = "ID"; + // + // gridColumn51 + // + this.gridColumn51.Caption = "备注"; + this.gridColumn51.FieldName = "remark"; + this.gridColumn51.Name = "gridColumn51"; + this.gridColumn51.Visible = true; + this.gridColumn51.VisibleIndex = 10; + this.gridColumn51.Width = 201; + // + // xtraTabPage3 + // + this.xtraTabPage3.Controls.Add(this.gridControl3); + this.xtraTabPage3.Name = "xtraTabPage3"; + this.xtraTabPage3.Size = new System.Drawing.Size(1089, 275); + this.xtraTabPage3.Text = "客户退货"; + // + // gridControl3 + // + this.gridControl3.Dock = System.Windows.Forms.DockStyle.Fill; + this.gridControl3.Location = new System.Drawing.Point(0, 0); + this.gridControl3.MainView = this.gridView3; + this.gridControl3.Name = "gridControl3"; + this.gridControl3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repositoryItemLookUpEdit4, + this.repositoryItemLookUpEdit5, + this.repositoryItemLookUpEdit6, + this.repositoryItemTextEditreturnsaledetailcode}); + this.gridControl3.Size = new System.Drawing.Size(1089, 275); + this.gridControl3.TabIndex = 2; + this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView3}); + // + // gridView3 + // + this.gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn52, + this.gridColumn53, + this.gridColumn54, + this.gridColumn55, + this.gridColumn56, + this.gridColumn57, + this.gridColumn58, + this.gridColumn59, + this.gridColumn60, + this.gridColumn61, + this.gridColumn62, + this.gridColumn63, + this.gridColumn64, + this.gridColumn65}); + this.gridView3.GridControl = this.gridControl3; + this.gridView3.Name = "gridView3"; + this.gridView3.OptionsBehavior.Editable = false; + this.gridView3.OptionsView.ColumnAutoWidth = false; + this.gridView3.OptionsView.ShowGroupPanel = false; + // + // gridColumn52 + // + this.gridColumn52.Caption = "id"; + this.gridColumn52.FieldName = "id"; + this.gridColumn52.Name = "gridColumn52"; + this.gridColumn52.Width = 201; + // + // gridColumn53 + // + this.gridColumn53.Caption = "销售出库单号"; + this.gridColumn53.FieldName = "returnsalecode"; + this.gridColumn53.Name = "gridColumn53"; + this.gridColumn53.Visible = true; + this.gridColumn53.VisibleIndex = 10; + this.gridColumn53.Width = 201; + // + // gridColumn54 + // + this.gridColumn54.Caption = "销售出库明细单号"; + this.gridColumn54.ColumnEdit = this.repositoryItemTextEditreturnsaledetailcode; + this.gridColumn54.FieldName = "returnsaledetailcode"; + this.gridColumn54.Name = "gridColumn54"; + this.gridColumn54.Visible = true; + this.gridColumn54.VisibleIndex = 11; + this.gridColumn54.Width = 201; + // + // repositoryItemTextEditreturnsaledetailcode + // + this.repositoryItemTextEditreturnsaledetailcode.AutoHeight = false; + this.repositoryItemTextEditreturnsaledetailcode.Name = "repositoryItemTextEditreturnsaledetailcode"; + // + // gridColumn55 + // + this.gridColumn55.Caption = "销售退货入库单号"; + this.gridColumn55.FieldName = "mastercode"; + this.gridColumn55.Name = "gridColumn55"; + this.gridColumn55.Visible = true; + this.gridColumn55.VisibleIndex = 12; + this.gridColumn55.Width = 201; + // + // gridColumn56 + // + this.gridColumn56.Caption = "销售退货入库明细单号"; + this.gridColumn56.FieldName = "detailcode"; + this.gridColumn56.Name = "gridColumn56"; + this.gridColumn56.Visible = true; + this.gridColumn56.VisibleIndex = 0; + this.gridColumn56.Width = 201; + // + // gridColumn57 + // + this.gridColumn57.Caption = "销售单号"; + this.gridColumn57.FieldName = "salecode"; + this.gridColumn57.Name = "gridColumn57"; + this.gridColumn57.Visible = true; + this.gridColumn57.VisibleIndex = 10; + this.gridColumn57.Width = 201; + // + // gridColumn58 + // + this.gridColumn58.Caption = "销售明细单号"; + this.gridColumn58.FieldName = "saledetailcode"; + this.gridColumn58.Name = "gridColumn58"; + this.gridColumn58.Visible = true; + this.gridColumn58.VisibleIndex = 11; + this.gridColumn58.Width = 201; + // + // gridColumn59 + // + this.gridColumn59.Caption = "产品"; + this.gridColumn59.ColumnEdit = this.repositoryItemLookUpEdit4; + this.gridColumn59.FieldName = "productID"; + this.gridColumn59.Name = "gridColumn59"; + this.gridColumn59.Visible = true; + this.gridColumn59.VisibleIndex = 1; + this.gridColumn59.Width = 201; + // + // repositoryItemLookUpEdit4 + // + this.repositoryItemLookUpEdit4.AutoHeight = false; + this.repositoryItemLookUpEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit4.DisplayMember = "Name"; + this.repositoryItemLookUpEdit4.Name = "repositoryItemLookUpEdit4"; + this.repositoryItemLookUpEdit4.NullText = ""; + this.repositoryItemLookUpEdit4.ValueMember = "ID"; + // + // gridColumn60 + // + this.gridColumn60.Caption = "产品编号"; + this.gridColumn60.FieldName = "productcode"; + this.gridColumn60.Name = "gridColumn60"; + this.gridColumn60.Visible = true; + this.gridColumn60.VisibleIndex = 3; + this.gridColumn60.Width = 201; + // + // gridColumn61 + // + this.gridColumn61.Caption = "规格型号"; + this.gridColumn61.FieldName = "spec"; + this.gridColumn61.Name = "gridColumn61"; + this.gridColumn61.Visible = true; + this.gridColumn61.VisibleIndex = 4; + this.gridColumn61.Width = 201; + // + // gridColumn62 + // + this.gridColumn62.Caption = "入库数量"; + this.gridColumn62.FieldName = "number"; + this.gridColumn62.Name = "gridColumn62"; + this.gridColumn62.Visible = true; + this.gridColumn62.VisibleIndex = 5; + this.gridColumn62.Width = 201; + // + // gridColumn63 + // + this.gridColumn63.Caption = "计量单位"; + this.gridColumn63.ColumnEdit = this.repositoryItemLookUpEdit5; + this.gridColumn63.FieldName = "unit"; + this.gridColumn63.Name = "gridColumn63"; + this.gridColumn63.Visible = true; + this.gridColumn63.VisibleIndex = 5; + this.gridColumn63.Width = 201; + // + // repositoryItemLookUpEdit5 + // + this.repositoryItemLookUpEdit5.AutoHeight = false; + this.repositoryItemLookUpEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit5.DisplayMember = "Name"; + this.repositoryItemLookUpEdit5.Name = "repositoryItemLookUpEdit5"; + this.repositoryItemLookUpEdit5.NullText = ""; + this.repositoryItemLookUpEdit5.ValueMember = "ID"; + // + // gridColumn64 + // + this.gridColumn64.Caption = "仓库"; + this.gridColumn64.ColumnEdit = this.repositoryItemLookUpEdit6; + this.gridColumn64.FieldName = "warehouse"; + this.gridColumn64.Name = "gridColumn64"; + this.gridColumn64.Visible = true; + this.gridColumn64.VisibleIndex = 6; + this.gridColumn64.Width = 201; + // + // repositoryItemLookUpEdit6 + // + this.repositoryItemLookUpEdit6.AutoHeight = false; + this.repositoryItemLookUpEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEdit6.DisplayMember = "Name"; + this.repositoryItemLookUpEdit6.Name = "repositoryItemLookUpEdit6"; + this.repositoryItemLookUpEdit6.NullText = ""; + this.repositoryItemLookUpEdit6.ValueMember = "ID"; + // + // gridColumn65 + // + this.gridColumn65.Caption = "备注"; + this.gridColumn65.FieldName = "remark"; + this.gridColumn65.Name = "gridColumn65"; + this.gridColumn65.Visible = true; + this.gridColumn65.VisibleIndex = 8; + this.gridColumn65.Width = 201; + // // txtid // this.txtid.Location = new System.Drawing.Point(87, 12); this.txtid.Name = "txtid"; - this.txtid.Size = new System.Drawing.Size(679, 20); + this.txtid.Size = new System.Drawing.Size(1020, 20); this.txtid.StyleController = this.layoutControl1; this.txtid.TabIndex = 1; // @@ -515,7 +1271,7 @@ namespace ERP.Form // this.txtproductname.Location = new System.Drawing.Point(87, 36); this.txtproductname.Name = "txtproductname"; - this.txtproductname.Size = new System.Drawing.Size(299, 20); + this.txtproductname.Size = new System.Drawing.Size(468, 20); this.txtproductname.StyleController = this.layoutControl1; this.txtproductname.TabIndex = 2; // @@ -523,7 +1279,7 @@ namespace ERP.Form // this.txtspec.Location = new System.Drawing.Point(87, 60); this.txtspec.Name = "txtspec"; - this.txtspec.Size = new System.Drawing.Size(299, 20); + this.txtspec.Size = new System.Drawing.Size(468, 20); this.txtspec.StyleController = this.layoutControl1; this.txtspec.TabIndex = 3; // @@ -531,14 +1287,14 @@ namespace ERP.Form // this.txtdefaultprice.Location = new System.Drawing.Point(87, 84); this.txtdefaultprice.Name = "txtdefaultprice"; - this.txtdefaultprice.Size = new System.Drawing.Size(299, 20); + this.txtdefaultprice.Size = new System.Drawing.Size(468, 20); this.txtdefaultprice.StyleController = this.layoutControl1; this.txtdefaultprice.TabIndex = 4; // // txtunit // this.txtunit.EditValue = ""; - this.txtunit.Location = new System.Drawing.Point(465, 84); + this.txtunit.Location = new System.Drawing.Point(634, 84); this.txtunit.Name = "txtunit"; this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -546,7 +1302,7 @@ namespace ERP.Form this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtunit.Properties.ValueMember = "ID"; - this.txtunit.Size = new System.Drawing.Size(301, 20); + this.txtunit.Size = new System.Drawing.Size(473, 20); this.txtunit.StyleController = this.layoutControl1; this.txtunit.TabIndex = 5; // @@ -561,14 +1317,14 @@ namespace ERP.Form this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtwarehouse.Properties.ValueMember = "ID"; - this.txtwarehouse.Size = new System.Drawing.Size(299, 20); + this.txtwarehouse.Size = new System.Drawing.Size(468, 20); this.txtwarehouse.StyleController = this.layoutControl1; this.txtwarehouse.TabIndex = 6; // // txtproducttype // this.txtproducttype.EditValue = ""; - this.txtproducttype.Location = new System.Drawing.Point(465, 60); + this.txtproducttype.Location = new System.Drawing.Point(634, 60); this.txtproducttype.Name = "txtproducttype"; this.txtproducttype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -576,15 +1332,15 @@ namespace ERP.Form this.txtproducttype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txtproducttype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txtproducttype.Properties.ValueMember = "ID"; - this.txtproducttype.Size = new System.Drawing.Size(301, 20); + this.txtproducttype.Size = new System.Drawing.Size(473, 20); this.txtproducttype.StyleController = this.layoutControl1; this.txtproducttype.TabIndex = 7; // // txtproductcode // - this.txtproductcode.Location = new System.Drawing.Point(465, 36); + this.txtproductcode.Location = new System.Drawing.Point(634, 36); this.txtproductcode.Name = "txtproductcode"; - this.txtproductcode.Size = new System.Drawing.Size(301, 20); + this.txtproductcode.Size = new System.Drawing.Size(473, 20); this.txtproductcode.StyleController = this.layoutControl1; this.txtproductcode.TabIndex = 8; // @@ -592,7 +1348,7 @@ namespace ERP.Form // this.txtstocknumber.Location = new System.Drawing.Point(87, 180); this.txtstocknumber.Name = "txtstocknumber"; - this.txtstocknumber.Size = new System.Drawing.Size(299, 20); + this.txtstocknumber.Size = new System.Drawing.Size(468, 20); this.txtstocknumber.StyleController = this.layoutControl1; this.txtstocknumber.TabIndex = 9; // @@ -600,23 +1356,23 @@ namespace ERP.Form // this.txtstartnumber.Location = new System.Drawing.Point(87, 108); this.txtstartnumber.Name = "txtstartnumber"; - this.txtstartnumber.Size = new System.Drawing.Size(299, 20); + this.txtstartnumber.Size = new System.Drawing.Size(468, 20); this.txtstartnumber.StyleController = this.layoutControl1; this.txtstartnumber.TabIndex = 10; // // txtstartprice // - this.txtstartprice.Location = new System.Drawing.Point(465, 108); + this.txtstartprice.Location = new System.Drawing.Point(634, 108); this.txtstartprice.Name = "txtstartprice"; - this.txtstartprice.Size = new System.Drawing.Size(301, 20); + this.txtstartprice.Size = new System.Drawing.Size(473, 20); this.txtstartprice.StyleController = this.layoutControl1; this.txtstartprice.TabIndex = 11; // // txtproductinnumber // - this.txtproductinnumber.Location = new System.Drawing.Point(465, 132); + this.txtproductinnumber.Location = new System.Drawing.Point(634, 132); this.txtproductinnumber.Name = "txtproductinnumber"; - this.txtproductinnumber.Size = new System.Drawing.Size(301, 20); + this.txtproductinnumber.Size = new System.Drawing.Size(473, 20); this.txtproductinnumber.StyleController = this.layoutControl1; this.txtproductinnumber.TabIndex = 12; // @@ -624,23 +1380,23 @@ namespace ERP.Form // this.txtsaleoutnumber.Location = new System.Drawing.Point(87, 156); this.txtsaleoutnumber.Name = "txtsaleoutnumber"; - this.txtsaleoutnumber.Size = new System.Drawing.Size(299, 20); + this.txtsaleoutnumber.Size = new System.Drawing.Size(468, 20); this.txtsaleoutnumber.StyleController = this.layoutControl1; this.txtsaleoutnumber.TabIndex = 13; // // txtcustomerreturnnumber // - this.txtcustomerreturnnumber.Location = new System.Drawing.Point(465, 156); + this.txtcustomerreturnnumber.Location = new System.Drawing.Point(634, 156); this.txtcustomerreturnnumber.Name = "txtcustomerreturnnumber"; - this.txtcustomerreturnnumber.Size = new System.Drawing.Size(301, 20); + this.txtcustomerreturnnumber.Size = new System.Drawing.Size(473, 20); this.txtcustomerreturnnumber.StyleController = this.layoutControl1; this.txtcustomerreturnnumber.TabIndex = 14; // // txtstockwarnnumber // - this.txtstockwarnnumber.Location = new System.Drawing.Point(465, 180); + this.txtstockwarnnumber.Location = new System.Drawing.Point(634, 180); this.txtstockwarnnumber.Name = "txtstockwarnnumber"; - this.txtstockwarnnumber.Size = new System.Drawing.Size(301, 20); + this.txtstockwarnnumber.Size = new System.Drawing.Size(473, 20); this.txtstockwarnnumber.StyleController = this.layoutControl1; this.txtstockwarnnumber.TabIndex = 15; // @@ -655,7 +1411,7 @@ namespace ERP.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(299, 20); + this.txtcreatorId.Size = new System.Drawing.Size(468, 20); this.txtcreatorId.StyleController = this.layoutControl1; this.txtcreatorId.TabIndex = 16; // @@ -663,7 +1419,7 @@ namespace ERP.Form // this.txtcreateTime.EditValue = null; this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txtcreateTime.Location = new System.Drawing.Point(465, 204); + this.txtcreateTime.Location = new System.Drawing.Point(634, 204); this.txtcreateTime.Name = "txtcreateTime"; this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -672,7 +1428,7 @@ namespace ERP.Form this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.txtcreateTime.Properties.Mask.EditMask = "G"; - this.txtcreateTime.Size = new System.Drawing.Size(301, 20); + this.txtcreateTime.Size = new System.Drawing.Size(473, 20); this.txtcreateTime.StyleController = this.layoutControl1; this.txtcreateTime.TabIndex = 17; // @@ -687,7 +1443,7 @@ namespace ERP.Form this.txteditorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains; this.txteditorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard; this.txteditorId.Properties.ValueMember = "ID"; - this.txteditorId.Size = new System.Drawing.Size(299, 20); + this.txteditorId.Size = new System.Drawing.Size(468, 20); this.txteditorId.StyleController = this.layoutControl1; this.txteditorId.TabIndex = 18; // @@ -695,7 +1451,7 @@ namespace ERP.Form // this.txteditTime.EditValue = null; this.txteditTime.ImeMode = System.Windows.Forms.ImeMode.Off; - this.txteditTime.Location = new System.Drawing.Point(465, 228); + this.txteditTime.Location = new System.Drawing.Point(634, 228); this.txteditTime.Name = "txteditTime"; this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -704,7 +1460,7 @@ namespace ERP.Form this.txteditTime.Properties.DisplayFormat.FormatString = "G"; this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.txteditTime.Properties.Mask.EditMask = "G"; - this.txteditTime.Size = new System.Drawing.Size(301, 20); + this.txteditTime.Size = new System.Drawing.Size(473, 20); this.txteditTime.StyleController = this.layoutControl1; this.txteditTime.TabIndex = 19; // @@ -712,7 +1468,7 @@ namespace ERP.Form // this.txtremark.Location = new System.Drawing.Point(87, 252); this.txtremark.Name = "txtremark"; - this.txtremark.Size = new System.Drawing.Size(679, 20); + this.txtremark.Size = new System.Drawing.Size(1020, 20); this.txtremark.StyleController = this.layoutControl1; this.txtremark.TabIndex = 20; // @@ -741,9 +1497,9 @@ namespace ERP.Form this.layoutControlItem11, this.layoutControlItem17, this.layoutControlItem19, - this.emptySpaceItem1}); + this.layoutControlItem21}); this.layoutControlGroup1.Name = "layoutControlGroup1"; - this.layoutControlGroup1.Size = new System.Drawing.Size(778, 519); + this.layoutControlGroup1.Size = new System.Drawing.Size(1119, 592); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem1 @@ -752,7 +1508,7 @@ namespace ERP.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(758, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(1099, 24); this.layoutControlItem1.Text = "id"; this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14); // @@ -762,7 +1518,7 @@ namespace ERP.Form this.layoutControlItem2.CustomizationFormText = "产品名称"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(547, 24); this.layoutControlItem2.Text = "产品名称"; this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14); // @@ -772,7 +1528,7 @@ namespace ERP.Form this.layoutControlItem3.CustomizationFormText = "规格"; this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(547, 24); this.layoutControlItem3.Text = "规格"; this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14); // @@ -782,7 +1538,7 @@ namespace ERP.Form this.layoutControlItem4.CustomizationFormText = "默认单价"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(547, 24); this.layoutControlItem4.Text = "默认单价"; this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14); // @@ -792,7 +1548,7 @@ namespace ERP.Form this.layoutControlItem6.CustomizationFormText = "仓库"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 120); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem6.Size = new System.Drawing.Size(547, 24); this.layoutControlItem6.Text = "仓库"; this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14); // @@ -802,7 +1558,7 @@ namespace ERP.Form this.layoutControlItem9.CustomizationFormText = "库存"; this.layoutControlItem9.Location = new System.Drawing.Point(0, 168); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(547, 24); this.layoutControlItem9.Text = "库存"; this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14); // @@ -812,7 +1568,7 @@ namespace ERP.Form this.layoutControlItem16.CustomizationFormText = "创建人"; this.layoutControlItem16.Location = new System.Drawing.Point(0, 192); this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem16.Size = new System.Drawing.Size(547, 24); this.layoutControlItem16.Text = "创建人"; this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14); // @@ -822,7 +1578,7 @@ namespace ERP.Form this.layoutControlItem18.CustomizationFormText = "编辑人"; this.layoutControlItem18.Location = new System.Drawing.Point(0, 216); this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem18.Size = new System.Drawing.Size(547, 24); this.layoutControlItem18.Text = "编辑人"; this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14); // @@ -832,7 +1588,7 @@ namespace ERP.Form this.layoutControlItem20.CustomizationFormText = "备注"; this.layoutControlItem20.Location = new System.Drawing.Point(0, 240); this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.Size = new System.Drawing.Size(758, 24); + this.layoutControlItem20.Size = new System.Drawing.Size(1099, 24); this.layoutControlItem20.Text = "备注"; this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14); // @@ -840,9 +1596,9 @@ namespace ERP.Form // this.layoutControlItem8.Control = this.txtproductcode; this.layoutControlItem8.CustomizationFormText = "产品编号"; - this.layoutControlItem8.Location = new System.Drawing.Point(378, 24); + this.layoutControlItem8.Location = new System.Drawing.Point(547, 24); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem8.Size = new System.Drawing.Size(552, 24); this.layoutControlItem8.Text = "产品编号"; this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14); // @@ -850,9 +1606,9 @@ namespace ERP.Form // this.layoutControlItem7.Control = this.txtproducttype; this.layoutControlItem7.CustomizationFormText = "产品类别"; - this.layoutControlItem7.Location = new System.Drawing.Point(378, 48); + this.layoutControlItem7.Location = new System.Drawing.Point(547, 48); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem7.Size = new System.Drawing.Size(552, 24); this.layoutControlItem7.Text = "产品类别"; this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14); // @@ -860,9 +1616,9 @@ namespace ERP.Form // this.layoutControlItem5.Control = this.txtunit; this.layoutControlItem5.CustomizationFormText = "计量单位"; - this.layoutControlItem5.Location = new System.Drawing.Point(378, 72); + this.layoutControlItem5.Location = new System.Drawing.Point(547, 72); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(552, 24); this.layoutControlItem5.Text = "计量单位"; this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14); // @@ -870,9 +1626,9 @@ namespace ERP.Form // this.layoutControlItem12.Control = this.txtproductinnumber; this.layoutControlItem12.CustomizationFormText = "生产入库数量"; - this.layoutControlItem12.Location = new System.Drawing.Point(378, 120); + this.layoutControlItem12.Location = new System.Drawing.Point(547, 120); this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem12.Size = new System.Drawing.Size(552, 24); this.layoutControlItem12.Text = "生产入库数量"; this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14); // @@ -882,7 +1638,7 @@ namespace ERP.Form this.layoutControlItem13.CustomizationFormText = "销售出库数量"; this.layoutControlItem13.Location = new System.Drawing.Point(0, 144); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem13.Size = new System.Drawing.Size(547, 24); this.layoutControlItem13.Text = "销售出库数量"; this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14); // @@ -890,9 +1646,9 @@ namespace ERP.Form // this.layoutControlItem14.Control = this.txtcustomerreturnnumber; this.layoutControlItem14.CustomizationFormText = "客户退货数量"; - this.layoutControlItem14.Location = new System.Drawing.Point(378, 144); + this.layoutControlItem14.Location = new System.Drawing.Point(547, 144); this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem14.Size = new System.Drawing.Size(552, 24); this.layoutControlItem14.Text = "客户退货数量"; this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14); // @@ -900,9 +1656,9 @@ namespace ERP.Form // this.layoutControlItem15.Control = this.txtstockwarnnumber; this.layoutControlItem15.CustomizationFormText = "库存预警数量"; - this.layoutControlItem15.Location = new System.Drawing.Point(378, 168); + this.layoutControlItem15.Location = new System.Drawing.Point(547, 168); this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem15.Size = new System.Drawing.Size(552, 24); this.layoutControlItem15.Text = "库存预警数量"; this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14); // @@ -912,7 +1668,7 @@ namespace ERP.Form this.layoutControlItem10.CustomizationFormText = "期初数量"; this.layoutControlItem10.Location = new System.Drawing.Point(0, 96); this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.Size = new System.Drawing.Size(378, 24); + this.layoutControlItem10.Size = new System.Drawing.Size(547, 24); this.layoutControlItem10.Text = "期初数量"; this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14); // @@ -920,9 +1676,9 @@ namespace ERP.Form // this.layoutControlItem11.Control = this.txtstartprice; this.layoutControlItem11.CustomizationFormText = "期初总价"; - this.layoutControlItem11.Location = new System.Drawing.Point(378, 96); + this.layoutControlItem11.Location = new System.Drawing.Point(547, 96); this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem11.Size = new System.Drawing.Size(552, 24); this.layoutControlItem11.Text = "期初总价"; this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14); // @@ -930,9 +1686,9 @@ namespace ERP.Form // this.layoutControlItem17.Control = this.txtcreateTime; this.layoutControlItem17.CustomizationFormText = "创建时间"; - this.layoutControlItem17.Location = new System.Drawing.Point(378, 192); + this.layoutControlItem17.Location = new System.Drawing.Point(547, 192); this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem17.Size = new System.Drawing.Size(552, 24); this.layoutControlItem17.Text = "创建时间"; this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14); // @@ -940,25 +1696,26 @@ namespace ERP.Form // this.layoutControlItem19.Control = this.txteditTime; this.layoutControlItem19.CustomizationFormText = "编辑时间"; - this.layoutControlItem19.Location = new System.Drawing.Point(378, 216); + this.layoutControlItem19.Location = new System.Drawing.Point(547, 216); this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(380, 24); + this.layoutControlItem19.Size = new System.Drawing.Size(552, 24); this.layoutControlItem19.Text = "编辑时间"; this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14); // - // emptySpaceItem1 + // layoutControlItem21 // - this.emptySpaceItem1.AllowHotTrack = false; - this.emptySpaceItem1.Location = new System.Drawing.Point(0, 264); - this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(758, 235); - this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem21.Control = this.xtraTabControl2; + this.layoutControlItem21.Location = new System.Drawing.Point(0, 264); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.Size = new System.Drawing.Size(1099, 308); + this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem21.TextVisible = false; // // Frmproduct // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(787, 583); + this.ClientSize = new System.Drawing.Size(1129, 659); this.Controls.Add(this.xtraTabControl1); this.Name = "Frmproduct"; this.Text = "产品信息"; @@ -979,6 +1736,29 @@ namespace ERP.Form this.panelControl2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); + this.xtraTabControl2.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditcompletionProductInWarehouseDetailCode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); + this.xtraTabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsaledeliverdetailcode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit3)).EndInit(); + this.xtraTabPage3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gridControl3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditreturnsaledetailcode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).EndInit(); @@ -1022,7 +1802,7 @@ namespace ERP.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); this.ResumeLayout(false); } @@ -1124,6 +1904,73 @@ namespace ERP.Form private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private EmptySpaceItem emptySpaceItem1; + private XtraTabControl xtraTabControl2; + private XtraTabPage xtraTabPage1; + private XtraTabPage xtraTabPage2; + private LayoutControlItem layoutControlItem21; + private XtraTabPage xtraTabPage3; + private DevExpress.XtraGrid.GridControl gridControl1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditcompletionProductInWarehouseDetailCode; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditproductid; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn34; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditunit; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn35; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn36; + private DevExpress.XtraGrid.GridControl gridControl2; + private DevExpress.XtraGrid.Views.Grid.GridView gridView2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn37; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn39; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn40; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn41; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditsaledeliverdetailcode; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn43; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn44; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn45; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn46; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn49; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn50; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn51; + private DevExpress.XtraGrid.GridControl gridControl3; + private DevExpress.XtraGrid.Views.Grid.GridView gridView3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn52; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn53; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn54; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditreturnsaledetailcode; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn55; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn56; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn57; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn58; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn59; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn60; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn61; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn62; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn63; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn64; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn65; } } \ No newline at end of file diff --git a/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.cs b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.cs new file mode 100644 index 0000000..ccf42f0 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.cs @@ -0,0 +1,333 @@ +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; +using CCWin.SkinClass; +using DevExpress.DataProcessing; + +namespace MES.Form +{ + public partial class FrmsaleInWarehouse : FrmBaseForm + { + private Dictionary fieldDictionary = new Dictionary(); + public FrmsaleInWarehouse() + { + InitializeComponent(); + } + private void FrmsaleInWarehouse_Load(object sender, EventArgs e) + { + InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new saleInWarehouseInfo(),gridControl1,new []{"txtcode"}); + InitSearchDicData(); + repositoryItemTextEditreturnsaledetailcode.KeyDown += RepositoryItemTextEditreturnsaledetailcode_KeyDown; + } + + private void RepositoryItemTextEditreturnsaledetailcode_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Tab) + { + using (var db = new MESDB()) + { + string code = gridView1.EditingValue.ToString(); + if (!string.IsNullOrEmpty(code)) + { + returnsaledetailInfo buyerdetailInfo = db.returnsaledetailInfo + .Where(p => p.returnsaledetailcode == code).FirstOrDefault(); + if (buyerdetailInfo == null) + { + "单号不存在".ShowWarning(); + } + else + { + gridView1.GetFocusedDataRow()["returnsalecode"] = buyerdetailInfo.returnsalecode; + gridView1.GetFocusedDataRow()["returnsaledetailcode"] = buyerdetailInfo.returnsaledetailcode; + gridView1.GetFocusedDataRow()["salecode"] = buyerdetailInfo.salecode; + gridView1.GetFocusedDataRow()["productid"] = db.productInfo.Where(p => p.productcode == buyerdetailInfo.productcode).FirstOrDefault().id; + gridView1.GetFocusedDataRow()["productcode"] = buyerdetailInfo.productcode; + gridView1.GetFocusedDataRow()["spec"] = buyerdetailInfo.productspec; + gridView1.GetFocusedDataRow()["unit"] = buyerdetailInfo.unit; + gridView1.GetFocusedDataRow()["warehouse"] = buyerdetailInfo.warehouse; + } + } + } + } + } + + /// + /// 数据源初始化 + /// + /// + private void Init() + { + txtdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门"); + repositoryItemTreeListtxtdept.DataSource= GetDataTableUtils.SqlTable("部门"); + txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户"); + repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户"); + repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库"); + repositoryItemLookUpEditunit.DataSource = GetDataTableUtils.SqlTable("计量单位"); + repositoryItemLookUpEditproductID.DataSource = GetDataTableUtils.SqlTable("产品"); + } + /// + /// 搜索字段 + /// + /// + private void InitSearchDicData() + { + fieldDictionary.Add("入库单号","code"); + } + + public override void InitgrdListDataSource() + { + using (var con=new MESDB())/// + { + grdList.DataSource=con.saleInWarehouseInfo.ToList(); + } + Init(); + } + /// + /// 字段为空校验 + /// + /// + public override bool CheckInput() + { + if(string.IsNullOrEmpty(txtinTime.Text)) + { + "入库日期不能为空".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; + } + if(string.IsNullOrEmpty(txtcreateTime.Text)) + { + "制单日期不能为空".ShowWarning(); + txtcreateTime.Focus(); + return false; + } + return true; + } + /// + /// 保存 + /// + /// + public override bool SaveFunction() + { + string code = "SOR" + DateTime.Now.GetDateTimeCode(); + + DataTable dt = gridControl1.DataSource as DataTable; + try + { + saleInWarehouseInfo info = (saleInWarehouseInfo)this.ControlDataToModel(new saleInWarehouseInfo()); + using (var db = new MESDB()) + { + using (var tran = db.Database.BeginTransaction()) + { + try + { + Dictionary> dic = + dt.GetDataTableData(); + if (info.id == 0) //新增 + { + info.code = code; + db.saleInWarehouseInfo.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.mastercode = info.code; + a.detailcode = codedetail; + //更新产品入库数量 + productInfo product = db.productInfo.Find(a.productID); + product.customerreturnnumber += a.number; + }); + db.saleInWarehouseDetailInfo.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.mastercode = info.code; + num++; + string codedetail = code + num; + a.detailcode = codedetail; + //更新产品入库数量 + productInfo product = db.productInfo.Find(a.productID); + product.customerreturnnumber += a.number; + }); + db.saleInWarehouseDetailInfo.AddRange(detaiListAdd); + + List detaiListEdit = + dic["Edit"]; + + detaiListEdit.ForEach((a) => + { + decimal oldnumber = + GetDataTableUtils + .SqlTableBySql( + $"select number from saleInWarehouseDetail where id={a.id}") + .Rows[0]["number"].ToDecimal(0); + //a.buyercode = info.buyercode; + productInfo product = db.productInfo.Find(a.productID); + product.customerreturnnumber += a.number; + product.customerreturnnumber -= oldnumber; + db.Entry(a).State = EntityState.Modified; + }); + + List detaiListDel = + dic["Del"]; + detaiListDel.ForEach((a) => + { + productInfo product = db.productInfo.Find(a.productID); + product.customerreturnnumber -= a.number; + db.Entry(a).State = EntityState.Deleted; + }); + db.SaveChanges(); + } + } + + tran.Commit(); + gridControl1.DataSource = db.saleInWarehouseDetailInfo.Where(p => p.masterid == info.id).ToList().ToDataTable(); ; ; + } + 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 + { + saleInWarehouseInfo info = (saleInWarehouseInfo)this.ControlDataToModel(new saleInWarehouseInfo()); + using (var db = new MESDB()) + { + db.Entry(info).State=EntityState.Deleted; + List list = db.saleInWarehouseDetailInfo + .Where(p => p.masterid == info.id).ToList(); + foreach (var item in list) + { + productInfo product = db.productInfo.Find(item.productID); + product.customerreturnnumber -= item.number; + } + db.saleInWarehouseDetailInfo.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.saleInWarehouseInfo.SqlQuery("select * from saleInWarehouse").ToList(); + } + else + { + grdList.DataSource = db.saleInWarehouseInfo.SqlQuery($"select * from saleInWarehouse where {sql}").ToList(); + } + } + } + } + public override void AddFunction() + { + gridControl1.DataSource = new List().ToDataTable(); + } + + public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e) + { + saleInWarehouseInfo info = grdListView.GetFocusedRow() as saleInWarehouseInfo; + if (info != null) + { + using (var db = new MESDB()) + { + gridControl1.DataSource = db.saleInWarehouseDetailInfo.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/FrmsaleInWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.designer.cs new file mode 100644 index 0000000..ed145bb --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.designer.cs @@ -0,0 +1,831 @@ + +using DevExpress.XtraEditors; +using DevExpress.XtraLayout; +using DevExpress.XtraTab; + +namespace MES.Form +{ + partial class FrmsaleInWarehouse + { + /// + /// 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.repositoryItemTreeListtxtdept = new DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit(); + this.repositoryItemTreeListtxtdeptTreeList = new DevExpress.XtraTreeList.TreeList(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + 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.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.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditreturnsaledetailcode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); + 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.repositoryItemLookUpEditproductID = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + 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.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.txtid = new DevExpress.XtraEditors.TextEdit(); + this.txtinTime = new DevExpress.XtraEditors.DateEdit(); + this.txtdept = new DevExpress.XtraEditors.TreeListLookUpEdit(); + this.txtdeptTreeList = new DevExpress.XtraTreeList.TreeList(); + this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit(); + this.txtcreateTime = new DevExpress.XtraEditors.DateEdit(); + this.txtcode = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtdept)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtdeptTreeList)).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.xtraTabControl2)).BeginInit(); + 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.repositoryItemTextEditreturnsaledetailcode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtinTime.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtinTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdept.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdeptTreeList)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + this.SuspendLayout(); + // + // gridColumn1 + // + this.gridColumn1.Caption = "id"; + this.gridColumn1.FieldName = "id"; + this.gridColumn1.Name = "gridColumn1"; + // + // gridColumn2 + // + this.gridColumn2.Caption = "入库日期"; + this.gridColumn2.DisplayFormat.FormatString = "G"; + this.gridColumn2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn2.FieldName = "inTime"; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 201; + // + // gridColumn3 + // + this.gridColumn3.Caption = "入库单位"; + this.gridColumn3.ColumnEdit = this.repositoryItemTreeListtxtdept; + this.gridColumn3.FieldName = "dept"; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 201; + // + // repositoryItemTreeListtxtdept + // + this.repositoryItemTreeListtxtdept.AutoHeight = false; + this.repositoryItemTreeListtxtdept.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemTreeListtxtdept.DisplayMember = "Name"; + this.repositoryItemTreeListtxtdept.Name = "repositoryItemTreeListtxtdept"; + this.repositoryItemTreeListtxtdept.TreeList = this.repositoryItemTreeListtxtdeptTreeList; + this.repositoryItemTreeListtxtdept.ValueMember = "ID"; + // + // repositoryItemTreeListtxtdeptTreeList + // + this.repositoryItemTreeListtxtdeptTreeList.Location = new System.Drawing.Point(0, 0); + this.repositoryItemTreeListtxtdeptTreeList.Name = "repositoryItemTreeListtxtdeptTreeList"; + this.repositoryItemTreeListtxtdeptTreeList.OptionsView.ShowIndentAsRowStyle = true; + this.repositoryItemTreeListtxtdeptTreeList.ParentFieldName = "PID"; + this.repositoryItemTreeListtxtdeptTreeList.Size = new System.Drawing.Size(400, 200); + this.repositoryItemTreeListtxtdeptTreeList.TabIndex = 0; + // + // gridColumn4 + // + this.gridColumn4.Caption = "制单人"; + this.gridColumn4.ColumnEdit = this.repositoryItemtxtcreatorId; + this.gridColumn4.FieldName = "creatorId"; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 2; + this.gridColumn4.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"; + // + // gridColumn5 + // + this.gridColumn5.Caption = "制单日期"; + this.gridColumn5.DisplayFormat.FormatString = "G"; + this.gridColumn5.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn5.FieldName = "createTime"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 201; + // + // gridColumn6 + // + this.gridColumn6.Caption = "入库单号"; + this.gridColumn6.FieldName = "code"; + 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.txtinTime); + this.layoutControl1.Controls.Add(this.txtdept); + this.layoutControl1.Controls.Add(this.txtcreatorId); + this.layoutControl1.Controls.Add(this.txtcreateTime); + this.layoutControl1.Controls.Add(this.txtcode); + 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"; + // + // xtraTabControl2 + // + 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(1266, 637); + this.xtraTabControl2.TabIndex = 0; + this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gridControl1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1260, 608); + 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.repositoryItemLookUpEditproductID, + this.repositoryItemLookUpEditunit, + this.repositoryItemLookUpEditwarehouse, + this.repositoryItemTextEditreturnsaledetailcode}); + this.gridControl1.Size = new System.Drawing.Size(1260, 608); + 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[] { + 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.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"; + this.gridColumn7.Width = 201; + // + // gridColumn8 + // + this.gridColumn8.Caption = "销售退货单号"; + this.gridColumn8.FieldName = "returnsalecode"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 1; + this.gridColumn8.Width = 201; + // + // gridColumn9 + // + this.gridColumn9.Caption = "销售退货明细单号"; + this.gridColumn9.ColumnEdit = this.repositoryItemTextEditreturnsaledetailcode; + this.gridColumn9.FieldName = "returnsaledetailcode"; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 0; + this.gridColumn9.Width = 201; + // + // repositoryItemTextEditreturnsaledetailcode + // + this.repositoryItemTextEditreturnsaledetailcode.AutoHeight = false; + this.repositoryItemTextEditreturnsaledetailcode.Name = "repositoryItemTextEditreturnsaledetailcode"; + // + // gridColumn10 + // + this.gridColumn10.Caption = "销售退货入库单号"; + this.gridColumn10.FieldName = "mastercode"; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 12; + this.gridColumn10.Width = 201; + // + // gridColumn11 + // + this.gridColumn11.Caption = "销售退货入库明细单号"; + this.gridColumn11.FieldName = "detailcode"; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 9; + this.gridColumn11.Width = 201; + // + // gridColumn12 + // + this.gridColumn12.Caption = "销售单号"; + this.gridColumn12.FieldName = "salecode"; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 10; + this.gridColumn12.Width = 201; + // + // gridColumn13 + // + this.gridColumn13.Caption = "销售明细单号"; + this.gridColumn13.FieldName = "saledetailcode"; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 11; + this.gridColumn13.Width = 201; + // + // gridColumn14 + // + this.gridColumn14.Caption = "产品"; + this.gridColumn14.ColumnEdit = this.repositoryItemLookUpEditproductID; + this.gridColumn14.FieldName = "productID"; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 2; + this.gridColumn14.Width = 201; + // + // repositoryItemLookUpEditproductID + // + this.repositoryItemLookUpEditproductID.AutoHeight = false; + this.repositoryItemLookUpEditproductID.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditproductID.DisplayMember = "Name"; + this.repositoryItemLookUpEditproductID.Name = "repositoryItemLookUpEditproductID"; + this.repositoryItemLookUpEditproductID.NullText = ""; + this.repositoryItemLookUpEditproductID.ValueMember = "ID"; + // + // gridColumn15 + // + this.gridColumn15.Caption = "产品编号"; + this.gridColumn15.FieldName = "productcode"; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 3; + this.gridColumn15.Width = 201; + // + // gridColumn16 + // + this.gridColumn16.Caption = "规格型号"; + this.gridColumn16.FieldName = "spec"; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 4; + this.gridColumn16.Width = 201; + // + // gridColumn17 + // + this.gridColumn17.Caption = "入库数量"; + this.gridColumn17.FieldName = "number"; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 5; + 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 = 6; + this.gridColumn18.Width = 201; + // + // 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"; + // + // gridColumn19 + // + this.gridColumn19.Caption = "仓库"; + this.gridColumn19.ColumnEdit = this.repositoryItemLookUpEditwarehouse; + this.gridColumn19.FieldName = "warehouse"; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 7; + this.gridColumn19.Width = 201; + // + // 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"; + // + // gridColumn20 + // + this.gridColumn20.Caption = "备注"; + this.gridColumn20.FieldName = "remark"; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 8; + this.gridColumn20.Width = 201; + // + // 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; + // + // 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 = 2; + // + // 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.TreeList = this.txtdeptTreeList; + this.txtdept.Properties.ValueMember = "ID"; + this.txtdept.Size = new System.Drawing.Size(580, 20); + this.txtdept.StyleController = this.layoutControl1; + this.txtdept.TabIndex = 3; + // + // txtdeptTreeList + // + this.txtdeptTreeList.Location = new System.Drawing.Point(0, 0); + this.txtdeptTreeList.Name = "txtdeptTreeList"; + this.txtdeptTreeList.OptionsView.ShowIndentAsRowStyle = true; + this.txtdeptTreeList.ParentFieldName = "PID"; + this.txtdeptTreeList.Size = new System.Drawing.Size(400, 200); + this.txtdeptTreeList.TabIndex = 0; + // + // 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(580, 20); + this.txtcreatorId.StyleController = this.layoutControl1; + this.txtcreatorId.TabIndex = 4; + // + // txtcreateTime + // + this.txtcreateTime.EditValue = null; + this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off; + this.txtcreateTime.Location = new System.Drawing.Point(698, 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)}); + this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txtcreateTime.Properties.DisplayFormat.FormatString = "G"; + this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.txtcreateTime.Size = new System.Drawing.Size(580, 20); + this.txtcreateTime.StyleController = this.layoutControl1; + this.txtcreateTime.TabIndex = 5; + // + // 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 = 6; + // + // 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.layoutControlItem4, + this.layoutControlItem6, + this.layoutControlItem2, + this.layoutControlItem5, + this.layoutControlItem8}); + 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); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txtdept; + this.layoutControlItem3.CustomizationFormText = "入库单位"; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 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); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txtcreatorId; + this.layoutControlItem4.CustomizationFormText = "制单人"; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 48); + 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); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txtcode; + this.layoutControlItem6.CustomizationFormText = "入库单号"; + this.layoutControlItem6.Location = new System.Drawing.Point(635, 0); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem6.Text = "入库单号"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txtinTime; + this.layoutControlItem2.CustomizationFormText = "入库日期"; + this.layoutControlItem2.Location = new System.Drawing.Point(635, 24); + 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); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txtcreateTime; + this.layoutControlItem5.CustomizationFormText = "制单日期"; + this.layoutControlItem5.Location = new System.Drawing.Point(635, 48); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(635, 24); + this.layoutControlItem5.Text = "制单日期"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.xtraTabControl2; + this.layoutControlItem8.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.Size = new System.Drawing.Size(1270, 641); + this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem8.TextVisible = false; + // + // FrmsaleInWarehouse + // + 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 = "FrmsaleInWarehouse"; + this.Text = "销售退货入库单"; + this.Load += new System.EventHandler(this.FrmsaleInWarehouse_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtdept)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtdeptTreeList)).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.xtraTabControl2)).EndInit(); + 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.repositoryItemTextEditreturnsaledetailcode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductID)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtinTime.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtinTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdept.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtdeptTreeList)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + 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.DateEdit txtinTime; + private DevExpress.XtraTreeList.TreeList txtdeptTreeList; + private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListtxtdept; + private DevExpress.XtraTreeList.TreeList repositoryItemTreeListtxtdeptTreeList; + + private DevExpress.XtraEditors.TreeListLookUpEdit txtdept; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId; + + private DevExpress.XtraEditors.LookUpEdit txtcreatorId; + /////////////////////////////// + private DevExpress.XtraEditors.DateEdit txtcreateTime; + /////////////////////////////// + private DevExpress.XtraEditors.TextEdit txtcode; + + 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 layoutControlItem8; + 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.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditproductID; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditunit; + private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse; + private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditreturnsaledetailcode; + 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/FrmsaleInWarehouse.resx b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.resx new file mode 100644 index 0000000..ad53752 --- /dev/null +++ b/WinformGeneralDeveloperFrame/Form/FrmsaleInWarehouse.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/FrmsaleOutWarehouse.cs b/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.cs index dc0fbaf..c4864fa 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.cs @@ -12,6 +12,8 @@ using DevExpress.XtraLayout; using MES.Entity; using System.Data.Entity.Migrations; using System.Data.Entity; +using CCWin.SkinClass; + namespace MES.Form { public partial class FrmsaleOutWarehouse : FrmBaseForm @@ -161,6 +163,9 @@ namespace MES.Form a.masterid = info.id; a.mastercode = info.code; a.detailcode = codedetail; + //更新产品入库数量 + productInfo product = db.productInfo.Find(a.productid); + product.saleoutnumber += a.number; }); db.saleOutWarehouseDetailInfo.AddRange(detaiListAdd); db.SaveChanges(); @@ -182,6 +187,9 @@ namespace MES.Form num++; string codedetail = code + num; a.detailcode = codedetail; + //更新产品入库数量 + productInfo product = db.productInfo.Find(a.productid); + product.saleoutnumber += a.number; }); db.saleOutWarehouseDetailInfo.AddRange(detaiListAdd); @@ -190,13 +198,26 @@ namespace MES.Form detaiListEdit.ForEach((a) => { - + decimal oldnumber = + GetDataTableUtils + .SqlTableBySql( + $"select number from saleOutWarehouseDetail where id={a.id}") + .Rows[0]["number"].ToDecimal(0); + //a.buyercode = info.buyercode; + productInfo product = db.productInfo.Find(a.productid); + product.saleoutnumber += a.number; + product.saleoutnumber -= oldnumber; db.Entry(a).State = EntityState.Modified; }); List detaiListDel = dic["Del"]; - detaiListDel.ForEach((a) => { db.Entry(a).State = EntityState.Deleted; }); + detaiListDel.ForEach((a) => + { + productInfo product = db.productInfo.Find(a.productid); + product.saleoutnumber -= a.number; + db.Entry(a).State = EntityState.Deleted; + }); db.SaveChanges(); } } @@ -239,6 +260,11 @@ namespace MES.Form db.Entry(info).State=EntityState.Deleted; List list = db.saleOutWarehouseDetailInfo .Where(p => p.masterid == info.id).ToList(); + foreach (var item in list) + { + productInfo product = db.productInfo.Find(item.productid); + product.productinnumber -= item.number; + } db.saleOutWarehouseDetailInfo.RemoveRange(list); gridControl1.DataSource = null; db.SaveChanges(); diff --git a/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.designer.cs index 7deb881..57a2b09 100644 --- a/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.designer.cs +++ b/WinformGeneralDeveloperFrame/Form/FrmsaleOutWarehouse.designer.cs @@ -54,6 +54,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(); @@ -61,14 +64,18 @@ namespace MES.Form this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemTextEditsaledeliverdetailcode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditproductid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); 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.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.txtid = new DevExpress.XtraEditors.TextEdit(); this.txtcode = new DevExpress.XtraEditors.TextEdit(); @@ -87,13 +94,6 @@ namespace MES.Form this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.repositoryItemLookUpEditproductid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); - this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); - this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit(); - this.repositoryItemTextEditsaledeliverdetailcode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit(); - 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.repositoryItemTreeListtxtdept)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtdeptTreeList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit(); @@ -111,7 +111,12 @@ 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.repositoryItemTextEditsaledeliverdetailcode)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtouttime.Properties.CalendarTimeProperties)).BeginInit(); @@ -131,11 +136,6 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsaledeliverdetailcode)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // gridColumn1 @@ -345,6 +345,28 @@ namespace MES.Form 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(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); + // // gridView1 // this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { @@ -420,6 +442,11 @@ namespace MES.Form this.gridColumn13.VisibleIndex = 0; this.gridColumn13.Width = 201; // + // repositoryItemTextEditsaledeliverdetailcode + // + this.repositoryItemTextEditsaledeliverdetailcode.AutoHeight = false; + this.repositoryItemTextEditsaledeliverdetailcode.Name = "repositoryItemTextEditsaledeliverdetailcode"; + // // gridColumn14 // this.gridColumn14.Caption = "销售单号"; @@ -448,6 +475,16 @@ namespace MES.Form this.gridColumn16.VisibleIndex = 4; this.gridColumn16.Width = 201; // + // repositoryItemLookUpEditproductid + // + this.repositoryItemLookUpEditproductid.AutoHeight = false; + this.repositoryItemLookUpEditproductid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemLookUpEditproductid.DisplayMember = "Name"; + this.repositoryItemLookUpEditproductid.Name = "repositoryItemLookUpEditproductid"; + this.repositoryItemLookUpEditproductid.NullText = ""; + this.repositoryItemLookUpEditproductid.ValueMember = "ID"; + // // gridColumn17 // this.gridColumn17.Caption = "产品编号"; @@ -485,6 +522,16 @@ namespace MES.Form this.gridColumn20.VisibleIndex = 8; this.gridColumn20.Width = 201; // + // 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"; + // // gridColumn21 // this.gridColumn21.Caption = "仓库"; @@ -495,6 +542,16 @@ namespace MES.Form this.gridColumn21.VisibleIndex = 9; this.gridColumn21.Width = 201; // + // 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"; + // // gridColumn22 // this.gridColumn22.Caption = "备注"; @@ -694,63 +751,6 @@ namespace MES.Form this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // - // repositoryItemLookUpEditproductid - // - this.repositoryItemLookUpEditproductid.AutoHeight = false; - this.repositoryItemLookUpEditproductid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemLookUpEditproductid.DisplayMember = "Name"; - this.repositoryItemLookUpEditproductid.Name = "repositoryItemLookUpEditproductid"; - this.repositoryItemLookUpEditproductid.NullText = ""; - this.repositoryItemLookUpEditproductid.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"; - // - // repositoryItemTextEditsaledeliverdetailcode - // - this.repositoryItemTextEditsaledeliverdetailcode.AutoHeight = false; - this.repositoryItemTextEditsaledeliverdetailcode.Name = "repositoryItemTextEditsaledeliverdetailcode"; - // - // 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); - // // FrmsaleOutWarehouse // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); @@ -778,7 +778,12 @@ 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.repositoryItemTextEditsaledeliverdetailcode)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtouttime.Properties.CalendarTimeProperties)).EndInit(); @@ -798,11 +803,6 @@ namespace MES.Form ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditproductid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsaledeliverdetailcode)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj index 00190b8..31e9c5a 100644 --- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj +++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj @@ -174,6 +174,8 @@ + + @@ -314,6 +316,12 @@ Frmsale.cs + + Form + + + FrmsaleInWarehouse.cs + Form @@ -563,6 +571,9 @@ Frmsale.cs + + FrmsaleInWarehouse.cs + FrmsaleOutWarehouse.cs