diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo index af2e6f6..11a3148 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v16/.suo and b/.vs/WinformGeneralDeveloperFrame/v16/.suo differ diff --git a/DB/script.sql b/DB/script.sql index b5255ed..f1e97a2 100644 Binary files a/DB/script.sql and b/DB/script.sql differ diff --git a/WinformGeneralDeveloperFrame/DB/MESDB.cs b/WinformGeneralDeveloperFrame/DB/MESDB.cs index 793483d..85a732f 100644 --- a/WinformGeneralDeveloperFrame/DB/MESDB.cs +++ b/WinformGeneralDeveloperFrame/DB/MESDB.cs @@ -109,6 +109,9 @@ namespace MES public virtual DbSet 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