SVN r366

SVN-Revision: r366

插件库/Lskj.PubBill/BillModule.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.ssc_main = new DevExpress.XtraEditors.SplitContainerControl();
             this.ssc_main_top = new DevExpress.XtraEditors.SplitContainerControl();
             this.pl_left = new DevExpress.XtraEditors.PanelControl();
@@ -40,7 +41,7 @@
             this.pl_treeview_detault_search = new DevExpress.XtraEditors.PanelControl();
             this.panelControl4 = new DevExpress.XtraEditors.PanelControl();
             this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.barManager1 = new DevExpress.XtraBars.BarManager();
+            this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
             this.barDockControl1 = new DevExpress.XtraBars.BarDockControl();
             this.barDockControl2 = new DevExpress.XtraBars.BarDockControl();
             this.barDockControl3 = new DevExpress.XtraBars.BarDockControl();
@@ -50,7 +51,7 @@
             this.btnTreeSearch = new DevExpress.XtraEditors.SimpleButton();
             this.pl_main_bottom = new DevExpress.XtraEditors.PanelControl();
             this.dbpFP = new DevExpress.XtraEditors.DropDownButton();
-            this.pmFP = new DevExpress.XtraBars.PopupMenu();
+            this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components);
             this.btnRefresh = new DevExpress.XtraEditors.SimpleButton();
             this.btnHiding = new DevExpress.XtraEditors.SimpleButton();
             this.btnHelp = new DevExpress.XtraEditors.SimpleButton();
@@ -63,15 +64,15 @@
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.btn_input = new DevExpress.XtraEditors.SimpleButton();
             this.dpbImport = new DevExpress.XtraEditors.DropDownButton();
-            this.pmBillExp = new DevExpress.XtraBars.PopupMenu();
+            this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components);
             this.btnBillAdd = new DevExpress.XtraEditors.SimpleButton();
             this.btnBillApply = new DevExpress.XtraEditors.SimpleButton();
             this.dpCopyBill = new DevExpress.XtraEditors.DropDownButton();
-            this.pmBill = new DevExpress.XtraBars.PopupMenu();
+            this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components);
             this.btnPrint = new DevExpress.XtraEditors.DropDownButton();
-            this.pMprint = new DevExpress.XtraBars.PopupMenu();
+            this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components);
             this.dpbTools = new DevExpress.XtraEditors.DropDownButton();
-            this.pMenu = new DevExpress.XtraBars.PopupMenu();
+            this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components);
             this.btnDelete = new DevExpress.XtraEditors.SimpleButton();
             this.btnBillSave = new DevExpress.XtraEditors.SimpleButton();
             this.pl_main_top = new DevExpress.XtraEditors.PanelControl();

插件库/Lskj.PubBill/BillModule.cs

@@ -122,7 +122,7 @@ namespace Lskj.PubBill
         /// </summary>
         /// <value>The main bottom templete object.</value>
         public GridControlEx gcMainDetilObj { get { return this.gcMain; } }
-        
+
         /// <summary>
         /// Brp模版控件
         /// </summary>
@@ -953,7 +953,7 @@ namespace Lskj.PubBill
             {
                 SimpleButton btn = sender as SimpleButton;
                 DataRow rowItem = btn.Tag as DataRow;
-                CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj,null);
+                CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, null);
                 menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
                 menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
                 menu.Apply(rowItem);
@@ -2513,7 +2513,7 @@ namespace Lskj.PubBill
         {
             DataRow rowItem = e.Item.Tag as DataRow;
 
-            CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj,null);
+            CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, null);
             menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
             menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
             menu.Apply(rowItem);
@@ -4251,6 +4251,7 @@ namespace Lskj.PubBill
                 detailTable = ((this.gcMain as TreeGridControlEx).TreeListObj.DataSource as DataTable).TrimDeleteRows();
             }
 
+            string Autogrowcolumn = SqlHelper.ExecuteScalar(string.Format("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.columns WHERE TABLE_NAME='{0}' AND  COLUMNPROPERTY(OBJECT_ID('{0}'),COLUMN_NAME,'IsIdentity')=1", BillModel.DetailTable)) + ""; ;//自增长列
             DataTable DetailedProperties = BaseImpl.GetDataTableResult(string.Format("select COLUMN_NAME,DATA_TYPE,CHARACTER_MAXIMUM_LENGTH  from information_schema.columns where table_name = '{0}'", BillModel.DetailTable + "_temp"));//单据明细性表
 
             //主键
@@ -4335,6 +4336,10 @@ namespace Lskj.PubBill
 
                         fields.Append(item.ColumnName + ",");
                         string fieldValue = dataRow.Table.Columns.Contains(item.ColumnName) ? dataRow[item.ColumnName] + "" : string.Empty;
+                        if (Autogrowcolumn.Equals(item.ColumnName))
+                        {
+                            fieldValue = "";
+                        };
                         //if (SystemInfo.Instance.TrimWhiteSpace)
                         //    fieldValue = fieldValue.Trim();
                         if (item.ColumnName.Equals(BillModel.PrimaryDetailKey, StringComparison.OrdinalIgnoreCase))