1

WinformGeneralDeveloperFrame/DB/MESDB.cs

@@ -52,5 +52,13 @@ namespace MES
         public virtual DbSet<productBOMInfo> productBOMInfo { get; set; }
 
         public virtual DbSet<productBOMdetailInfo> productBOMdetailInfo { get; set; }
+
+        public virtual DbSet<requisitionInfo> requisitionInfo { get; set; }
+
+        public virtual DbSet<requisitiondetailInfo> requisitiondetailInfo { get; set; }
+
+        public virtual DbSet<buyerInfo> buyerInfo { get; set; }
+
+        public virtual DbSet<buyerdetailInfo> buyerdetailInfo { get; set; }
     }
 }

WinformGeneralDeveloperFrame/Entity/buyerInfo.cs

@@ -0,0 +1,43 @@
+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("buyer")]
+    public partial class buyerInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///采购单号
+    [ModelBindControl("txtbuyercode")]
+    public string buyercode{set;get;}
+    ///采购日期
+    [ModelBindControl("txtbuyerdate")]
+    public DateTime buyerdate{set;get;}=DateTime.Now;
+    ///供应商
+    [ModelBindControl("txtsupplierid")]
+    public int supplierid{set;get;}
+    ///供应商编码
+    [ModelBindControl("txtsuppliercode")]
+    public string suppliercode{set;get;}
+    ///完货日期
+    [ModelBindControl("txtdeliverdate")]
+    public DateTime deliverdate{set;get;}=DateTime.Now;
+    ///制单人
+    [ModelBindControl("txtcreatorId")]
+    public int creatorId{set;get;}
+    ///金额
+    [ModelBindControl("txttotalprice")]
+    public decimal totalprice{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    
+    }
+}

WinformGeneralDeveloperFrame/Entity/buyerdetailInfo.cs

@@ -0,0 +1,75 @@
+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("buyerdetail")]
+    public partial class buyerdetailInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///主表
+    [ModelBindControl("txtbuyerid")]
+    public int buyerid{set;get;}
+    ///采购单号
+    [ModelBindControl("txtbuyercode")]
+    public string buyercode{set;get;}
+    ///请购单号
+    [ModelBindControl("txtrequisitioncode")]
+    public string requisitioncode{set;get;}
+    ///物料
+    [ModelBindControl("txtmaterialid")]
+    public int materialid{set;get;}
+    ///物料编码
+    [ModelBindControl("txtmaterialcode")]
+    public string materialcode{set;get;}
+    ///规格型号
+    [ModelBindControl("txtmaterialspec")]
+    public string materialspec{set;get;}
+    ///计量单位
+    [ModelBindControl("txtmaterialunit")]
+    public int materialunit{set;get;}
+    ///请购数量
+    [ModelBindControl("txtbuyernumber")]
+    public decimal buyernumber{set;get;}
+    ///单价
+    [ModelBindControl("txtunitprice")]
+    public decimal unitprice{set;get;}
+    ///金额
+    [ModelBindControl("txtmoney")]
+    public decimal money{set;get;}
+    ///仓库
+    [ModelBindControl("txtwarehouse")]
+    public int warehouse{set;get;}
+    ///交货总量
+    [ModelBindControl("txtdelivernumber")]
+    public decimal delivernumber{set;get;}
+    ///退货总量
+    [ModelBindControl("txtreturnnumber")]
+    public decimal returnnumber{set;get;}
+    ///实际交货总量
+    [ModelBindControl("txtrealdelivernumber")]
+    public decimal realdelivernumber{set;get;}
+    ///未交货数量
+    [ModelBindControl("txtnodelivernumber")]
+    public decimal nodelivernumber{set;get;}
+    ///已结算数量
+    [ModelBindControl("txtfinishnumber")]
+    public decimal finishnumber{set;get;}
+    ///未结算数量
+    [ModelBindControl("txtnofinishnumber")]
+    public decimal nofinishnumber{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    ///明细号
+    [ModelBindControl("txtbuyerdetailcode")]
+    public string buyerdetailcode { set; get; }
+    }
+}

WinformGeneralDeveloperFrame/Entity/deliversaledetailInfo.cs

@@ -44,6 +44,10 @@ namespace MES.Entity
     ///备注
     [ModelBindControl("txtremark")]
     public string remark{set;get;}
-    
+    ///明细号
+    [ModelBindControl("txtdeliversaledetailcode")]
+    public string deliversaledetailcode { set; get; }
+
+
     }
 }

WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs

@@ -50,5 +50,18 @@ namespace MES.Entity
     /// </summary>
     [ModelBindControl("txtunitcost")]
     public decimal unitcost { set; get; }
+
+    ///创建人
+    [ModelBindControl("txtcreatorId")]
+    public int creatorId { set; get; }
+    ///创建时间
+    [ModelBindControl("txtcreateTime")]
+    public DateTime createTime { set; get; } = DateTime.Now;
+    ///编辑人
+    [ModelBindControl("txteditorId")]
+    public int editorId { set; get; }
+    ///编辑时间
+    [ModelBindControl("txteditTime")]
+    public DateTime editTime { set; get; } = DateTime.Now;
     }
 }

WinformGeneralDeveloperFrame/Entity/productBOMdetailInfo.cs

@@ -60,5 +60,8 @@ namespace MES.Entity
     [ModelBindControl("txtremark")]
     public string remark{set;get;}
     
+    ///明细号
+    [ModelBindControl("txtproductBOMdetailcode")]
+    public string productBOMdetailcode { set; get; }
     }
 }

WinformGeneralDeveloperFrame/Entity/quotationdetailInfo.cs

@@ -50,6 +50,9 @@ namespace MES.Entity
     ///备注
     [ModelBindControl("txtremark")]
     public string remark{set;get;}
-    
+    ///明细号
+    [ModelBindControl("txtquotationdetailcode")]
+    public string quotationdetailcode { set; get; }
     }
+    
 }

WinformGeneralDeveloperFrame/Entity/requisitionInfo.cs

@@ -0,0 +1,40 @@
+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("requisition")]
+    public partial class requisitionInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///请购单编号
+    [ModelBindControl("txtrequisitioncode")]
+    public string requisitioncode{set;get;}
+    ///请购部门
+    [ModelBindControl("txtdeptid")]
+    public int deptid{set;get;}
+    ///请购日期
+    [ModelBindControl("txtrequisitiondate")]
+    public DateTime requisitiondate{set;get;}=DateTime.Now;
+    ///交货日期
+    [ModelBindControl("txtdeliverdate")]
+    public DateTime deliverdate{set;get;}=DateTime.Now;
+    ///制单人
+    [ModelBindControl("txtcreatorId")]
+    public int creatorId{set;get;}
+    ///金额
+    [ModelBindControl("txttotalprice")]
+    public decimal totalprice{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public decimal remark{set;get;}
+    
+    }
+}

WinformGeneralDeveloperFrame/Entity/requisitiondetailInfo.cs

@@ -0,0 +1,55 @@
+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("requisitiondetail")]
+    public partial class requisitiondetailInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///请购单主表
+    [ModelBindControl("txtrequisitionid")]
+    public int requisitionid{set;get;}
+    ///请购单号
+    [ModelBindControl("txtrequisitioncode")]
+    public string requisitioncode{set;get;}
+    ///物料名称
+    [ModelBindControl("txtmaterialid")]
+    public int materialid{set;get;}
+    ///物料编码
+    [ModelBindControl("txtmaterialcode")]
+    public string materialcode{set;get;}
+    ///规格型号
+    [ModelBindControl("txtmaterialspec")]
+    public string materialspec{set;get;}
+    ///计量单位
+    [ModelBindControl("txtmaterialunit")]
+    public int materialunit{set;get;}
+    ///请购数量
+    [ModelBindControl("txtrequisitionnumber")]
+    public decimal requisitionnumber{set;get;}
+    ///单价
+    [ModelBindControl("txtunitprice")]
+    public decimal unitprice{set;get;}
+    ///金额
+    [ModelBindControl("txtmoney")]
+    public decimal money{set;get;}
+    ///仓库
+    [ModelBindControl("txtwarehouse")]
+    public int warehouse{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    
+    ///明细号
+    [ModelBindControl("txtrequisitiondetailcode")]
+    public string requisitiondetailcode { set; get; }
+    }
+}

WinformGeneralDeveloperFrame/Entity/returnsaledetailInfo.cs

@@ -48,5 +48,8 @@ namespace MES.Entity
     [ModelBindControl("txtremark")]
     public string remark{set;get;}
     
+    ///明细号
+    [ModelBindControl("txtreturnsaledetailcode")]
+    public string returnsaledetailcode { set; get; }
     }
 }

WinformGeneralDeveloperFrame/Entity/saledetailInfo.cs

@@ -81,5 +81,8 @@ namespace MES.Entity
     [ModelBindControl("txtsalecode")]
     public string salecode{set;get;}
     
+    ///明细号
+    [ModelBindControl("txtsaledetailcode")]
+    public string saledetailcode { set; get; }
     }
 }

WinformGeneralDeveloperFrame/Form/Frmbuyer.cs

@@ -14,33 +14,42 @@ using System.Data.Entity.Migrations;
 using System.Data.Entity;
 namespace MES.Form
 {
-	public partial class Frmdeliversaledetail : FrmBaseForm
+	public partial class Frmbuyer : FrmBaseForm
 	{
         private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
-		public Frmdeliversaledetail()
+		public Frmbuyer()
 		{
 			InitializeComponent();
 		}
-		private void Frmdeliversaledetail_Load(object sender, EventArgs e)
+		private void Frmbuyer_Load(object sender, EventArgs e)
         {
-		
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new deliversaledetailInfo());
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new buyerInfo(),gridControl1,new []{ "txtbuyercode", "txttotalprice" });
             InitSearchDicData();
+            repositoryItemTextEditrequisitioncode.KeyDown += RepositoryItemTextEditrequisitioncode_KeyDown;
+
+		}
+
+        private void RepositoryItemTextEditrequisitioncode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                using (var db = new MESDB())
+                {
+                   // requisitiondetailInfo requisitiondetail=db.requisitiondetailInfo.Where(p=>p.re)
+                }
+            }
         }
+
         /// <summary>
-		/// 数据源初始化
-		/// </summary>
-		/// <returns></returns>
-		private void Init()
+        /// 数据源初始化
+        /// </summary>
+        /// <returns></returns>
+        private void Init()
 		{
-		
-			
-
-
-				txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
-				repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
-
-
+				txtsupplierid.Properties.DataSource = GetDataTableUtils.SqlTable("物料");     
+				repositoryItemtxtsupplierid.DataSource= GetDataTableUtils.SqlTable("物料");  
+				txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");     
+				repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户");  
 		}
         /// <summary>
 		/// 搜索字段
@@ -48,8 +57,14 @@ namespace MES.Form
 		/// <returns></returns>
         private void InitSearchDicData()
         {
-				fieldDictionary.Add("销售单号","salecode");     
-				fieldDictionary.Add("出库单号","deliversalecode");     
+				fieldDictionary.Add("id","id");     
+				fieldDictionary.Add("采购单号","buyercode");     
+				fieldDictionary.Add("采购日期","buyerdate");     
+				fieldDictionary.Add("供应商","supplierid");     
+				fieldDictionary.Add("供应商编码","suppliercode");     
+				fieldDictionary.Add("完货日期","deliverdate");     
+				fieldDictionary.Add("制单人","creatorId");     
+				fieldDictionary.Add("金额","totalprice");     
 				fieldDictionary.Add("备注","remark");     
         }
 
@@ -57,7 +72,7 @@ namespace MES.Form
         {
 			 using (var con=new MESDB())///
             {
-				grdList.DataSource=con.deliversaledetailInfo.ToList();
+				grdList.DataSource=con.buyerInfo.ToList();
             }
             Init();
 		}
@@ -67,58 +82,40 @@ namespace MES.Form
 		/// <returns></returns>
         public override bool CheckInput()
         {
-			if(string.IsNullOrEmpty(txtdeliversaleid.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txtbuyerdate.EditValue.ToString()))
 			{
-				"出货单不能为空".ShowWarning();
-				txtdeliversaleid.Focus();
+				"采购日期不能为空".ShowWarning();
+				txtbuyerdate.Focus();
 				return false;
 			}
-			if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txtsupplierid.EditValue.ToString()))
 			{
-				"销售单号不能为空".ShowWarning();
-				txtsalecode.Focus();
+				"供应商不能为空".ShowWarning();
+				txtsupplierid.Focus();
 				return false;
 			}
-			if(string.IsNullOrEmpty(txtproductname.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txtsuppliercode.EditValue.ToString()))
 			{
-				"产品名称不能为空".ShowWarning();
-				txtproductname.Focus();
+				"供应商编码不能为空".ShowWarning();
+				txtsuppliercode.Focus();
 				return false;
 			}
-			if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txtdeliverdate.EditValue.ToString()))
 			{
-				"产品编号不能为空".ShowWarning();
-				txtproductcode.Focus();
+				"完货日期不能为空".ShowWarning();
+				txtdeliverdate.Focus();
 				return false;
 			}
-			if(string.IsNullOrEmpty(txtproductspec.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txtcreatorId.EditValue.ToString()))
 			{
-				"规格型号不能为空".ShowWarning();
-				txtproductspec.Focus();
+				"制单人不能为空".ShowWarning();
+				txtcreatorId.Focus();
 				return false;
 			}
-			if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString()))
+			if(string.IsNullOrEmpty(txttotalprice.EditValue.ToString()))
 			{
-				"仓库不能为空".ShowWarning();
-				txtwarehouse.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtnumber.EditValue.ToString()))
-			{
-				"出货数量不能为空".ShowWarning();
-				txtnumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
-			{
-				"计量单位不能为空".ShowWarning();
-				txtunit.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtdeliversalecode.EditValue.ToString()))
-			{
-				"出库单号不能为空".ShowWarning();
-				txtdeliversalecode.Focus();
+				"金额不能为空".ShowWarning();
+				txttotalprice.Focus();
 				return false;
 			}
 			return true;
@@ -131,10 +128,10 @@ namespace MES.Form
         {
             try
             {
-                deliversaledetailInfo info= (deliversaledetailInfo)this.ControlDataToModel(new deliversaledetailInfo());
+                buyerInfo info= (buyerInfo)this.ControlDataToModel(new buyerInfo());
                 using (var db = new MESDB())
                 {
-                    db.deliversaledetailInfo.AddOrUpdate(info);
+                    db.buyerInfo.AddOrUpdate(info);
                     db.SaveChanges();
                 }
             }
@@ -153,7 +150,7 @@ namespace MES.Form
         {
             try
             {
-                deliversaledetailInfo info = (deliversaledetailInfo)this.ControlDataToModel(new deliversaledetailInfo());
+                buyerInfo info = (buyerInfo)this.ControlDataToModel(new buyerInfo());
                 using (var db = new MESDB())
                 {
                     db.Entry(info).State=EntityState.Deleted;
@@ -181,11 +178,11 @@ namespace MES.Form
                 {
                     if (string.IsNullOrEmpty(sql))
                     {
-                        grdList.DataSource = db.deliversaledetailInfo.SqlQuery("select * from deliversaledetail").ToList();
+                        grdList.DataSource = db.buyerInfo.SqlQuery("select * from buyer").ToList();
                     }
                     else
                     {
-                        grdList.DataSource = db.deliversaledetailInfo.SqlQuery($"select * from deliversaledetail where {sql}").ToList();
+                        grdList.DataSource = db.buyerInfo.SqlQuery($"select * from buyer where {sql}").ToList();
                     }
                 }
             }

WinformGeneralDeveloperFrame/Form/Frmdeliversale.cs

@@ -128,6 +128,7 @@ namespace MES.Form
         {
             string code = "SD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
                           DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3");
+
             DataTable dt = gridControl1.DataSource as DataTable;
             try
             {
@@ -151,10 +152,15 @@ namespace MES.Form
                                 {
                                     List<deliversaledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
+                                        num++;
+                                        string codedetail = "SDD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                            DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
                                         a.deliversalecode = info.deliversalecode;
                                         a.deliversaleid = info.id;
+                                        a.deliversaledetailcode = codedetail;
                                     });
                                     db.deliversaledetailInfo.AddRange(detaiListAdd);
                                     db.SaveChanges();
@@ -168,15 +174,21 @@ namespace MES.Form
                                 {
                                     List<deliversaledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
                                         a.deliversalecode = info.deliversalecode;
                                         a.deliversaleid = info.id;
+                                        num++;
+                                        string codedetail = "SDD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                            DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3") + num;
+                                        a.deliversaledetailcode = codedetail;
                                     });
                                     db.deliversaledetailInfo.AddRange(detaiListAdd);
 
                                     List<deliversaledetailInfo> detaiListEdit =
                                         dic["Edit"];
+                                   
                                     detaiListEdit.ForEach((a) =>
                                     {
                                         a.deliversalecode = info.deliversalecode;

WinformGeneralDeveloperFrame/Form/Frmdeliversale.designer.cs

@@ -66,13 +66,13 @@ namespace MES.Form
             this.repositoryItemGridLookUpEditsalecode = new DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit();
             this.repositoryItemGridLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemLookUpEditunit = 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.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemTextEditsalecode = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
@@ -98,6 +98,7 @@ namespace MES.Form
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit();
@@ -117,8 +118,8 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEditsalecode)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsalecode)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcustomerid.Properties)).BeginInit();
@@ -410,7 +411,8 @@ namespace MES.Form
             this.gridColumn18,
             this.gridColumn19,
             this.gridColumn20,
-            this.gridColumn21});
+            this.gridColumn21,
+            this.gridColumn22});
             this.gridView1.GridControl = this.gridControl1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.Editable = false;
@@ -436,7 +438,7 @@ namespace MES.Form
             this.gridColumn13.FieldName = "salecode";
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.VisibleIndex = 1;
             this.gridColumn13.Width = 201;
             // 
             // repositoryItemGridLookUpEditsalecode
@@ -465,19 +467,9 @@ namespace MES.Form
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.OptionsColumn.AllowEdit = false;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 1;
+            this.gridColumn14.VisibleIndex = 2;
             this.gridColumn14.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";
-            // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "产品编号";
@@ -485,7 +477,7 @@ namespace MES.Form
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.OptionsColumn.AllowEdit = false;
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 2;
+            this.gridColumn15.VisibleIndex = 3;
             this.gridColumn15.Width = 201;
             // 
             // gridColumn16
@@ -495,7 +487,7 @@ namespace MES.Form
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.OptionsColumn.AllowEdit = false;
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 3;
+            this.gridColumn16.VisibleIndex = 4;
             this.gridColumn16.Width = 201;
             // 
             // gridColumn17
@@ -506,7 +498,7 @@ namespace MES.Form
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.OptionsColumn.AllowEdit = false;
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 4;
+            this.gridColumn17.VisibleIndex = 5;
             this.gridColumn17.Width = 201;
             // 
             // repositoryItemLookUpEditwarehouse
@@ -525,7 +517,7 @@ namespace MES.Form
             this.gridColumn18.FieldName = "number";
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 5;
+            this.gridColumn18.VisibleIndex = 6;
             this.gridColumn18.Width = 201;
             // 
             // gridColumn19
@@ -536,16 +528,26 @@ namespace MES.Form
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.OptionsColumn.AllowEdit = false;
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 6;
+            this.gridColumn19.VisibleIndex = 7;
             this.gridColumn19.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";
+            // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "出库单号";
             this.gridColumn20.FieldName = "deliversalecode";
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.VisibleIndex = 8;
             this.gridColumn20.Width = 201;
             // 
             // gridColumn21
@@ -554,7 +556,7 @@ namespace MES.Form
             this.gridColumn21.FieldName = "remark";
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 8;
+            this.gridColumn21.VisibleIndex = 9;
             this.gridColumn21.Width = 201;
             // 
             // repositoryItemTextEditsalecode
@@ -808,6 +810,15 @@ namespace MES.Form
             this.layoutControlItem9.Text = "出货单号";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
             // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "明细单号";
+            this.gridColumn22.FieldName = "deliversaledetailcode";
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.OptionsColumn.AllowEdit = false;
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 0;
+            // 
             // Frmdeliversale
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -837,8 +848,8 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEditsalecode)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemGridLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTextEditsalecode)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcustomerid.Properties)).EndInit();
@@ -945,5 +956,6 @@ namespace MES.Form
         private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEditsalecode;
         private DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit repositoryItemGridLookUpEditsalecode;
         private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemGridLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
     }
 }

WinformGeneralDeveloperFrame/Form/Frmdeliversaledetail.designer.cs

@@ -1,680 +0,0 @@
-
-using DevExpress.XtraEditors;
-using DevExpress.XtraLayout;
-using DevExpress.XtraTab;
-
-namespace MES.Form
-{
-    partial class  Frmdeliversaledetail
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-			
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
-            this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
-            this.grdList = new DevExpress.XtraGrid.GridControl();
-            this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();    
-            
-          
-              //////////////////////
-             this.txtid=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtdeliversaleid=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtsalecode=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtproductname=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtproductcode=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtproductspec=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-             this.repositoryItemtxtwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
-
-             this.txtwarehouse=new  DevExpress.XtraEditors.LookUpEdit();
-             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtnumber=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtunit=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtdeliversalecode=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-              //////////////////////
-             this.txtremark=new  DevExpress.XtraEditors.TextEdit();
-             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-
-                        
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-
-             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();            
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversaleid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).BeginInit();
-
-            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).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();
-
-            this.SuspendLayout();
-
-            // layoutControl1
-            //             
-
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(12, 8);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.layoutControlGroup1;
-            layoutControl1.AutoScroll=true; 
-            this.layoutControl1.Size = new System.Drawing.Size(605, 363);
-            this.layoutControl1.TabIndex = 6;
-            this.layoutControl1.Text = "layoutControl1";
-
-            this.layoutControl1.Controls.Add(this.txtid);
-            this.layoutControl1.Controls.Add(this.txtdeliversaleid);
-            this.layoutControl1.Controls.Add(this.txtsalecode);
-            this.layoutControl1.Controls.Add(this.txtproductname);
-            this.layoutControl1.Controls.Add(this.txtproductcode);
-            this.layoutControl1.Controls.Add(this.txtproductspec);
-            this.layoutControl1.Controls.Add(this.txtwarehouse);
-            this.layoutControl1.Controls.Add(this.txtnumber);
-            this.layoutControl1.Controls.Add(this.txtunit);
-            this.layoutControl1.Controls.Add(this.txtdeliversalecode);
-            this.layoutControl1.Controls.Add(this.txtremark);
-//TextEdit
-//DateEdit
-//SimpleButton
-//CheckEdit
-//MemoEdit
-//PictureEdit
-//LookUpEdit
-//ComboBoxEdit
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtid.Location = new System.Drawing.Point(112, 12);
-            this.txtid.Name = "txtid";
-            this.txtid.Size = new System.Drawing.Size(481, 20);
-            this.txtid.StyleController = this.layoutControl1;
-            this.txtid.TabIndex = 1;
-            // 
-            // 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(585, 24);
-            this.layoutControlItem1.Text = "id";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtdeliversaleid.Location = new System.Drawing.Point(112, 36);
-            this.txtdeliversaleid.Name = "txtdeliversaleid";
-            this.txtdeliversaleid.Size = new System.Drawing.Size(481, 20);
-            this.txtdeliversaleid.StyleController = this.layoutControl1;
-            this.txtdeliversaleid.TabIndex = 2;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtdeliversaleid;
-            this.layoutControlItem2.CustomizationFormText = "出货单";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem2.Text = "出货单";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtsalecode.Location = new System.Drawing.Point(112, 60);
-            this.txtsalecode.Name = "txtsalecode";
-            this.txtsalecode.Size = new System.Drawing.Size(481, 20);
-            this.txtsalecode.StyleController = this.layoutControl1;
-            this.txtsalecode.TabIndex = 3;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtsalecode;
-            this.layoutControlItem3.CustomizationFormText = "销售单号";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem3.Text = "销售单号";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtproductname.Location = new System.Drawing.Point(112, 84);
-            this.txtproductname.Name = "txtproductname";
-            this.txtproductname.Size = new System.Drawing.Size(481, 20);
-            this.txtproductname.StyleController = this.layoutControl1;
-            this.txtproductname.TabIndex = 4;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txtproductname;
-            this.layoutControlItem4.CustomizationFormText = "产品名称";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 72);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem4.Text = "产品名称";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtproductcode.Location = new System.Drawing.Point(112, 108);
-            this.txtproductcode.Name = "txtproductcode";
-            this.txtproductcode.Size = new System.Drawing.Size(481, 20);
-            this.txtproductcode.StyleController = this.layoutControl1;
-            this.txtproductcode.TabIndex = 5;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txtproductcode;
-            this.layoutControlItem5.CustomizationFormText = "产品编号";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem5.Text = "产品编号";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtproductspec.Location = new System.Drawing.Point(112, 132);
-            this.txtproductspec.Name = "txtproductspec";
-            this.txtproductspec.Size = new System.Drawing.Size(481, 20);
-            this.txtproductspec.StyleController = this.layoutControl1;
-            this.txtproductspec.TabIndex = 6;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txtproductspec;
-            this.layoutControlItem6.CustomizationFormText = "规格型号";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 120);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem6.Text = "规格型号";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // lookUpEdit1
-            // 
-            this.txtwarehouse.Location = new System.Drawing.Point(120, 60);
-            this.txtwarehouse.Name = "txtwarehouse";
-            this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtwarehouse.Properties.DisplayMember = "Name";
-            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(932, 20);
-            this.txtwarehouse.StyleController = this.layoutControl1;
-            this.txtwarehouse.TabIndex =  7;
-            this.txtwarehouse.EditValue = "";
-
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtwarehouse;
-            this.layoutControlItem7.CustomizationFormText = "仓库";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 144);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem7.Text = "仓库";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtnumber.Location = new System.Drawing.Point(112, 180);
-            this.txtnumber.Name = "txtnumber";
-            this.txtnumber.Size = new System.Drawing.Size(481, 20);
-            this.txtnumber.StyleController = this.layoutControl1;
-            this.txtnumber.TabIndex = 8;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txtnumber;
-            this.layoutControlItem8.CustomizationFormText = "出货数量";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem8.Text = "出货数量";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtunit.Location = new System.Drawing.Point(112, 204);
-            this.txtunit.Name = "txtunit";
-            this.txtunit.Size = new System.Drawing.Size(481, 20);
-            this.txtunit.StyleController = this.layoutControl1;
-            this.txtunit.TabIndex = 9;
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtunit;
-            this.layoutControlItem9.CustomizationFormText = "计量单位";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 192);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem9.Text = "计量单位";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtdeliversalecode.Location = new System.Drawing.Point(112, 228);
-            this.txtdeliversalecode.Name = "txtdeliversalecode";
-            this.txtdeliversalecode.Size = new System.Drawing.Size(481, 20);
-            this.txtdeliversalecode.StyleController = this.layoutControl1;
-            this.txtdeliversalecode.TabIndex = 10;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtdeliversalecode;
-            this.layoutControlItem10.CustomizationFormText = "出库单号";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 216);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem10.Text = "出库单号";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(96, 14);  
-
-            // 
-            // txt${ColumnInfo.Name.Alias.ToCapit()}
-            // 
-            this.txtremark.Location = new System.Drawing.Point(112, 252);
-            this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(481, 20);
-            this.txtremark.StyleController = this.layoutControl1;
-            this.txtremark.TabIndex = 11;
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txtremark;
-            this.layoutControlItem11.CustomizationFormText = "备注";
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 240);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(585, 24);
-            this.layoutControlItem11.Text = "备注";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(96, 14);  
-
-
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-        this.layoutControlItem1
-       ,this.layoutControlItem2
-       ,this.layoutControlItem3
-       ,this.layoutControlItem4
-       ,this.layoutControlItem5
-       ,this.layoutControlItem6
-       ,this.layoutControlItem7
-       ,this.layoutControlItem8
-       ,this.layoutControlItem9
-       ,this.layoutControlItem10
-       ,this.layoutControlItem11
-       });
-            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(605, 363);
-            this.layoutControlGroup1.Text = "layoutControlGroup1";
-            this.layoutControlGroup1.TextVisible = false;          
-
-
-            // 
-            // 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(585, 436);
-            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(579, 407);
-            this.tabDataList.Text = "数据列表";
-            // 
-            // tabDataDetail
-            // 
-            this.tabDataDetail.Controls.Add(this.panelControl2);
-            this.tabDataDetail.Name = "tabDataDetail";
-            this.tabDataDetail.Size = new System.Drawing.Size(579, 407);
-            this.tabDataDetail.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(579, 407);
-            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.gridColumn7,
-			this.gridColumn8,
-			this.gridColumn9,
-			this.gridColumn10,
-			this.gridColumn11,
-			});
-            this.grdListView.OptionsBehavior.Editable = false;
-            this.grdListView.GridControl = this.grdList;
-            this.grdListView.Name = "grdListView";
-            this.grdListView.OptionsView.ColumnAutoWidth=false;
-            this.grdListView.BestFitColumns();
-            // 
-            // 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(579, 407);
-            this.panelControl2.TabIndex = 0;
-
-            ////////////////////////////////
-			(this.gridColumn1).Caption = "id";
-			(this.gridColumn1).Name = "gridColumn1";
-			(this.gridColumn1).FieldName =  "id";
-            ////////////////////////////////
-			(this.gridColumn2).Caption = "出货单";
-			(this.gridColumn2).Name = "gridColumn2";
-			(this.gridColumn2).FieldName =  "deliversaleid";
-            ////////////////////////////////
-			(this.gridColumn3).Caption = "销售单号";
-			(this.gridColumn3).Name = "gridColumn3";
-			(this.gridColumn3).FieldName =  "salecode";
-            (this.gridColumn3).Visible = true;
-            (this.gridColumn3).VisibleIndex = 3;
-
-            ////////////////////////////////
-			(this.gridColumn4).Caption = "产品名称";
-			(this.gridColumn4).Name = "gridColumn4";
-			(this.gridColumn4).FieldName =  "productname";
-            (this.gridColumn4).Visible = true;
-            (this.gridColumn4).VisibleIndex = 4;
-
-            ////////////////////////////////
-			(this.gridColumn5).Caption = "产品编号";
-			(this.gridColumn5).Name = "gridColumn5";
-			(this.gridColumn5).FieldName =  "productcode";
-            (this.gridColumn5).Visible = true;
-            (this.gridColumn5).VisibleIndex = 5;
-
-            ////////////////////////////////
-			(this.gridColumn6).Caption = "规格型号";
-			(this.gridColumn6).Name = "gridColumn6";
-			(this.gridColumn6).FieldName =  "productspec";
-            (this.gridColumn6).Visible = true;
-            (this.gridColumn6).VisibleIndex = 6;
-
-            (this.gridColumn7).ColumnEdit = this.repositoryItemtxtwarehouse;
-            this.repositoryItemtxtwarehouse.AutoHeight = false;
-            this.repositoryItemtxtwarehouse.DisplayMember = "Name";
-            this.repositoryItemtxtwarehouse.ValueMember = "ID";
-            this.repositoryItemtxtwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemtxtwarehouse.Name = "repositoryItemtxtwarehouse";
-			(this.gridColumn7).Caption = "仓库";
-			(this.gridColumn7).Name = "gridColumn7";
-			(this.gridColumn7).FieldName =  "warehouse";
-            (this.gridColumn7).Visible = true;
-            (this.gridColumn7).VisibleIndex = 7;
-
-            ////////////////////////////////
-			(this.gridColumn8).Caption = "出货数量";
-			(this.gridColumn8).Name = "gridColumn8";
-			(this.gridColumn8).FieldName =  "number";
-            (this.gridColumn8).Visible = true;
-            (this.gridColumn8).VisibleIndex = 8;
-
-            ////////////////////////////////
-			(this.gridColumn9).Caption = "计量单位";
-			(this.gridColumn9).Name = "gridColumn9";
-			(this.gridColumn9).FieldName =  "unit";
-            (this.gridColumn9).Visible = true;
-            (this.gridColumn9).VisibleIndex = 9;
-
-            ////////////////////////////////
-			(this.gridColumn10).Caption = "出库单号";
-			(this.gridColumn10).Name = "gridColumn10";
-			(this.gridColumn10).FieldName =  "deliversalecode";
-            (this.gridColumn10).Visible = true;
-            (this.gridColumn10).VisibleIndex = 10;
-
-            ////////////////////////////////
-			(this.gridColumn11).Caption = "备注";
-			(this.gridColumn11).Name = "gridColumn11";
-			(this.gridColumn11).FieldName =  "remark";
-            (this.gridColumn11).Visible = true;
-            (this.gridColumn11).VisibleIndex = 11;
-
-			
-            // 
-            // XtraForm1
-            // 
-            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 = "Frmdeliversaledetail";
-            this.Text = "Frmdeliversaledetail";
-            this.Load += new System.EventHandler(this.Frmdeliversaledetail_Load);
-            this.Controls.SetChildIndex(this.xtraTabControl1, 0);
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversaleid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit();
-
-            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            /////////////////////////
-            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.tabDataList.ResumeLayout(false);
-            this.tabDataDetail.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).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.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.XtraEditors.TextEdit txtid;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtdeliversaleid;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtsalecode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductname;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductcode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductspec;
-        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtwarehouse;
-
-        private DevExpress.XtraEditors.LookUpEdit txtwarehouse;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtnumber;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtunit;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtdeliversalecode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtremark;
-
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-    }
-}

WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs

@@ -16,6 +16,7 @@ using CCWin.SkinClass;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Repository;
 using DevExpress.XtraTreeList;
+using DevExpress.XtraTreeList.Nodes;
 
 namespace MES.Form
 {
@@ -29,7 +30,7 @@ namespace MES.Form
 		private void FrmproductBOM_Load(object sender, EventArgs e)
         {
 		
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productBOMInfo(), treeList1, new []{ "txtproductBOMcode" });
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productBOMInfo(), treeList1, new []{ "txtproductBOMcode" , "txtunitcost" });
             InitSearchDicData();
             repositoryItemLookUpEditmaterialname.EditValueChanged += RepositoryItemLookUpEditmaterialname_EditValueChanged;
         }
@@ -59,6 +60,10 @@ namespace MES.Form
         /// <returns></returns>
         private void Init()
 		{
+            txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");
+            repositoryItemtxtcreatorId.DataSource = GetDataTableUtils.SqlTable("用户");
+            txteditorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");
+            repositoryItemtxteditorId.DataSource = GetDataTableUtils.SqlTable("用户");
             txtcustomerid.Properties.DataSource = GetDataTableUtils.SqlTable("客户");     
 			repositoryItemtxtcustomerid.DataSource= GetDataTableUtils.SqlTable("客户");  
 			txtproductid.Properties.DataSource = GetDataTableUtils.SqlTable("产品");     
@@ -358,8 +363,30 @@ namespace MES.Form
                 treeList1.FocusedNode["unitusenumber"].ToDecimal(0));
 
             treeList1.BestFitColumns();
+            decimal totalprice = 0;
+            foreach (TreeListNode node in treeList1.Nodes)
+            {
+                totalprice += sumNode(node);
+            }
+
+            txtunitcost.Text = totalprice.ToString();
         }
 
+        private decimal sumNode(TreeListNode node)
+        {
+            decimal sum = 0;
+            if (node.Nodes.Count == 0)
+            {
+                sum = node.GetValue("money").ToDecimal(0);
+                return sum;
+            }
+            sum += node.GetValue("money").ToDecimal(0);
+            foreach (TreeListNode item in node.Nodes)
+            {
+                sum += item.GetValue("money").ToDecimal(0);
+            }
+            return sum;
+        }
         private void txtcustomerid_EditValueChanged(object sender, EventArgs e)
         {
             using (var db = new MESDB())
@@ -396,5 +423,6 @@ namespace MES.Form
                 }
             }
         }
+
     }
 }

WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs

@@ -53,9 +53,20 @@ namespace MES.Form
             this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
             this.grdList = new DevExpress.XtraGrid.GridControl();
             this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxteditorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
             this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txteditTime = new DevExpress.XtraEditors.DateEdit();
+            this.txtcreateTime = new DevExpress.XtraEditors.DateEdit();
+            this.txteditorId = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtunitcost = new DevExpress.XtraEditors.TextEdit();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.treeList1 = new DevExpress.XtraTreeList.TreeList();
@@ -104,8 +115,12 @@ namespace MES.Form
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtunitcost = new DevExpress.XtraEditors.TextEdit();
             this.txtunitcost111 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.treeListColumn6 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit();
@@ -115,11 +130,20 @@ namespace MES.Form
             this.tabDataList.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxteditorId)).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.txteditTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txteditorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunitcost.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -151,8 +175,11 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtunitcost.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtunitcost111)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             this.SuspendLayout();
             // 
             // gridColumn1
@@ -320,6 +347,9 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
+            this.grdList.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemtxtcreatorId,
+            this.repositoryItemtxteditorId});
             this.grdList.Size = new System.Drawing.Size(1021, 681);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -338,12 +368,74 @@ namespace MES.Form
             this.gridColumn8,
             this.gridColumn9,
             this.gridColumn10,
-            this.gridColumn11});
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15});
             this.grdListView.GridControl = this.grdList;
             this.grdListView.Name = "grdListView";
             this.grdListView.OptionsBehavior.Editable = false;
             this.grdListView.OptionsView.ColumnAutoWidth = false;
             // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "创建人";
+            this.gridColumn12.ColumnEdit = this.repositoryItemtxtcreatorId;
+            this.gridColumn12.FieldName = "creatorId";
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 10;
+            // 
+            // 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.NullText = "";
+            this.repositoryItemtxtcreatorId.ValueMember = "ID";
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "创建时间";
+            this.gridColumn13.DisplayFormat.FormatString = "G";
+            this.gridColumn13.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn13.FieldName = "createTime";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 11;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "编辑人";
+            this.gridColumn14.ColumnEdit = this.repositoryItemtxteditorId;
+            this.gridColumn14.FieldName = "editorId";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 12;
+            // 
+            // repositoryItemtxteditorId
+            // 
+            this.repositoryItemtxteditorId.AutoHeight = false;
+            this.repositoryItemtxteditorId.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxteditorId.DisplayMember = "Name";
+            this.repositoryItemtxteditorId.Name = "repositoryItemtxteditorId";
+            this.repositoryItemtxteditorId.NullText = "";
+            this.repositoryItemtxteditorId.ValueMember = "ID";
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "编辑时间";
+            this.gridColumn15.DisplayFormat.FormatString = "G";
+            this.gridColumn15.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn15.FieldName = "editTime";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 13;
+            // 
             // tabDataDetail
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
@@ -362,6 +454,10 @@ namespace MES.Form
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.txteditTime);
+            this.layoutControl1.Controls.Add(this.txtcreateTime);
+            this.layoutControl1.Controls.Add(this.txteditorId);
+            this.layoutControl1.Controls.Add(this.txtcreatorId);
             this.layoutControl1.Controls.Add(this.txtunitcost);
             this.layoutControl1.Controls.Add(this.xtraTabControl2);
             this.layoutControl1.Controls.Add(this.txtid);
@@ -383,12 +479,78 @@ namespace MES.Form
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txteditTime
+            // 
+            this.txteditTime.EditValue = null;
+            this.txteditTime.Location = new System.Drawing.Point(562, 156);
+            this.txteditTime.Name = "txteditTime";
+            this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txteditTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txteditTime.Properties.DisplayFormat.FormatString = "G";
+            this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txteditTime.Properties.EditFormat.FormatString = "G";
+            this.txteditTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txteditTime.Size = new System.Drawing.Size(443, 20);
+            this.txteditTime.StyleController = this.layoutControl1;
+            this.txteditTime.TabIndex = 1;
+            // 
+            // txtcreateTime
+            // 
+            this.txtcreateTime.EditValue = null;
+            this.txtcreateTime.Location = new System.Drawing.Point(562, 132);
+            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(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtcreateTime.Properties.DisplayFormat.FormatString = "G";
+            this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtcreateTime.Properties.EditFormat.FormatString = "G";
+            this.txtcreateTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtcreateTime.Size = new System.Drawing.Size(443, 20);
+            this.txtcreateTime.StyleController = this.layoutControl1;
+            this.txtcreateTime.TabIndex = 1;
+            // 
+            // txteditorId
+            // 
+            this.txteditorId.Location = new System.Drawing.Point(64, 156);
+            this.txteditorId.Name = "txteditorId";
+            this.txteditorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txteditorId.Properties.DisplayMember = "Name";
+            this.txteditorId.Properties.ValueMember = "ID";
+            this.txteditorId.Size = new System.Drawing.Size(442, 20);
+            this.txteditorId.StyleController = this.layoutControl1;
+            this.txteditorId.TabIndex = 1;
+            // 
+            // txtcreatorId
+            // 
+            this.txtcreatorId.Location = new System.Drawing.Point(64, 132);
+            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.ValueMember = "ID";
+            this.txtcreatorId.Size = new System.Drawing.Size(442, 20);
+            this.txtcreatorId.StyleController = this.layoutControl1;
+            this.txtcreatorId.TabIndex = 1;
+            // 
+            // txtunitcost
+            // 
+            this.txtunitcost.Location = new System.Drawing.Point(64, 180);
+            this.txtunitcost.Name = "txtunitcost";
+            this.txtunitcost.Size = new System.Drawing.Size(442, 20);
+            this.txtunitcost.StyleController = this.layoutControl1;
+            this.txtunitcost.TabIndex = 1;
+            // 
             // xtraTabControl2
             // 
-            this.xtraTabControl2.Location = new System.Drawing.Point(12, 156);
+            this.xtraTabControl2.Location = new System.Drawing.Point(12, 204);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(993, 509);
+            this.xtraTabControl2.Size = new System.Drawing.Size(993, 461);
             this.xtraTabControl2.TabIndex = 12;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1});
@@ -397,7 +559,7 @@ namespace MES.Form
             // 
             this.xtraTabPage1.Controls.Add(this.treeList1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(987, 480);
+            this.xtraTabPage1.Size = new System.Drawing.Size(987, 432);
             this.xtraTabPage1.Text = "物料清单";
             // 
             // treeList1
@@ -417,7 +579,8 @@ namespace MES.Form
             this.treeListColumn13,
             this.treeListColumn14,
             this.treeListColumn15,
-            this.treeListColumn16});
+            this.treeListColumn16,
+            this.treeListColumn6});
             this.treeList1.ContextMenuStrip = this.contextMenuStrip1;
             this.treeList1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.treeList1.KeyFieldName = "id";
@@ -427,7 +590,7 @@ namespace MES.Form
             this.treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemLookUpEditmaterialtype,
             this.repositoryItemLookUpEditmaterialname});
-            this.treeList1.Size = new System.Drawing.Size(987, 480);
+            this.treeList1.Size = new System.Drawing.Size(987, 432);
             this.treeList1.TabIndex = 0;
             this.treeList1.ValidateNode += new DevExpress.XtraTreeList.ValidateNodeEventHandler(this.treeList1_ValidateNode);
             // 
@@ -558,10 +721,13 @@ namespace MES.Form
             // 
             // treeListColumn15
             // 
+            this.treeListColumn15.AllNodesSummary = true;
             this.treeListColumn15.Caption = "金额";
             this.treeListColumn15.FieldName = "money";
             this.treeListColumn15.Name = "treeListColumn15";
             this.treeListColumn15.OptionsColumn.AllowEdit = false;
+            this.treeListColumn15.RowFooterSummary = DevExpress.XtraTreeList.SummaryItemType.Sum;
+            this.treeListColumn15.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
             this.treeListColumn15.Visible = true;
             this.treeListColumn15.VisibleIndex = 8;
             // 
@@ -715,7 +881,7 @@ namespace MES.Form
             // 
             // txtremark
             // 
-            this.txtremark.Location = new System.Drawing.Point(562, 132);
+            this.txtremark.Location = new System.Drawing.Point(562, 180);
             this.txtremark.Name = "txtremark";
             this.txtremark.Size = new System.Drawing.Size(443, 20);
             this.txtremark.StyleController = this.layoutControl1;
@@ -738,7 +904,11 @@ namespace MES.Form
             this.layoutControlItem12,
             this.layoutControlItem5,
             this.layoutControlItem4,
-            this.txtunitcost111});
+            this.txtunitcost111,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
+            this.layoutControlItem16});
             this.layoutControlGroup1.Name = "layoutControlGroup1";
             this.layoutControlGroup1.Size = new System.Drawing.Size(1017, 677);
             this.layoutControlGroup1.TextVisible = false;
@@ -787,7 +957,7 @@ namespace MES.Form
             // 
             this.layoutControlItem11.Control = this.txtremark;
             this.layoutControlItem11.CustomizationFormText = "备注";
-            this.layoutControlItem11.Location = new System.Drawing.Point(498, 120);
+            this.layoutControlItem11.Location = new System.Drawing.Point(498, 168);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.Size = new System.Drawing.Size(499, 24);
             this.layoutControlItem11.Text = "备注";
@@ -836,9 +1006,9 @@ namespace MES.Form
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.xtraTabControl2;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 144);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 192);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(997, 513);
+            this.layoutControlItem12.Size = new System.Drawing.Size(997, 465);
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
@@ -862,23 +1032,59 @@ namespace MES.Form
             this.layoutControlItem4.Text = "产品编号";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(49, 14);
             // 
-            // txtunitcost
-            // 
-            this.txtunitcost.Location = new System.Drawing.Point(64, 132);
-            this.txtunitcost.Name = "txtunitcost";
-            this.txtunitcost.Size = new System.Drawing.Size(442, 20);
-            this.txtunitcost.StyleController = this.layoutControl1;
-            this.txtunitcost.TabIndex = 1;
-            // 
             // txtunitcost111
             // 
             this.txtunitcost111.Control = this.txtunitcost;
-            this.txtunitcost111.Location = new System.Drawing.Point(0, 120);
+            this.txtunitcost111.Location = new System.Drawing.Point(0, 168);
             this.txtunitcost111.Name = "txtunitcost111";
             this.txtunitcost111.Size = new System.Drawing.Size(498, 24);
             this.txtunitcost111.Text = "单位成本";
             this.txtunitcost111.TextSize = new System.Drawing.Size(49, 14);
             // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txtcreatorId;
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem13.Text = "创建人";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(49, 14);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txteditorId;
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 144);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem14.Text = "编辑人";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(49, 14);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txtcreateTime;
+            this.layoutControlItem15.Location = new System.Drawing.Point(498, 120);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem15.Text = "创建时间";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(49, 14);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txteditTime;
+            this.layoutControlItem16.Location = new System.Drawing.Point(498, 144);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem16.Text = "编辑时间";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(49, 14);
+            // 
+            // treeListColumn6
+            // 
+            this.treeListColumn6.Caption = "明细编号";
+            this.treeListColumn6.FieldName = "productBOMdetailcode";
+            this.treeListColumn6.Name = "treeListColumn6";
+            this.treeListColumn6.Visible = true;
+            this.treeListColumn6.VisibleIndex = 10;
+            // 
             // FrmproductBOM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -898,11 +1104,20 @@ namespace MES.Form
             this.tabDataList.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxteditorId)).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.txteditTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txteditTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txteditorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunitcost.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -934,8 +1149,11 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtunitcost.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtunitcost111)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1027,5 +1245,20 @@ namespace MES.Form
         private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialname;
         private TextEdit txtunitcost;
         private LayoutControlItem txtunitcost111;
+        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 DateEdit txteditTime;
+        private DateEdit txtcreateTime;
+        private LookUpEdit txteditorId;
+        private LookUpEdit txtcreatorId;
+        private LayoutControlItem layoutControlItem13;
+        private LayoutControlItem layoutControlItem14;
+        private LayoutControlItem layoutControlItem15;
+        private LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxteditorId;
+        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn6;
     }
 }

WinformGeneralDeveloperFrame/Form/FrmproductBOMdetail.cs

@@ -1,244 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using WinformGeneralDeveloperFrame;
-using WinformGeneralDeveloperFrame.Commons;
-using DevExpress.XtraLayout;
-using MES.Entity;
-using System.Data.Entity.Migrations;
-using System.Data.Entity;
-namespace MES.Form
-{
-	public partial class FrmproductBOMdetail : FrmBaseForm
-	{
-        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
-		public FrmproductBOMdetail()
-		{
-			InitializeComponent();
-		}
-		private void FrmproductBOMdetail_Load(object sender, EventArgs e)
-        {
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productBOMdetailInfo());
-            InitSearchDicData();
-        }
-        /// <summary>
-		/// 数据源初始化
-		/// </summary>
-		/// <returns></returns>
-		private void Init()
-		{
-				txtpid.Properties.DataSource = GetDataTableUtils.SqlTable("物料tree");     
-				repositoryItemTreeListtxtpid.DataSource= GetDataTableUtils.SqlTable("物料tree");  
-				txtmaterialname.Properties.DataSource = GetDataTableUtils.SqlTable("物料tree");     
-				repositoryItemTreeListtxtmaterialname.DataSource= GetDataTableUtils.SqlTable("物料tree");  
-				txtmaterialtype.Properties.DataSource = GetDataTableUtils.SqlTable("物料类别");     
-				repositoryItemtxtmaterialtype.DataSource= GetDataTableUtils.SqlTable("物料类别");  
-				txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位");     
-				repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位");  
-				txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
-				repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
-		}
-        /// <summary>
-		/// 搜索字段
-		/// </summary>
-		/// <returns></returns>
-        private void InitSearchDicData()
-        {
-				fieldDictionary.Add("id","id");     
-				fieldDictionary.Add("父项","pid");     
-				fieldDictionary.Add("BOM主表","productBOMid");     
-				fieldDictionary.Add("BOM编号","productBOMcode");     
-				fieldDictionary.Add("产品编号","productcode");     
-				fieldDictionary.Add("物料id","materialid");     
-				fieldDictionary.Add("物料名称","materialname");     
-				fieldDictionary.Add("物料编号","materialcode");     
-				fieldDictionary.Add("规格型号","materialspec");     
-				fieldDictionary.Add("物料类型","materialtype");     
-				fieldDictionary.Add("单位用量","unitusenumber");     
-				fieldDictionary.Add("计量单位","unit");     
-				fieldDictionary.Add("仓库","warehouse");     
-				fieldDictionary.Add("单价","unitprice");     
-				fieldDictionary.Add("金额","money");     
-				fieldDictionary.Add("备注","remark");     
-        }
-
-		public override void InitgrdListDataSource()
-        {
-			 using (var con=new MESDB())///
-            {
-				grdList.DataSource=con.productBOMdetailInfo.ToList();
-            }
-            Init();
-		}
-	    /// <summary>
-		/// 字段为空校验
-		/// </summary>
-		/// <returns></returns>
-        public override bool CheckInput()
-        {
-			if(string.IsNullOrEmpty(txtpid.EditValue.ToString()))
-			{
-				"父项不能为空".ShowWarning();
-				txtpid.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductBOMid.EditValue.ToString()))
-			{
-				"BOM主表不能为空".ShowWarning();
-				txtproductBOMid.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductBOMcode.EditValue.ToString()))
-			{
-				"BOM编号不能为空".ShowWarning();
-				txtproductBOMcode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString()))
-			{
-				"产品编号不能为空".ShowWarning();
-				txtproductcode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialid.EditValue.ToString()))
-			{
-				"物料id不能为空".ShowWarning();
-				txtmaterialid.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialname.EditValue.ToString()))
-			{
-				"物料名称不能为空".ShowWarning();
-				txtmaterialname.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialcode.EditValue.ToString()))
-			{
-				"物料编号不能为空".ShowWarning();
-				txtmaterialcode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialspec.EditValue.ToString()))
-			{
-				"规格型号不能为空".ShowWarning();
-				txtmaterialspec.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialtype.EditValue.ToString()))
-			{
-				"物料类型不能为空".ShowWarning();
-				txtmaterialtype.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunitusenumber.EditValue.ToString()))
-			{
-				"单位用量不能为空".ShowWarning();
-				txtunitusenumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
-			{
-				"计量单位不能为空".ShowWarning();
-				txtunit.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString()))
-			{
-				"仓库不能为空".ShowWarning();
-				txtwarehouse.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunitprice.EditValue.ToString()))
-			{
-				"单价不能为空".ShowWarning();
-				txtunitprice.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmoney.EditValue.ToString()))
-			{
-				"金额不能为空".ShowWarning();
-				txtmoney.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtremark.EditValue.ToString()))
-			{
-				"备注不能为空".ShowWarning();
-				txtremark.Focus();
-				return false;
-			}
-			return true;
-        }
-        /// <summary>
-		/// 保存
-		/// </summary>
-		/// <returns></returns>
-		public override bool SaveFunction()
-        {
-            try
-            {
-                productBOMdetailInfo info= (productBOMdetailInfo)this.ControlDataToModel(new productBOMdetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.productBOMdetailInfo.AddOrUpdate(info);
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 删除
-		/// </summary>
-		/// <returns></returns>
-		public override bool DelFunction()
-        {
-            try
-            {
-                productBOMdetailInfo info = (productBOMdetailInfo)this.ControlDataToModel(new productBOMdetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.Entry(info).State=EntityState.Deleted;
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 搜索
-		/// </summary>
-		/// <returns></returns>
-        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.productBOMdetailInfo.SqlQuery("select * from productBOMdetail").ToList();
-                    }
-                    else
-                    {
-                        grdList.DataSource = db.productBOMdetailInfo.SqlQuery($"select * from productBOMdetail where {sql}").ToList();
-                    }
-                }
-            }
-        }
-	}
-}

WinformGeneralDeveloperFrame/Form/Frmquotation.cs

@@ -26,7 +26,7 @@ namespace MES.Form
 		}
 		private void Frmquotation_Load(object sender, EventArgs e)
         {
-            InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new quotationInfo(),gridControl1,new string[]{ "txtquotationcode" , "txtquotationdate" });
+            InitFrom(xtraTabControl1,grdList,grdListView,new []{layoutControlGroup1},new quotationInfo(),gridControl1,new []{ "txtquotationcode" , "txtquotationdate", "txttotalprice" });
             InitSearchDicData();
             repositoryItemtxtproductid.EditValueChanged += RepositoryItemtxtproductid_EditValueChanged;
         }
@@ -183,7 +183,16 @@ namespace MES.Form
                                 {
                                     List<quotationdetailInfo> detaiListAdd =
                                         dic["Add"];
-                                    detaiListAdd.ForEach(a=>a.quotationid=info.id);
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a=>
+                                    {
+                                        num ++;
+                                        a.quotationid = info.id;
+                                        string codedetail = "KHD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                      DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.quotationdetailcode = codedetail;
+                                        a.quotationcode = info.quotationcode;
+                                    });
                                     db.quotationdetailInfo.AddRange(detaiListAdd);
                                     db.SaveChanges();
                                 }
@@ -197,7 +206,16 @@ namespace MES.Form
                                 {
                                     List<quotationdetailInfo> detaiListAdd =
                                         dic["Add"];
-                                    detaiListAdd.ForEach(a => a.quotationid = info.id);
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a =>
+                                    {
+                                        num++;
+                                        a.quotationid = info.id;
+                                        string codedetail = "KHD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                            DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.quotationdetailcode = codedetail;
+                                        a.quotationcode = info.quotationcode;
+                                    });
                                     db.quotationdetailInfo.AddRange(detaiListAdd);
 
                                     List<quotationdetailInfo> detaiListEdit =
@@ -352,6 +370,12 @@ namespace MES.Form
                                                          ;
             }
             gridView1.BestFitColumns();
+            
+        }
+
+        private void gridView1_RowUpdated(object sender, DevExpress.XtraGrid.Views.Base.RowObjectEventArgs e)
+        {
+            txttotalprice.Text = gridColumn17.SummaryItem.SummaryValue.ToString();
         }
     }
 }

WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs

@@ -52,9 +52,11 @@ namespace MES.Form
             this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
             this.grdList = new DevExpress.XtraGrid.GridControl();
             this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
             this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txttotalprice = new DevExpress.XtraEditors.TextEdit();
             this.gridControl1 = new DevExpress.XtraGrid.GridControl();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem();
@@ -98,9 +100,8 @@ namespace MES.Form
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txttotalprice = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomeruser)).BeginInit();
@@ -115,6 +116,7 @@ namespace MES.Form
             this.panelControl2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
             this.contextMenuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -144,7 +146,6 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             this.SuspendLayout();
             // 
@@ -325,6 +326,14 @@ namespace MES.Form
             this.grdListView.Name = "grdListView";
             this.grdListView.OptionsBehavior.Editable = false;
             // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "总价";
+            this.gridColumn23.FieldName = "totalprice";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 9;
+            // 
             // tabDataDetail
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
@@ -363,6 +372,14 @@ namespace MES.Form
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txttotalprice
+            // 
+            this.txttotalprice.Location = new System.Drawing.Point(63, 108);
+            this.txttotalprice.Name = "txttotalprice";
+            this.txttotalprice.Size = new System.Drawing.Size(580, 20);
+            this.txttotalprice.StyleController = this.layoutControl1;
+            this.txttotalprice.TabIndex = 12;
+            // 
             // gridControl1
             // 
             this.gridControl1.ContextMenuStrip = this.contextMenuStrip1;
@@ -415,12 +432,14 @@ namespace MES.Form
             this.gridColumn19,
             this.gridColumn20,
             this.gridColumn21,
-            this.gridColumn22});
+            this.gridColumn22,
+            this.gridColumn24});
             this.gridView1.GridControl = this.gridControl1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.Editable = false;
             this.gridView1.OptionsView.ShowFooter = true;
             this.gridView1.ValidateRow += new DevExpress.XtraGrid.Views.Base.ValidateRowEventHandler(this.gridView1_ValidateRow);
+            this.gridView1.RowUpdated += new DevExpress.XtraGrid.Views.Base.RowObjectEventHandler(this.gridView1_RowUpdated);
             // 
             // gridColumn12
             // 
@@ -441,7 +460,7 @@ namespace MES.Form
             this.productid.FieldName = "productid";
             this.productid.Name = "productid";
             this.productid.Visible = true;
-            this.productid.VisibleIndex = 0;
+            this.productid.VisibleIndex = 1;
             this.productid.Width = 201;
             // 
             // repositoryItemtxtproductid
@@ -460,7 +479,7 @@ namespace MES.Form
             this.gridColumn13.FieldName = "spec";
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 1;
+            this.gridColumn13.VisibleIndex = 2;
             this.gridColumn13.Width = 201;
             // 
             // gridColumn14
@@ -469,7 +488,7 @@ namespace MES.Form
             this.gridColumn14.FieldName = "number";
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 2;
+            this.gridColumn14.VisibleIndex = 3;
             this.gridColumn14.Width = 201;
             // 
             // gridColumn15
@@ -479,7 +498,7 @@ namespace MES.Form
             this.gridColumn15.FieldName = "unit";
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 3;
+            this.gridColumn15.VisibleIndex = 4;
             this.gridColumn15.Width = 201;
             // 
             // repositoryItemtxtunit
@@ -498,7 +517,7 @@ namespace MES.Form
             this.gridColumn16.FieldName = "unitprice";
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 4;
+            this.gridColumn16.VisibleIndex = 5;
             this.gridColumn16.Width = 201;
             // 
             // gridColumn17
@@ -509,7 +528,7 @@ namespace MES.Form
             this.gridColumn17.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "money", "总金额={0:0.##}")});
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 5;
+            this.gridColumn17.VisibleIndex = 6;
             this.gridColumn17.Width = 201;
             // 
             // gridColumn18
@@ -519,7 +538,7 @@ namespace MES.Form
             this.gridColumn18.FieldName = "stockid";
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 6;
+            this.gridColumn18.VisibleIndex = 7;
             this.gridColumn18.Width = 201;
             // 
             // repositoryItemtxtstockid
@@ -538,7 +557,7 @@ namespace MES.Form
             this.gridColumn19.FieldName = "productcode";
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 7;
+            this.gridColumn19.VisibleIndex = 8;
             this.gridColumn19.Width = 201;
             // 
             // gridColumn20
@@ -547,7 +566,7 @@ namespace MES.Form
             this.gridColumn20.FieldName = "quotationcode";
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 8;
+            this.gridColumn20.VisibleIndex = 9;
             this.gridColumn20.Width = 201;
             // 
             // gridColumn21
@@ -562,7 +581,7 @@ namespace MES.Form
             this.gridColumn22.FieldName = "remark";
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.VisibleIndex = 10;
             this.gridColumn22.Width = 201;
             // 
             // txtid
@@ -813,14 +832,6 @@ namespace MES.Form
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
-            // txttotalprice
-            // 
-            this.txttotalprice.Location = new System.Drawing.Point(63, 108);
-            this.txttotalprice.Name = "txttotalprice";
-            this.txttotalprice.Size = new System.Drawing.Size(580, 20);
-            this.txttotalprice.StyleController = this.layoutControl1;
-            this.txttotalprice.TabIndex = 12;
-            // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txttotalprice;
@@ -830,13 +841,14 @@ namespace MES.Form
             this.layoutControlItem12.Text = "总价";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(48, 14);
             // 
-            // gridColumn23
+            // gridColumn24
             // 
-            this.gridColumn23.Caption = "总价";
-            this.gridColumn23.FieldName = "totalprice";
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 8;
+            this.gridColumn24.Caption = "明细单号";
+            this.gridColumn24.FieldName = "quotationdetailcode";
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.OptionsColumn.AllowEdit = false;
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 0;
             // 
             // Frmquotation
             // 
@@ -862,6 +874,7 @@ namespace MES.Form
             this.panelControl2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
             this.contextMenuStrip1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -891,7 +904,6 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             this.ResumeLayout(false);
 
@@ -978,5 +990,6 @@ namespace MES.Form
         private TextEdit txttotalprice;
         private LayoutControlItem layoutControlItem12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
     }
 }

WinformGeneralDeveloperFrame/Form/Frmrequisition.cs

@@ -0,0 +1,321 @@
+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.XtraEditors;
+
+namespace MES.Form
+{
+	public partial class Frmrequisition : FrmBaseForm
+	{
+        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
+		public Frmrequisition()
+		{
+			InitializeComponent();
+		}
+		private void Frmrequisition_Load(object sender, EventArgs e)
+        {
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new requisitionInfo(),gridControl1,new []{ "txtrequisitioncode" , "txttotalprice" });
+            InitSearchDicData();
+            repositoryItemLookUpEditmaterialid.EditValueChanged += RepositoryItemLookUpEditmaterialid_EditValueChanged;
+        }
+
+        private void RepositoryItemLookUpEditmaterialid_EditValueChanged(object sender, EventArgs e)
+        {
+            using (var db = new MESDB())
+            {
+                LookUpEdit lookUpEdit = sender as LookUpEdit;
+                int materialid = lookUpEdit.EditValue.ToString().ToInt16();
+                materialInfo material = db.materialInfo.Find(materialid);
+                if (material != null)
+                {
+                    gridView1.GetFocusedDataRow()["materialcode"] = material.code;
+                    gridView1.GetFocusedDataRow()["materialspec"] = material.spec;
+                    gridView1.GetFocusedDataRow()["materialunit"] = material.unit;
+                    gridView1.GetFocusedDataRow()["unitprice"] = material.referprice;
+                    gridView1.GetFocusedDataRow()["warehouse"] = material.warehouse;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 数据源初始化
+        /// </summary>
+        /// <returns></returns>
+        private void Init()
+		{
+				txtdeptid.Properties.DataSource = GetDataTableUtils.SqlTable("部门");     
+				repositoryItemtxtdeptid.DataSource= GetDataTableUtils.SqlTable("部门");  
+				txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");     
+				repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户");
+
+                repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料");
+                repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库");
+                repositoryItemLookUpEditmaterialunit.DataSource = GetDataTableUtils.SqlTable("计量单位");
+
+        }
+        /// <summary>
+		/// 搜索字段
+		/// </summary>
+		/// <returns></returns>
+        private void InitSearchDicData()
+        {
+				fieldDictionary.Add("请购单编号","requisitioncode");     
+        }
+
+		public override void InitgrdListDataSource()
+        {
+			 using (var con=new MESDB())///
+            {
+				grdList.DataSource=con.requisitionInfo.ToList();
+            }
+            Init();
+		}
+	    /// <summary>
+		/// 字段为空校验
+		/// </summary>
+		/// <returns></returns>
+        public override bool CheckInput()
+        {
+            if(string.IsNullOrEmpty(txtdeptid.EditValue.ToString()))
+			{
+				"请购部门不能为空".ShowWarning();
+				txtdeptid.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtrequisitiondate.EditValue.ToString()))
+			{
+				"请购日期不能为空".ShowWarning();
+				txtrequisitiondate.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtdeliverdate.ToString()))
+			{
+				"交货日期不能为空".ShowWarning();
+				txtdeliverdate.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtcreatorId.EditValue.ToString()))
+			{
+				"制单人不能为空".ShowWarning();
+				txtcreatorId.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txttotalprice.EditValue.ToString()))
+			{
+				"金额不能为空".ShowWarning();
+				txttotalprice.Focus();
+				return false;
+			}
+			return true;
+        }
+        /// <summary>
+		/// 保存
+		/// </summary>
+		/// <returns></returns>
+		public override bool SaveFunction()
+        {
+            string code = "QG" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                        DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3");
+            DataTable dt = gridControl1.DataSource as DataTable;
+            try
+            {
+                requisitionInfo info = (requisitionInfo)this.ControlDataToModel(new requisitionInfo());
+                using (var db = new MESDB())
+                {
+                    using (var tran = db.Database.BeginTransaction())
+                    {
+                        try
+                        {
+                            Dictionary<string, List<requisitiondetailInfo>> dic =
+                                dt.GetDataTableData<requisitiondetailInfo>();
+                            if (info.id == 0)//新增
+                            {
+                                info.requisitioncode = code;
+                                db.requisitionInfo.Add(info);
+                                db.SaveChanges();
+                                txtid.Text = info.id.ToString();
+                                txtrequisitioncode.Text = code;
+                                if (dt != null)
+                                {
+                                    List<requisitiondetailInfo> detaiListAdd =
+                                        dic["Add"];
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a =>
+                                    {
+                                        num++;
+                                        a.requisitionid = info.id;
+                                        a.requisitioncode = info.requisitioncode;
+                                        string codeD = "QGD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                      DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.requisitiondetailcode = codeD;
+                                    });
+                                    db.requisitiondetailInfo.AddRange(detaiListAdd);
+                                    db.SaveChanges();
+                                }
+                            }
+                            else //更新
+                            {
+                                db.Entry(info).State = EntityState.Modified;
+                                db.SaveChanges();
+                                if (dt != null)
+                                {
+                                    List<requisitiondetailInfo> detaiListAdd =
+                                        dic["Add"];
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a =>
+                                    {
+                                        num++;
+                                        a.requisitionid = info.id;
+                                        a.requisitioncode = info.requisitioncode;
+                                        string codeD = "QGD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                       DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.requisitiondetailcode = codeD;
+                                    });
+                                    db.requisitiondetailInfo.AddRange(detaiListAdd);
+
+                                    List<requisitiondetailInfo> detaiListEdit =
+                                        dic["Edit"];
+                                    detaiListEdit.ForEach((a) =>
+                                    {
+                                        a.requisitionid = info.id;
+                                        a.requisitioncode = info.requisitioncode;
+                                        db.Entry(a).State = EntityState.Modified;
+                                    });
+
+                                    List<requisitiondetailInfo> detaiListDel =
+                                        dic["Del"];
+                                    detaiListDel.ForEach((a) =>
+                                    {
+                                        db.Entry(a).State = EntityState.Deleted;
+                                    });
+                                    db.SaveChanges();
+                                }
+                            }
+                            tran.Commit();
+                        }
+                        catch (Exception ex)
+                        {
+                            tran.Rollback();
+                            ex.Message.ShowError();
+                            return false;
+                        }
+                        finally
+                        {
+                            tran.Dispose();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+		/// 删除
+		/// </summary>
+		/// <returns></returns>
+		public override bool DelFunction()
+        {
+            try
+            {
+                requisitionInfo info = (requisitionInfo)this.ControlDataToModel(new requisitionInfo());
+                using (var db = new MESDB())
+                {
+                    db.Entry(info).State=EntityState.Deleted;
+                    db.SaveChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+		/// 搜索
+		/// </summary>
+		/// <returns></returns>
+        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.requisitionInfo.SqlQuery("select * from requisition").ToList();
+                    }
+                    else
+                    {
+                        grdList.DataSource = db.requisitionInfo.SqlQuery($"select * from requisition where {sql}").ToList();
+                    }
+                }
+            }
+        }
+
+        public override void AddFunction()
+        {
+            txtrequisitiondate.DateTime=DateTime.Now;
+            gridControl1.DataSource = new List<requisitiondetailInfo>().ToDataTable();
+        }
+
+        public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e)
+        {
+            requisitionInfo info = grdListView.GetFocusedRow() as requisitionInfo;
+            if (info != null)
+            {
+                using (var db = new MESDB())
+                {
+                    gridControl1.DataSource = db.requisitiondetailInfo.Where(p => p.requisitionid == 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);
+        }
+
+        private void gridView1_RowUpdated(object sender, DevExpress.XtraGrid.Views.Base.RowObjectEventArgs e)
+        {
+            txttotalprice.Text = gridColumn18.SummaryItem.SummaryValue.ToString();
+        }
+
+        private void gridView1_ValidateRow(object sender, DevExpress.XtraGrid.Views.Base.ValidateRowEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(gridView1.GetFocusedDataRow()["unitprice"].ToString()) &&
+                !string.IsNullOrEmpty(gridView1.GetFocusedDataRow()["requisitionnumber"].ToString()))
+            {
+                gridView1.GetFocusedDataRow()["money"] = decimal.Multiply(
+                    gridView1.GetFocusedDataRow()["unitprice"].ToDecimal(0),
+                    gridView1.GetFocusedDataRow()["requisitionnumber"].ToDecimal(0));
+                ;
+            }
+            gridView1.BestFitColumns();
+        }
+    }
+}

WinformGeneralDeveloperFrame/Form/Frmrequisition.designer.cs

@@ -0,0 +1,880 @@
+
+using DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
+using DevExpress.XtraTab;
+
+namespace MES.Form
+{
+    partial class  Frmrequisition
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        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.repositoryItemtxtdeptid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = 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.txtdeptid = new DevExpress.XtraEditors.TreeListLookUpEdit();
+            this.treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage2 = 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.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.txtid = new DevExpress.XtraEditors.TextEdit();
+            this.txtrequisitioncode = new DevExpress.XtraEditors.TextEdit();
+            this.txtrequisitiondate = new DevExpress.XtraEditors.DateEdit();
+            this.txtdeliverdate = new DevExpress.XtraEditors.DateEdit();
+            this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit();
+            this.txttotalprice = new DevExpress.XtraEditors.TextEdit();
+            this.txtremark = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtdeptid)).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.txtdeptid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+            this.contextMenuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialunit)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitioncode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitiondate.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitiondate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "id";
+            this.gridColumn1.FieldName = "id";
+            this.gridColumn1.Name = "gridColumn1";
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "请购单编号";
+            this.gridColumn2.FieldName = "requisitioncode";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 0;
+            this.gridColumn2.Width = 201;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "请购部门";
+            this.gridColumn3.ColumnEdit = this.repositoryItemtxtdeptid;
+            this.gridColumn3.FieldName = "deptid";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            this.gridColumn3.Width = 201;
+            // 
+            // repositoryItemtxtdeptid
+            // 
+            this.repositoryItemtxtdeptid.AutoHeight = false;
+            this.repositoryItemtxtdeptid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtdeptid.DisplayMember = "Name";
+            this.repositoryItemtxtdeptid.Name = "repositoryItemtxtdeptid";
+            this.repositoryItemtxtdeptid.ValueMember = "ID";
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "请购日期";
+            this.gridColumn4.DisplayFormat.FormatString = "G";
+            this.gridColumn4.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn4.FieldName = "requisitiondate";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 201;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "交货日期";
+            this.gridColumn5.DisplayFormat.FormatString = "G";
+            this.gridColumn5.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn5.FieldName = "deliverdate";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 201;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "制单人";
+            this.gridColumn6.ColumnEdit = this.repositoryItemtxtcreatorId;
+            this.gridColumn6.FieldName = "creatorId";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.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";
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "金额";
+            this.gridColumn7.FieldName = "totalprice";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 201;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "备注";
+            this.gridColumn8.FieldName = "remark";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 6;
+            this.gridColumn8.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(971, 680);
+            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(965, 651);
+            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(965, 651);
+            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.gridColumn7,
+            this.gridColumn8});
+            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(965, 651);
+            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(965, 651);
+            this.panelControl2.TabIndex = 0;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.txtdeptid);
+            this.layoutControl1.Controls.Add(this.xtraTabControl2);
+            this.layoutControl1.Controls.Add(this.txtid);
+            this.layoutControl1.Controls.Add(this.txtrequisitioncode);
+            this.layoutControl1.Controls.Add(this.txtrequisitiondate);
+            this.layoutControl1.Controls.Add(this.txtdeliverdate);
+            this.layoutControl1.Controls.Add(this.txtcreatorId);
+            this.layoutControl1.Controls.Add(this.txttotalprice);
+            this.layoutControl1.Controls.Add(this.txtremark);
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(2, 2);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.layoutControlGroup1;
+            this.layoutControl1.Size = new System.Drawing.Size(961, 647);
+            this.layoutControl1.TabIndex = 6;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // txtdeptid
+            // 
+            this.txtdeptid.EditValue = "";
+            this.txtdeptid.Location = new System.Drawing.Point(75, 36);
+            this.txtdeptid.Name = "txtdeptid";
+            this.txtdeptid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtdeptid.Properties.DisplayMember = "Name";
+            this.txtdeptid.Properties.TreeList = this.treeListLookUpEdit1TreeList;
+            this.txtdeptid.Properties.ValueMember = "ID";
+            this.txtdeptid.Size = new System.Drawing.Size(403, 20);
+            this.txtdeptid.StyleController = this.layoutControl1;
+            this.txtdeptid.TabIndex = 2;
+            // 
+            // treeListLookUpEdit1TreeList
+            // 
+            this.treeListLookUpEdit1TreeList.Location = new System.Drawing.Point(0, 0);
+            this.treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
+            this.treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
+            this.treeListLookUpEdit1TreeList.ParentFieldName = "PID";
+            this.treeListLookUpEdit1TreeList.Size = new System.Drawing.Size(400, 200);
+            this.treeListLookUpEdit1TreeList.TabIndex = 0;
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Location = new System.Drawing.Point(12, 108);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage2;
+            this.xtraTabControl2.Size = new System.Drawing.Size(937, 527);
+            this.xtraTabControl2.TabIndex = 9;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gridControl1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(931, 498);
+            this.xtraTabPage2.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.repositoryItemLookUpEditmaterialid,
+            this.repositoryItemLookUpEditmaterialunit,
+            this.repositoryItemLookUpEditwarehouse});
+            this.gridControl1.Size = new System.Drawing.Size(931, 498);
+            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(101, 48);
+            // 
+            // toolStripMenuItemAdd
+            // 
+            this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
+            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(100, 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(100, 22);
+            this.toolStripMenuItemDel.Text = "删除";
+            this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click);
+            // 
+            // gridView1
+            // 
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21});
+            this.gridView1.GridControl = this.gridControl1;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsBehavior.Editable = false;
+            this.gridView1.OptionsView.ShowFooter = true;
+            this.gridView1.ValidateRow += new DevExpress.XtraGrid.Views.Base.ValidateRowEventHandler(this.gridView1_ValidateRow);
+            this.gridView1.RowUpdated += new DevExpress.XtraGrid.Views.Base.RowObjectEventHandler(this.gridView1_RowUpdated);
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "id";
+            this.gridColumn9.FieldName = "id";
+            this.gridColumn9.Name = "gridColumn9";
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "请购单主表";
+            this.gridColumn10.FieldName = "requisitionid";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Width = 201;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "请购单号";
+            this.gridColumn11.FieldName = "requisitioncode";
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Width = 201;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "物料名称";
+            this.gridColumn12.ColumnEdit = this.repositoryItemLookUpEditmaterialid;
+            this.gridColumn12.FieldName = "materialid";
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 1;
+            this.gridColumn12.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialid
+            // 
+            this.repositoryItemLookUpEditmaterialid.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid";
+            this.repositoryItemLookUpEditmaterialid.NullText = "";
+            this.repositoryItemLookUpEditmaterialid.ValueMember = "ID";
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "物料编码";
+            this.gridColumn13.FieldName = "materialcode";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.OptionsColumn.AllowEdit = false;
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 2;
+            this.gridColumn13.Width = 201;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "规格型号";
+            this.gridColumn14.FieldName = "materialspec";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.AllowEdit = false;
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 3;
+            this.gridColumn14.Width = 201;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "计量单位";
+            this.gridColumn15.ColumnEdit = this.repositoryItemLookUpEditmaterialunit;
+            this.gridColumn15.FieldName = "materialunit";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.AllowEdit = false;
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 4;
+            this.gridColumn15.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialunit
+            // 
+            this.repositoryItemLookUpEditmaterialunit.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialunit.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialunit.Name = "repositoryItemLookUpEditmaterialunit";
+            this.repositoryItemLookUpEditmaterialunit.NullText = "";
+            this.repositoryItemLookUpEditmaterialunit.ValueMember = "ID";
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "请购数量";
+            this.gridColumn16.FieldName = "requisitionnumber";
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 5;
+            this.gridColumn16.Width = 201;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "单价";
+            this.gridColumn17.FieldName = "unitprice";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 6;
+            this.gridColumn17.Width = 201;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "金额";
+            this.gridColumn18.FieldName = "money";
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.OptionsColumn.AllowEdit = false;
+            this.gridColumn18.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "money", "总金额={0:0.##}")});
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 7;
+            this.gridColumn18.Width = 201;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "仓库";
+            this.gridColumn19.ColumnEdit = this.repositoryItemLookUpEditwarehouse;
+            this.gridColumn19.FieldName = "warehouse";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.AllowEdit = false;
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 8;
+            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 = 9;
+            this.gridColumn20.Width = 201;
+            // 
+            // txtid
+            // 
+            this.txtid.Location = new System.Drawing.Point(75, 12);
+            this.txtid.Name = "txtid";
+            this.txtid.Size = new System.Drawing.Size(403, 20);
+            this.txtid.StyleController = this.layoutControl1;
+            this.txtid.TabIndex = 1;
+            // 
+            // txtrequisitioncode
+            // 
+            this.txtrequisitioncode.Location = new System.Drawing.Point(545, 12);
+            this.txtrequisitioncode.Name = "txtrequisitioncode";
+            this.txtrequisitioncode.Size = new System.Drawing.Size(404, 20);
+            this.txtrequisitioncode.StyleController = this.layoutControl1;
+            this.txtrequisitioncode.TabIndex = 2;
+            // 
+            // txtrequisitiondate
+            // 
+            this.txtrequisitiondate.EditValue = null;
+            this.txtrequisitiondate.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtrequisitiondate.Location = new System.Drawing.Point(545, 36);
+            this.txtrequisitiondate.Name = "txtrequisitiondate";
+            this.txtrequisitiondate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtrequisitiondate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtrequisitiondate.Properties.DisplayFormat.FormatString = "G";
+            this.txtrequisitiondate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtrequisitiondate.Size = new System.Drawing.Size(404, 20);
+            this.txtrequisitiondate.StyleController = this.layoutControl1;
+            this.txtrequisitiondate.TabIndex = 4;
+            // 
+            // txtdeliverdate
+            // 
+            this.txtdeliverdate.EditValue = null;
+            this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtdeliverdate.Location = new System.Drawing.Point(75, 60);
+            this.txtdeliverdate.Name = "txtdeliverdate";
+            this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtdeliverdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G";
+            this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtdeliverdate.Properties.EditFormat.FormatString = "G";
+            this.txtdeliverdate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtdeliverdate.Properties.Mask.EditMask = "F";
+            this.txtdeliverdate.Size = new System.Drawing.Size(403, 20);
+            this.txtdeliverdate.StyleController = this.layoutControl1;
+            this.txtdeliverdate.TabIndex = 5;
+            // 
+            // txtcreatorId
+            // 
+            this.txtcreatorId.EditValue = "";
+            this.txtcreatorId.Location = new System.Drawing.Point(75, 84);
+            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(403, 20);
+            this.txtcreatorId.StyleController = this.layoutControl1;
+            this.txtcreatorId.TabIndex = 6;
+            // 
+            // txttotalprice
+            // 
+            this.txttotalprice.Location = new System.Drawing.Point(545, 60);
+            this.txttotalprice.Name = "txttotalprice";
+            this.txttotalprice.Size = new System.Drawing.Size(404, 20);
+            this.txttotalprice.StyleController = this.layoutControl1;
+            this.txttotalprice.TabIndex = 7;
+            // 
+            // txtremark
+            // 
+            this.txtremark.Location = new System.Drawing.Point(545, 84);
+            this.txtremark.Name = "txtremark";
+            this.txtremark.Size = new System.Drawing.Size(404, 20);
+            this.txtremark.StyleController = this.layoutControl1;
+            this.txtremark.TabIndex = 8;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem9,
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem3});
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.Size = new System.Drawing.Size(961, 647);
+            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(470, 24);
+            this.layoutControlItem1.Text = "id";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtdeliverdate;
+            this.layoutControlItem5.CustomizationFormText = "交货日期";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(470, 24);
+            this.layoutControlItem5.Text = "交货日期";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtcreatorId;
+            this.layoutControlItem6.CustomizationFormText = "制单人";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(470, 24);
+            this.layoutControlItem6.Text = "制单人";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.xtraTabControl2;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(941, 531);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtrequisitioncode;
+            this.layoutControlItem2.CustomizationFormText = "请购单编号";
+            this.layoutControlItem2.Location = new System.Drawing.Point(470, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(471, 24);
+            this.layoutControlItem2.Text = "请购单编号";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txtrequisitiondate;
+            this.layoutControlItem4.CustomizationFormText = "请购日期";
+            this.layoutControlItem4.Location = new System.Drawing.Point(470, 24);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(471, 24);
+            this.layoutControlItem4.Text = "请购日期";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txttotalprice;
+            this.layoutControlItem7.CustomizationFormText = "金额";
+            this.layoutControlItem7.Location = new System.Drawing.Point(470, 48);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(471, 24);
+            this.layoutControlItem7.Text = "金额";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtremark;
+            this.layoutControlItem8.CustomizationFormText = "备注";
+            this.layoutControlItem8.Location = new System.Drawing.Point(470, 72);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(471, 24);
+            this.layoutControlItem8.Text = "备注";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtdeptid;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(470, 24);
+            this.layoutControlItem3.Text = "请购部门";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "明细单号";
+            this.gridColumn21.FieldName = "requisitiondetailcode";
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.OptionsColumn.AllowEdit = false;
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 0;
+            // 
+            // Frmrequisition
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(971, 714);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Name = "Frmrequisition";
+            this.Text = "请购单";
+            this.Load += new System.EventHandler(this.Frmrequisition_Load);
+            this.Controls.SetChildIndex(this.xtraTabControl1, 0);
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtdeptid)).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.txtdeptid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.treeListLookUpEdit1TreeList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+            this.contextMenuStrip1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialunit)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitioncode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitiondate.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtrequisitiondate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).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.XtraGrid.Columns.GridColumn gridColumn7;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtid;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtrequisitioncode;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtdeptid;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.DateEdit txtrequisitiondate;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.DateEdit txtdeliverdate;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId;
+
+        private DevExpress.XtraEditors.LookUpEdit txtcreatorId;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txttotalprice;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtremark;
+
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private XtraTabControl xtraTabControl2;
+        private XtraTabPage xtraTabPage2;
+        private LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        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 repositoryItemLookUpEditmaterialid;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialunit;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
+        private TreeListLookUpEdit txtdeptid;
+        private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
+        private LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+    }
+}

WinformGeneralDeveloperFrame/Form/Frmrequisition.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

WinformGeneralDeveloperFrame/Form/Frmreturnsale.cs

@@ -149,10 +149,15 @@ namespace MES.Form
                                 {
                                     List<returnsaledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
+                                        num++;
                                         a.returnsalecode = info.returnsalecode;
                                         a.returnsaleid = info.id;
+                                        string coded = "SDD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                      DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.returnsaledetailcode = coded;
                                     });
                                     db.returnsaledetailInfo.AddRange(detaiListAdd);
                                     db.SaveChanges();
@@ -166,10 +171,15 @@ namespace MES.Form
                                 {
                                     List<returnsaledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
+                                        num++;
                                         a.returnsalecode = info.returnsalecode;
                                         a.returnsaleid = info.id;
+                                        string coded = "SDD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                       DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.returnsaledetailcode = coded;
                                     });
                                     db.returnsaledetailInfo.AddRange(detaiListAdd);
 

WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs

@@ -100,6 +100,7 @@ namespace MES.Form
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit();
@@ -414,7 +415,8 @@ namespace MES.Form
             this.gridColumn19,
             this.gridColumn20,
             this.gridColumn21,
-            this.gridColumn22});
+            this.gridColumn22,
+            this.gridColumn23});
             this.gridView1.GridControl = this.gridControl1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.Editable = false;
@@ -439,7 +441,7 @@ namespace MES.Form
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.OptionsColumn.AllowEdit = false;
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 1;
+            this.gridColumn13.VisibleIndex = 2;
             this.gridColumn13.Width = 201;
             // 
             // gridColumn14
@@ -449,7 +451,7 @@ namespace MES.Form
             this.gridColumn14.FieldName = "deliversalecode";
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 0;
+            this.gridColumn14.VisibleIndex = 1;
             this.gridColumn14.Width = 201;
             // 
             // repositoryItemGridLookUpEditdeliversalecode
@@ -478,7 +480,7 @@ namespace MES.Form
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.OptionsColumn.AllowEdit = false;
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 2;
+            this.gridColumn15.VisibleIndex = 3;
             this.gridColumn15.Width = 201;
             // 
             // gridColumn16
@@ -488,7 +490,7 @@ namespace MES.Form
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.OptionsColumn.AllowEdit = false;
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 3;
+            this.gridColumn16.VisibleIndex = 4;
             this.gridColumn16.Width = 201;
             // 
             // gridColumn17
@@ -498,7 +500,7 @@ namespace MES.Form
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.OptionsColumn.AllowEdit = false;
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 4;
+            this.gridColumn17.VisibleIndex = 5;
             this.gridColumn17.Width = 201;
             // 
             // gridColumn18
@@ -508,7 +510,7 @@ namespace MES.Form
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.OptionsColumn.AllowEdit = false;
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 5;
+            this.gridColumn18.VisibleIndex = 6;
             this.gridColumn18.Width = 201;
             // 
             // gridColumn19
@@ -519,7 +521,7 @@ namespace MES.Form
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.OptionsColumn.AllowEdit = false;
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 6;
+            this.gridColumn19.VisibleIndex = 7;
             this.gridColumn19.Width = 201;
             // 
             // repositoryItemLookUpEditwarehouse
@@ -538,7 +540,7 @@ namespace MES.Form
             this.gridColumn20.FieldName = "returnnumber";
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.VisibleIndex = 8;
             this.gridColumn20.Width = 201;
             // 
             // gridColumn21
@@ -549,7 +551,7 @@ namespace MES.Form
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.OptionsColumn.AllowEdit = false;
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 8;
+            this.gridColumn21.VisibleIndex = 9;
             this.gridColumn21.Width = 201;
             // 
             // repositoryItemLookUpEditunit
@@ -568,7 +570,7 @@ namespace MES.Form
             this.gridColumn22.FieldName = "remark";
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.VisibleIndex = 10;
             this.gridColumn22.Width = 201;
             // 
             // repositoryItemGridLookUpEdit
@@ -832,6 +834,15 @@ namespace MES.Form
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "明细单号";
+            this.gridColumn23.FieldName = "returnsaledetailcode";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.OptionsColumn.AllowEdit = false;
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 0;
+            // 
             // Frmreturnsale
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -972,5 +983,6 @@ namespace MES.Form
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
     }
 }

WinformGeneralDeveloperFrame/Form/Frmreturnsaledetail.cs

@@ -1,211 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using WinformGeneralDeveloperFrame;
-using WinformGeneralDeveloperFrame.Commons;
-using DevExpress.XtraLayout;
-using MES.Entity;
-using System.Data.Entity.Migrations;
-using System.Data.Entity;
-namespace MES.Form
-{
-	public partial class Frmreturnsaledetail : FrmBaseForm
-	{
-        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
-		public Frmreturnsaledetail()
-		{
-			InitializeComponent();
-		}
-		private void Frmreturnsaledetail_Load(object sender, EventArgs e)
-        {
-		
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new returnsaledetailInfo());
-            InitSearchDicData();
-        }
-        /// <summary>
-		/// 数据源初始化
-		/// </summary>
-		/// <returns></returns>
-		private void Init()
-		{
-		
-			
-
-
-				txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
-				repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
-				txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位");     
-				repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位");  
-
-
-		}
-        /// <summary>
-		/// 搜索字段
-		/// </summary>
-		/// <returns></returns>
-        private void InitSearchDicData()
-        {
-				fieldDictionary.Add("id","id");     
-				fieldDictionary.Add("退货单主表","returnsaleid");     
-				fieldDictionary.Add("退货单号","returnsalecode");     
-				fieldDictionary.Add("出货单号","deliversalecode");     
-				fieldDictionary.Add("销售单号","salecode");     
-				fieldDictionary.Add("产品编号","productcode");     
-				fieldDictionary.Add("产品名称","productname");     
-				fieldDictionary.Add("规格型号","productspec");     
-				fieldDictionary.Add("仓库","warehouse");     
-				fieldDictionary.Add("退货数量","returnnumber");     
-				fieldDictionary.Add("计量单位","unit");     
-				fieldDictionary.Add("备注","remark");     
-        }
-
-		public override void InitgrdListDataSource()
-        {
-			 using (var con=new MESDB())///
-            {
-				grdList.DataSource=con.returnsaledetailInfo.ToList();
-            }
-            Init();
-		}
-	    /// <summary>
-		/// 字段为空校验
-		/// </summary>
-		/// <returns></returns>
-        public override bool CheckInput()
-        {
-			if(string.IsNullOrEmpty(txtreturnsaleid.EditValue.ToString()))
-			{
-				"退货单主表不能为空".ShowWarning();
-				txtreturnsaleid.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtreturnsalecode.EditValue.ToString()))
-			{
-				"退货单号不能为空".ShowWarning();
-				txtreturnsalecode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtdeliversalecode.EditValue.ToString()))
-			{
-				"出货单号不能为空".ShowWarning();
-				txtdeliversalecode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString()))
-			{
-				"销售单号不能为空".ShowWarning();
-				txtsalecode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString()))
-			{
-				"产品编号不能为空".ShowWarning();
-				txtproductcode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductname.EditValue.ToString()))
-			{
-				"产品名称不能为空".ShowWarning();
-				txtproductname.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductspec.EditValue.ToString()))
-			{
-				"规格型号不能为空".ShowWarning();
-				txtproductspec.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString()))
-			{
-				"仓库不能为空".ShowWarning();
-				txtwarehouse.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtreturnnumber.EditValue.ToString()))
-			{
-				"退货数量不能为空".ShowWarning();
-				txtreturnnumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
-			{
-				"计量单位不能为空".ShowWarning();
-				txtunit.Focus();
-				return false;
-			}
-			return true;
-        }
-        /// <summary>
-		/// 保存
-		/// </summary>
-		/// <returns></returns>
-		public override bool SaveFunction()
-        {
-            try
-            {
-                returnsaledetailInfo info= (returnsaledetailInfo)this.ControlDataToModel(new returnsaledetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.returnsaledetailInfo.AddOrUpdate(info);
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 删除
-		/// </summary>
-		/// <returns></returns>
-		public override bool DelFunction()
-        {
-            try
-            {
-                returnsaledetailInfo info = (returnsaledetailInfo)this.ControlDataToModel(new returnsaledetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.Entry(info).State=EntityState.Deleted;
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 搜索
-		/// </summary>
-		/// <returns></returns>
-        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.returnsaledetailInfo.SqlQuery("select * from returnsaledetail").ToList();
-                    }
-                    else
-                    {
-                        grdList.DataSource = db.returnsaledetailInfo.SqlQuery($"select * from returnsaledetail where {sql}").ToList();
-                    }
-                }
-            }
-        }
-	}
-}

WinformGeneralDeveloperFrame/Form/Frmreturnsaledetail.designer.cs

@@ -1,696 +0,0 @@
-
-using DevExpress.XtraEditors;
-using DevExpress.XtraLayout;
-using DevExpress.XtraTab;
-
-namespace MES.Form
-{
-    partial class  Frmreturnsaledetail
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemtxtwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemtxtunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
-            this.grdList = new DevExpress.XtraGrid.GridControl();
-            this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
-            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtid = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtreturnsaleid = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtreturnsalecode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtdeliversalecode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtsalecode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductcode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductname = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductspec = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtreturnnumber = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtunit = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtremark = new DevExpress.XtraEditors.TextEdit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.tabDataList.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit();
-            this.tabDataDetail.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
-            this.panelControl2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnsaleid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnsalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnnumber.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "id";
-            this.gridColumn1.FieldName = "id";
-            this.gridColumn1.Name = "gridColumn1";
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "退货单主表";
-            this.gridColumn2.FieldName = "returnsaleid";
-            this.gridColumn2.Name = "gridColumn2";
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "退货单号";
-            this.gridColumn3.FieldName = "returnsalecode";
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 0;
-            this.gridColumn3.Width = 201;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "出货单号";
-            this.gridColumn4.FieldName = "deliversalecode";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
-            this.gridColumn4.Width = 201;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "销售单号";
-            this.gridColumn5.FieldName = "salecode";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 201;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "产品编号";
-            this.gridColumn6.FieldName = "productcode";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 3;
-            this.gridColumn6.Width = 201;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "产品名称";
-            this.gridColumn7.FieldName = "productname";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 4;
-            this.gridColumn7.Width = 201;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "规格型号";
-            this.gridColumn8.FieldName = "productspec";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 5;
-            this.gridColumn8.Width = 201;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "仓库";
-            this.gridColumn9.ColumnEdit = this.repositoryItemtxtwarehouse;
-            this.gridColumn9.FieldName = "warehouse";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
-            this.gridColumn9.Width = 201;
-            // 
-            // repositoryItemtxtwarehouse
-            // 
-            this.repositoryItemtxtwarehouse.AutoHeight = false;
-            this.repositoryItemtxtwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemtxtwarehouse.DisplayMember = "Name";
-            this.repositoryItemtxtwarehouse.Name = "repositoryItemtxtwarehouse";
-            this.repositoryItemtxtwarehouse.ValueMember = "ID";
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "退货数量";
-            this.gridColumn10.FieldName = "returnnumber";
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 7;
-            this.gridColumn10.Width = 201;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "计量单位";
-            this.gridColumn11.ColumnEdit = this.repositoryItemtxtunit;
-            this.gridColumn11.FieldName = "unit";
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 8;
-            this.gridColumn11.Width = 201;
-            // 
-            // repositoryItemtxtunit
-            // 
-            this.repositoryItemtxtunit.AutoHeight = false;
-            this.repositoryItemtxtunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemtxtunit.DisplayMember = "Name";
-            this.repositoryItemtxtunit.Name = "repositoryItemtxtunit";
-            this.repositoryItemtxtunit.ValueMember = "ID";
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "备注";
-            this.gridColumn12.FieldName = "remark";
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 9;
-            this.gridColumn12.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.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn9,
-            this.gridColumn10,
-            this.gridColumn11,
-            this.gridColumn12});
-            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.txtid);
-            this.layoutControl1.Controls.Add(this.txtreturnsaleid);
-            this.layoutControl1.Controls.Add(this.txtreturnsalecode);
-            this.layoutControl1.Controls.Add(this.txtdeliversalecode);
-            this.layoutControl1.Controls.Add(this.txtsalecode);
-            this.layoutControl1.Controls.Add(this.txtproductcode);
-            this.layoutControl1.Controls.Add(this.txtproductname);
-            this.layoutControl1.Controls.Add(this.txtproductspec);
-            this.layoutControl1.Controls.Add(this.txtwarehouse);
-            this.layoutControl1.Controls.Add(this.txtreturnnumber);
-            this.layoutControl1.Controls.Add(this.txtunit);
-            this.layoutControl1.Controls.Add(this.txtremark);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(2, 2);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1290, 733);
-            this.layoutControl1.TabIndex = 6;
-            this.layoutControl1.Text = "layoutControl1";
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.layoutControlItem11,
-            this.layoutControlItem12});
-            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(1270, 24);
-            this.layoutControlItem1.Text = "id";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtid
-            // 
-            this.txtid.Location = new System.Drawing.Point(75, 12);
-            this.txtid.Name = "txtid";
-            this.txtid.Size = new System.Drawing.Size(1203, 20);
-            this.txtid.StyleController = this.layoutControl1;
-            this.txtid.TabIndex = 1;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtreturnsaleid;
-            this.layoutControlItem2.CustomizationFormText = "退货单主表";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem2.Text = "退货单主表";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtreturnsaleid
-            // 
-            this.txtreturnsaleid.Location = new System.Drawing.Point(75, 36);
-            this.txtreturnsaleid.Name = "txtreturnsaleid";
-            this.txtreturnsaleid.Size = new System.Drawing.Size(1203, 20);
-            this.txtreturnsaleid.StyleController = this.layoutControl1;
-            this.txtreturnsaleid.TabIndex = 2;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtreturnsalecode;
-            this.layoutControlItem3.CustomizationFormText = "退货单号";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem3.Text = "退货单号";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtreturnsalecode
-            // 
-            this.txtreturnsalecode.Location = new System.Drawing.Point(75, 60);
-            this.txtreturnsalecode.Name = "txtreturnsalecode";
-            this.txtreturnsalecode.Size = new System.Drawing.Size(1203, 20);
-            this.txtreturnsalecode.StyleController = this.layoutControl1;
-            this.txtreturnsalecode.TabIndex = 3;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txtdeliversalecode;
-            this.layoutControlItem4.CustomizationFormText = "出货单号";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 72);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem4.Text = "出货单号";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtdeliversalecode
-            // 
-            this.txtdeliversalecode.Location = new System.Drawing.Point(75, 84);
-            this.txtdeliversalecode.Name = "txtdeliversalecode";
-            this.txtdeliversalecode.Size = new System.Drawing.Size(1203, 20);
-            this.txtdeliversalecode.StyleController = this.layoutControl1;
-            this.txtdeliversalecode.TabIndex = 4;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txtsalecode;
-            this.layoutControlItem5.CustomizationFormText = "销售单号";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem5.Text = "销售单号";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtsalecode
-            // 
-            this.txtsalecode.Location = new System.Drawing.Point(75, 108);
-            this.txtsalecode.Name = "txtsalecode";
-            this.txtsalecode.Size = new System.Drawing.Size(1203, 20);
-            this.txtsalecode.StyleController = this.layoutControl1;
-            this.txtsalecode.TabIndex = 5;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txtproductcode;
-            this.layoutControlItem6.CustomizationFormText = "产品编号";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 120);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem6.Text = "产品编号";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtproductcode
-            // 
-            this.txtproductcode.Location = new System.Drawing.Point(75, 132);
-            this.txtproductcode.Name = "txtproductcode";
-            this.txtproductcode.Size = new System.Drawing.Size(1203, 20);
-            this.txtproductcode.StyleController = this.layoutControl1;
-            this.txtproductcode.TabIndex = 6;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtproductname;
-            this.layoutControlItem7.CustomizationFormText = "产品名称";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 144);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem7.Text = "产品名称";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtproductname
-            // 
-            this.txtproductname.Location = new System.Drawing.Point(75, 156);
-            this.txtproductname.Name = "txtproductname";
-            this.txtproductname.Size = new System.Drawing.Size(1203, 20);
-            this.txtproductname.StyleController = this.layoutControl1;
-            this.txtproductname.TabIndex = 7;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txtproductspec;
-            this.layoutControlItem8.CustomizationFormText = "规格型号";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem8.Text = "规格型号";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtproductspec
-            // 
-            this.txtproductspec.Location = new System.Drawing.Point(75, 180);
-            this.txtproductspec.Name = "txtproductspec";
-            this.txtproductspec.Size = new System.Drawing.Size(1203, 20);
-            this.txtproductspec.StyleController = this.layoutControl1;
-            this.txtproductspec.TabIndex = 8;
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtwarehouse;
-            this.layoutControlItem9.CustomizationFormText = "仓库";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 192);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem9.Text = "仓库";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtwarehouse
-            // 
-            this.txtwarehouse.EditValue = "";
-            this.txtwarehouse.Location = new System.Drawing.Point(75, 204);
-            this.txtwarehouse.Name = "txtwarehouse";
-            this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtwarehouse.Properties.DisplayMember = "Name";
-            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(1203, 20);
-            this.txtwarehouse.StyleController = this.layoutControl1;
-            this.txtwarehouse.TabIndex = 9;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtreturnnumber;
-            this.layoutControlItem10.CustomizationFormText = "退货数量";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 216);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem10.Text = "退货数量";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtreturnnumber
-            // 
-            this.txtreturnnumber.Location = new System.Drawing.Point(75, 228);
-            this.txtreturnnumber.Name = "txtreturnnumber";
-            this.txtreturnnumber.Size = new System.Drawing.Size(1203, 20);
-            this.txtreturnnumber.StyleController = this.layoutControl1;
-            this.txtreturnnumber.TabIndex = 10;
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txtunit;
-            this.layoutControlItem11.CustomizationFormText = "计量单位";
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 240);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem11.Text = "计量单位";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtunit
-            // 
-            this.txtunit.EditValue = "";
-            this.txtunit.Location = new System.Drawing.Point(75, 252);
-            this.txtunit.Name = "txtunit";
-            this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtunit.Properties.DisplayMember = "Name";
-            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(1203, 20);
-            this.txtunit.StyleController = this.layoutControl1;
-            this.txtunit.TabIndex = 11;
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txtremark;
-            this.layoutControlItem12.CustomizationFormText = "备注";
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 264);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(1270, 449);
-            this.layoutControlItem12.Text = "备注";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
-            // 
-            // txtremark
-            // 
-            this.txtremark.Location = new System.Drawing.Point(75, 276);
-            this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(1203, 20);
-            this.txtremark.StyleController = this.layoutControl1;
-            this.txtremark.TabIndex = 12;
-            // 
-            // Frmreturnsaledetail
-            // 
-            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 = "Frmreturnsaledetail";
-            this.Text = "Frmreturnsaledetail";
-            this.Load += new System.EventHandler(this.Frmreturnsaledetail_Load);
-            this.Controls.SetChildIndex(this.xtraTabControl1, 0);
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.tabDataList.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit();
-            this.tabDataDetail.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
-            this.panelControl2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnsaleid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnsalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtdeliversalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductname.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtreturnnumber.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).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.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.XtraEditors.TextEdit txtid;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtreturnsaleid;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtreturnsalecode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtdeliversalecode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtsalecode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductcode;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductname;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtproductspec;
-        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtwarehouse;
-
-        private DevExpress.XtraEditors.LookUpEdit txtwarehouse;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtreturnnumber;
-        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtunit;
-
-        private DevExpress.XtraEditors.LookUpEdit txtunit;
-        ///////////////////////////////
-        private DevExpress.XtraEditors.TextEdit txtremark;
-
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-    }
-}

WinformGeneralDeveloperFrame/Form/Frmreturnsaledetail.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

WinformGeneralDeveloperFrame/Form/Frmsale.cs

@@ -170,10 +170,15 @@ namespace MES.Form
                                 {
                                     List<saledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
+                                        num++;
                                         a.saleid = info.id;
                                         a.salecode = info.saleordercode;
+                                        string codeD = "SOD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                      DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.saledetailcode = codeD;
                                     });
                                     db.saledetailInfo.AddRange(detaiListAdd);
                                     db.SaveChanges();
@@ -187,10 +192,15 @@ namespace MES.Form
                                 {
                                     List<saledetailInfo> detaiListAdd =
                                         dic["Add"];
+                                    int num = 0;
                                     detaiListAdd.ForEach(a =>
                                     {
+                                        num++;
                                         a.saleid = info.id;
                                         a.salecode = info.saleordercode;
+                                        string codeD = "SOD" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day + DateTime.Now.Hour +
+                                                       DateTime.Now.Minute + DateTime.Now.Second + DateTime.Now.Millisecond.ToString("D3")+num;
+                                        a.saledetailcode = codeD;
                                     });
                                     db.saledetailInfo.AddRange(detaiListAdd);
 

WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs

@@ -123,6 +123,7 @@ namespace MES.Form
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit();
@@ -513,7 +514,8 @@ namespace MES.Form
             this.gridColumn34,
             this.gridColumn35,
             this.gridColumn36,
-            this.gridColumn37});
+            this.gridColumn37,
+            this.gridColumn38});
             this.gridView1.GridControl = this.gridControl1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsBehavior.Editable = false;
@@ -534,7 +536,7 @@ namespace MES.Form
             this.gridColumn16.FieldName = "productid";
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 0;
+            this.gridColumn16.VisibleIndex = 1;
             this.gridColumn16.Width = 201;
             // 
             // repositoryItemGridLookUpEdit1
@@ -552,7 +554,9 @@ namespace MES.Form
             // 
             this.repositoryItemGridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.repositoryItemGridLookUpEdit1View.Name = "repositoryItemGridLookUpEdit1View";
+            this.repositoryItemGridLookUpEdit1View.OptionsBehavior.AllowIncrementalSearch = true;
             this.repositoryItemGridLookUpEdit1View.OptionsBehavior.Editable = false;
+            this.repositoryItemGridLookUpEdit1View.OptionsFind.SearchInPreview = true;
             this.repositoryItemGridLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.repositoryItemGridLookUpEdit1View.OptionsView.ColumnAutoWidth = false;
             this.repositoryItemGridLookUpEdit1View.OptionsView.ShowGroupPanel = false;
@@ -563,7 +567,7 @@ namespace MES.Form
             this.gridColumn17.FieldName = "productspec";
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 1;
+            this.gridColumn17.VisibleIndex = 2;
             this.gridColumn17.Width = 201;
             // 
             // gridColumn18
@@ -572,7 +576,7 @@ namespace MES.Form
             this.gridColumn18.FieldName = "salenumber";
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 2;
+            this.gridColumn18.VisibleIndex = 3;
             this.gridColumn18.Width = 201;
             // 
             // gridColumn19
@@ -582,7 +586,7 @@ namespace MES.Form
             this.gridColumn19.FieldName = "unit";
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 3;
+            this.gridColumn19.VisibleIndex = 4;
             this.gridColumn19.Width = 201;
             // 
             // repositoryItemtxtunit
@@ -601,7 +605,7 @@ namespace MES.Form
             this.gridColumn20.FieldName = "unitprice";
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 4;
+            this.gridColumn20.VisibleIndex = 5;
             this.gridColumn20.Width = 201;
             // 
             // gridColumn21
@@ -610,7 +614,7 @@ namespace MES.Form
             this.gridColumn21.FieldName = "money";
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 5;
+            this.gridColumn21.VisibleIndex = 6;
             this.gridColumn21.Width = 201;
             // 
             // gridColumn22
@@ -621,7 +625,7 @@ namespace MES.Form
             this.gridColumn22.FieldName = "deliverdate";
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 6;
+            this.gridColumn22.VisibleIndex = 7;
             this.gridColumn22.Width = 201;
             // 
             // gridColumn23
@@ -631,7 +635,7 @@ namespace MES.Form
             this.gridColumn23.FieldName = "warehouse";
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 7;
+            this.gridColumn23.VisibleIndex = 8;
             this.gridColumn23.Width = 201;
             // 
             // repositoryItemtxtwarehouse
@@ -650,7 +654,7 @@ namespace MES.Form
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.OptionsColumn.AllowEdit = false;
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 8;
+            this.gridColumn24.VisibleIndex = 9;
             this.gridColumn24.Width = 201;
             // 
             // gridColumn25
@@ -660,7 +664,7 @@ namespace MES.Form
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.OptionsColumn.AllowEdit = false;
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 9;
+            this.gridColumn25.VisibleIndex = 10;
             this.gridColumn25.Width = 201;
             // 
             // gridColumn26
@@ -670,7 +674,7 @@ namespace MES.Form
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.OptionsColumn.AllowEdit = false;
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 10;
+            this.gridColumn26.VisibleIndex = 11;
             this.gridColumn26.Width = 201;
             // 
             // gridColumn27
@@ -680,7 +684,7 @@ namespace MES.Form
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.OptionsColumn.AllowEdit = false;
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 11;
+            this.gridColumn27.VisibleIndex = 12;
             this.gridColumn27.Width = 201;
             // 
             // gridColumn28
@@ -690,7 +694,7 @@ namespace MES.Form
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.OptionsColumn.AllowEdit = false;
             this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 12;
+            this.gridColumn28.VisibleIndex = 13;
             this.gridColumn28.Width = 201;
             // 
             // gridColumn29
@@ -700,7 +704,7 @@ namespace MES.Form
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.OptionsColumn.AllowEdit = false;
             this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 13;
+            this.gridColumn29.VisibleIndex = 14;
             this.gridColumn29.Width = 201;
             // 
             // gridColumn30
@@ -710,7 +714,7 @@ namespace MES.Form
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.OptionsColumn.AllowEdit = false;
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 14;
+            this.gridColumn30.VisibleIndex = 15;
             this.gridColumn30.Width = 201;
             // 
             // gridColumn31
@@ -720,7 +724,7 @@ namespace MES.Form
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.OptionsColumn.AllowEdit = false;
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 15;
+            this.gridColumn31.VisibleIndex = 16;
             this.gridColumn31.Width = 201;
             // 
             // gridColumn32
@@ -730,7 +734,7 @@ namespace MES.Form
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.OptionsColumn.AllowEdit = false;
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 16;
+            this.gridColumn32.VisibleIndex = 17;
             this.gridColumn32.Width = 201;
             // 
             // gridColumn33
@@ -740,7 +744,7 @@ namespace MES.Form
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.OptionsColumn.AllowEdit = false;
             this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 17;
+            this.gridColumn33.VisibleIndex = 18;
             this.gridColumn33.Width = 201;
             // 
             // gridColumn34
@@ -750,7 +754,7 @@ namespace MES.Form
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.OptionsColumn.AllowEdit = false;
             this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 18;
+            this.gridColumn34.VisibleIndex = 19;
             this.gridColumn34.Width = 201;
             // 
             // gridColumn35
@@ -759,7 +763,7 @@ namespace MES.Form
             this.gridColumn35.FieldName = "productcode";
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 19;
+            this.gridColumn35.VisibleIndex = 20;
             this.gridColumn35.Width = 201;
             // 
             // gridColumn36
@@ -776,7 +780,7 @@ namespace MES.Form
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.OptionsColumn.AllowEdit = false;
             this.gridColumn37.Visible = true;
-            this.gridColumn37.VisibleIndex = 20;
+            this.gridColumn37.VisibleIndex = 21;
             this.gridColumn37.Width = 201;
             // 
             // repositoryItemtxtproductid
@@ -1123,6 +1127,15 @@ namespace MES.Form
             this.layoutControlItem14.Text = "备注";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
             // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "明细单号";
+            this.gridColumn38.FieldName = "saledetailcode";
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.OptionsColumn.AllowEdit = false;
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 0;
+            // 
             // Frmsale
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -1299,5 +1312,6 @@ namespace MES.Form
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit repositoryItemGridLookUpEdit1;
         private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemGridLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
     }
 }

WinformGeneralDeveloperFrame/Form/Frmsaledetail.cs

@@ -1,277 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using WinformGeneralDeveloperFrame;
-using WinformGeneralDeveloperFrame.Commons;
-using DevExpress.XtraLayout;
-using MES.Entity;
-using System.Data.Entity.Migrations;
-using System.Data.Entity;
-namespace MES.Form
-{
-	public partial class Frmsaledetail : FrmBaseForm
-	{
-        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
-		public Frmsaledetail()
-		{
-			InitializeComponent();
-		}
-		private void Frmsaledetail_Load(object sender, EventArgs e)
-        {
-		
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new saledetailInfo());
-            InitSearchDicData();
-        }
-        /// <summary>
-		/// 数据源初始化
-		/// </summary>
-		/// <returns></returns>
-		private void Init()
-		{
-		
-			
-
-
-				txtproductid.Properties.DataSource = GetDataTableUtils.SqlTable("产品");     
-				repositoryItemtxtproductid.DataSource= GetDataTableUtils.SqlTable("产品");  
-				txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位");     
-				repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位");  
-				txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
-				repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
-
-
-		}
-        /// <summary>
-		/// 搜索字段
-		/// </summary>
-		/// <returns></returns>
-        private void InitSearchDicData()
-        {
-				fieldDictionary.Add("交货日期","deliverdate");     
-				fieldDictionary.Add("仓库","warehouse");     
-				fieldDictionary.Add("产品编号","productcode");     
-				fieldDictionary.Add("销售单号","salecode");     
-        }
-
-		public override void InitgrdListDataSource()
-        {
-			 using (var con=new MESDB())///
-            {
-				grdList.DataSource=con.saledetailInfo.ToList();
-            }
-            Init();
-		}
-	    /// <summary>
-		/// 字段为空校验
-		/// </summary>
-		/// <returns></returns>
-        public override bool CheckInput()
-        {
-			if(string.IsNullOrEmpty(txtproductid.EditValue.ToString()))
-			{
-				"产品不能为空".ShowWarning();
-				txtproductid.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductspec.EditValue.ToString()))
-			{
-				"规格型号不能为空".ShowWarning();
-				txtproductspec.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtsalenumber.EditValue.ToString()))
-			{
-				"数量不能为空".ShowWarning();
-				txtsalenumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
-			{
-				"计量单位不能为空".ShowWarning();
-				txtunit.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtunitprice.EditValue.ToString()))
-			{
-				"单价不能为空".ShowWarning();
-				txtunitprice.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmoney.EditValue.ToString()))
-			{
-				"金额不能为空".ShowWarning();
-				txtmoney.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtdeliverdate.EditValue.ToString()))
-			{
-				"交货日期不能为空".ShowWarning();
-				txtdeliverdate.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString()))
-			{
-				"仓库不能为空".ShowWarning();
-				txtwarehouse.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtreadynumber.EditValue.ToString()))
-			{
-				"已排产量不能为空".ShowWarning();
-				txtreadynumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtnoreadynumber.EditValue.ToString()))
-			{
-				"待排产量不能为空".ShowWarning();
-				txtnoreadynumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtfinishnumber.EditValue.ToString()))
-			{
-				"已完工量不能为空".ShowWarning();
-				txtfinishnumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtoutnumber.EditValue.ToString()))
-			{
-				"已出货量不能为空".ShowWarning();
-				txtoutnumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtreturnnumber.EditValue.ToString()))
-			{
-				"退货量不能为空".ShowWarning();
-				txtreturnnumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtnodelivernumber.EditValue.ToString()))
-			{
-				"未交货数量不能为空".ShowWarning();
-				txtnodelivernumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtdelivernumber.EditValue.ToString()))
-			{
-				"实际交货数量不能为空".ShowWarning();
-				txtdelivernumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtclosenumber.EditValue.ToString()))
-			{
-				"已结算数量不能为空".ShowWarning();
-				txtclosenumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtnoclosenumber.EditValue.ToString()))
-			{
-				"未结算数量不能为空".ShowWarning();
-				txtnoclosenumber.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtmaterialcost.EditValue.ToString()))
-			{
-				"物料成本不能为空".ShowWarning();
-				txtmaterialcost.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtrealmaterialcost.EditValue.ToString()))
-			{
-				"实际物料成本不能为空".ShowWarning();
-				txtrealmaterialcost.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString()))
-			{
-				"产品编号不能为空".ShowWarning();
-				txtproductcode.Focus();
-				return false;
-			}
-			//if(string.IsNullOrEmpty(txtsaleid.EditValue.ToString()))
-			//{
-			//	"销售主表不能为空".ShowWarning();
-			//	txtsaleid.Focus();
-			//	return false;
-			//}
-			if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString()))
-			{
-				"销售单号不能为空".ShowWarning();
-				txtsalecode.Focus();
-				return false;
-			}
-			return true;
-        }
-        /// <summary>
-		/// 保存
-		/// </summary>
-		/// <returns></returns>
-		public override bool SaveFunction()
-        {
-            try
-            {
-                saledetailInfo info= (saledetailInfo)this.ControlDataToModel(new saledetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.saledetailInfo.AddOrUpdate(info);
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 删除
-		/// </summary>
-		/// <returns></returns>
-		public override bool DelFunction()
-        {
-            try
-            {
-                saledetailInfo info = (saledetailInfo)this.ControlDataToModel(new saledetailInfo());
-                using (var db = new MESDB())
-                {
-                    db.Entry(info).State=EntityState.Deleted;
-                    db.SaveChanges();
-                }
-            }
-            catch (Exception ex)
-            {
-                ex.Message.ShowError();
-                return false;
-            }
-            return true;
-        }
-        /// <summary>
-		/// 搜索
-		/// </summary>
-		/// <returns></returns>
-        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.saledetailInfo.SqlQuery("select * from saledetail").ToList();
-                    }
-                    else
-                    {
-                        grdList.DataSource = db.saledetailInfo.SqlQuery($"select * from saledetail where {sql}").ToList();
-                    }
-                }
-            }
-        }
-	}
-}

WinformGeneralDeveloperFrame/FrmsysDataBase.cs

@@ -104,7 +104,7 @@ namespace MES.Form
         {
             this.Close();
         }
-        private bool CheckInput()
+        private  bool CheckInput()
         {
             if (string.IsNullOrEmpty(txtConnName.Text))
             {

WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj

@@ -137,6 +137,8 @@
     <Compile Include="DBAdapter.cs" />
     <Compile Include="DB\MESDB.cs" />
     <Compile Include="EntityAdapter.cs" />
+    <Compile Include="Entity\buyerdetailInfo.cs" />
+    <Compile Include="Entity\buyerInfo.cs" />
     <Compile Include="Entity\customerInfo.cs" />
     <Compile Include="Entity\deliversaledetailInfo.cs" />
     <Compile Include="Entity\deliversaleInfo.cs" />
@@ -147,6 +149,8 @@
     <Compile Include="Entity\productInfo.cs" />
     <Compile Include="Entity\quotationdetailInfo.cs" />
     <Compile Include="Entity\quotationInfo.cs" />
+    <Compile Include="Entity\requisitiondetailInfo.cs" />
+    <Compile Include="Entity\requisitionInfo.cs" />
     <Compile Include="Entity\returnsaledetailInfo.cs" />
     <Compile Include="Entity\returnsaleInfo.cs" />
     <Compile Include="Entity\saledetailInfo.cs" />
@@ -161,6 +165,12 @@
     <Compile Include="Entity\sysRoleInfo.cs" />
     <Compile Include="Entity\sysToolButtonInfo.cs" />
     <Compile Include="Entity\sysUserInfo.cs" />
+    <Compile Include="Form\Frmbuyer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form\Frmbuyer.designer.cs">
+      <DependentUpon>Frmbuyer.cs</DependentUpon>
+    </Compile>
     <Compile Include="Form\Frmcustomer.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -173,12 +183,6 @@
     <Compile Include="Form\Frmdeliversale.designer.cs">
       <DependentUpon>Frmdeliversale.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\Frmdeliversaledetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form\Frmdeliversaledetail.designer.cs">
-      <DependentUpon>Frmdeliversaledetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="Form\Frmmaterial.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -197,42 +201,30 @@
     <Compile Include="Form\FrmproductBOM.designer.cs">
       <DependentUpon>FrmproductBOM.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\FrmproductBOMdetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form\FrmproductBOMdetail.designer.cs">
-      <DependentUpon>FrmproductBOMdetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="Form\Frmquotation.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form\Frmquotation.designer.cs">
       <DependentUpon>Frmquotation.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form\Frmrequisition.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form\Frmrequisition.designer.cs">
+      <DependentUpon>Frmrequisition.cs</DependentUpon>
+    </Compile>
     <Compile Include="Form\Frmreturnsale.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form\Frmreturnsale.designer.cs">
       <DependentUpon>Frmreturnsale.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\Frmreturnsaledetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form\Frmreturnsaledetail.designer.cs">
-      <DependentUpon>Frmreturnsaledetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="Form\Frmsale.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Form\Frmsale.designer.cs">
       <DependentUpon>Frmsale.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form\Frmsaledetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form\Frmsaledetail.designer.cs">
-      <DependentUpon>Frmsaledetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="Form\Frmstock.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -395,6 +387,9 @@
     <EmbeddedResource Include="BaseForm.resx">
       <DependentUpon>BaseForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form\Frmbuyer.resx">
+      <DependentUpon>Frmbuyer.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmcustomer.resx">
       <DependentUpon>Frmcustomer.cs</DependentUpon>
     </EmbeddedResource>
@@ -410,24 +405,18 @@
     <EmbeddedResource Include="Form\FrmproductBOM.resx">
       <DependentUpon>FrmproductBOM.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\FrmproductBOMdetail.resx">
-      <DependentUpon>FrmproductBOMdetail.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmquotation.resx">
       <DependentUpon>Frmquotation.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form\Frmrequisition.resx">
+      <DependentUpon>Frmrequisition.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmreturnsale.resx">
       <DependentUpon>Frmreturnsale.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\Frmreturnsaledetail.resx">
-      <DependentUpon>Frmreturnsaledetail.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmsale.resx">
       <DependentUpon>Frmsale.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form\Frmsaledetail.resx">
-      <DependentUpon>Frmsaledetail.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmstock.resx">
       <DependentUpon>Frmstock.cs</DependentUpon>
     </EmbeddedResource>