From 81c71369f5e61917324c427b35cc5849b3aaa136 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 24 二月 2025 11:07:29 +0800
Subject: [PATCH] 调拨

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs          |   72 +-
 DevApp/Gs.DevApp/Gs.DevApp.csproj                         |    9 
 DevApp/Gs.DevApp/Program.cs                               |    2 
 DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs                |   45 +
 DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs             |  424 ++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/XtraForm1.cs                      |   23 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs |  839 +++++++++++++++++---------------
 DevApp/Gs.DevApp/DevFrm/XtraForm1.resx                    |  120 ++++
 8 files changed, 1,092 insertions(+), 442 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 1fa49fd..c43a5fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -128,46 +128,6 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_drhzlx = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_dchzlx = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_dblx = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_sqOrg = new Gs.DevApp.UserControl.UcLookOrg();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_ywlx = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_isWc = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_ftransferdirect = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_djlx = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
-            this.lb_billno = new DevExpress.XtraEditors.LabelControl();
-            this.txt_billno = new DevExpress.XtraEditors.TextEdit();
-            this.lb_shState = new DevExpress.XtraEditors.LabelControl();
-            this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_shDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_shBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_ftransferdirect = new DevExpress.XtraEditors.LabelControl();
-            this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
-            this.lb_id = new DevExpress.XtraEditors.LabelControl();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -187,6 +147,48 @@
             this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fCreateDate = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fOwnerTypeInIdHead = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fOwnerTypeIdHead = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_ftranstype = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fapporgid = new Gs.DevApp.UserControl.UcLookOrg();
+            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fBusinessType = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fRemarks = new DevExpress.XtraEditors.TextEdit();
+            this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_fTransferDirect = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
+            this.lb_billno = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.lb_shState = new DevExpress.XtraEditors.LabelControl();
+            this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fapprovedate = new DevExpress.XtraEditors.TextEdit();
+            this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fapproveby = new DevExpress.XtraEditors.TextEdit();
+            this.lb_ftransferdirect = new DevExpress.XtraEditors.LabelControl();
+            this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
+            this.lb_id = new DevExpress.XtraEditors.LabelControl();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -210,20 +212,20 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_drhzlx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dchzlx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dblx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ywlx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapproveby.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -447,7 +449,7 @@
             this.itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.itemModel.AppearanceCell.Options.UseFont = true;
             this.itemModel.Caption = "瑙勬牸鍨嬪彿";
-            this.itemModel.FieldName = "itemMpdel";
+            this.itemModel.FieldName = "itemModel";
             this.itemModel.MinWidth = 120;
             this.itemModel.Name = "itemModel";
             this.itemModel.OptionsColumn.ReadOnly = true;
@@ -795,7 +797,7 @@
             this.gv_isWc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isWc.AppearanceCell.Options.UseFont = true;
             this.gv_isWc.Caption = "瀹岀粨鏍囪瘑 ";
-            this.gv_isWc.FieldName = "isWc";
+            this.gv_isWc.FieldName = "wjStatus";
             this.gv_isWc.MaxWidth = 50;
             this.gv_isWc.MinWidth = 50;
             this.gv_isWc.Name = "gv_isWc";
@@ -809,8 +811,8 @@
             // 
             this.gv_billno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billno.AppearanceCell.Options.UseFont = true;
-            this.gv_billno.Caption = "璋冩嫧鐢宠鍗� ";
-            this.gv_billno.FieldName = "billno";
+            this.gv_billno.Caption = "鐢宠鍗曞崟鍙�";
+            this.gv_billno.FieldName = "fBillNo";
             this.gv_billno.MinWidth = 100;
             this.gv_billno.Name = "gv_billno";
             this.gv_billno.OptionsColumn.AllowEdit = false;
@@ -824,7 +826,7 @@
             this.gv_shState.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_shState.AppearanceCell.Options.UseFont = true;
             this.gv_shState.Caption = "瀹℃牳鐘舵�� ";
-            this.gv_shState.FieldName = "isChk";
+            this.gv_shState.FieldName = "chkStatus";
             this.gv_shState.MaxWidth = 50;
             this.gv_shState.MinWidth = 50;
             this.gv_shState.Name = "gv_shState";
@@ -890,13 +892,225 @@
             this.gridColumn40,
             this.gridColumn41,
             this.gridColumn42,
-            this.gridColumn43});
+            this.gridColumn43,
+            this.gridColumn44,
+            this.gridColumn45});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "鍗曟嵁鐘舵��";
+            this.gridColumn25.FieldName = "fDocumentStatus";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 3;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "鐢宠鏃ユ湡";
+            this.gridColumn26.FieldName = "fDate";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 4;
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn27.FieldName = "fBillTypeID";
+            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 5;
+            this.gridColumn27.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "璋冩嫧绫诲瀷";
+            this.gridColumn28.FieldName = "ftranstype";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 6;
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "璋冩嫧鏂瑰悜";
+            this.gridColumn29.FieldName = "fTransferDirect";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 7;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "璋冨嚭璐т富绫诲瀷";
+            this.gridColumn30.FieldName = "fOwnerTypeIdHead";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 8;
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "璋冨叆璐т富绫诲瀷";
+            this.gridColumn31.FieldName = "fOwnerTypeInIdHead";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 9;
+            this.gridColumn31.Width = 94;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "澶囨敞";
+            this.gridColumn32.FieldName = "fRemarks";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 10;
+            this.gridColumn32.Width = 94;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "鍒涘缓浜�";
+            this.gridColumn33.FieldName = "fCreatorId";
+            this.gridColumn33.MinWidth = 25;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 11;
+            this.gridColumn33.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "鍒涘缓鏃ユ湡";
+            this.gridColumn34.FieldName = "fCreateDate";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 12;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "鏈�鍚庝慨鏀逛汉";
+            this.gridColumn35.FieldName = "fModifierId";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 13;
+            this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "鏈�鍚庝慨鏀规棩鏈�";
+            this.gridColumn36.FieldName = "fModifyDate";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 14;
+            this.gridColumn36.Width = 94;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "瀹℃牳鏃ユ湡";
+            this.gridColumn37.FieldName = "fapprovedate";
+            this.gridColumn37.MinWidth = 25;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 15;
+            this.gridColumn37.Width = 94;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "瀹℃牳浜�";
+            this.gridColumn38.FieldNameSortGroup = "fapproveby";
+            this.gridColumn38.MinWidth = 25;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 16;
+            this.gridColumn38.Width = 94;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Caption = "鍏抽棴鐘舵��";
+            this.gridColumn39.FieldNameSortGroup = "fCloseStatus";
+            this.gridColumn39.MinWidth = 25;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 17;
+            this.gridColumn39.Width = 94;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.Caption = "鍏抽棴浜�";
+            this.gridColumn40.FieldNameSortGroup = "fCloserId";
+            this.gridColumn40.MinWidth = 25;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 18;
+            this.gridColumn40.Width = 94;
+            // 
+            // gridColumn41
+            // 
+            this.gridColumn41.Caption = "鍏抽棴鏃ユ湡";
+            this.gridColumn41.FieldNameSortGroup = "fCloseDate";
+            this.gridColumn41.MinWidth = 25;
+            this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.Visible = true;
+            this.gridColumn41.VisibleIndex = 19;
+            this.gridColumn41.Width = 94;
+            // 
+            // gridColumn42
+            // 
+            this.gridColumn42.Caption = "BOM鐗堟湰";
+            this.gridColumn42.FieldNameSortGroup = "fUnwBaseBombb";
+            this.gridColumn42.MinWidth = 25;
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 20;
+            this.gridColumn42.Width = 94;
+            // 
+            // gridColumn43
+            // 
+            this.gridColumn43.Caption = "鐖堕」鐗╂枡缂栧彿";
+            this.gridColumn43.FieldNameSortGroup = "fUnwBaseFxwlbm";
+            this.gridColumn43.MinWidth = 25;
+            this.gridColumn43.Name = "gridColumn43";
+            this.gridColumn43.Visible = true;
+            this.gridColumn43.VisibleIndex = 21;
+            this.gridColumn43.Width = 94;
+            // 
+            // gridColumn44
+            // 
+            this.gridColumn44.Caption = "鐢宠缁勭粐";
+            this.gridColumn44.FieldName = "fapporgid";
+            this.gridColumn44.MinWidth = 25;
+            this.gridColumn44.Name = "gridColumn44";
+            this.gridColumn44.Visible = true;
+            this.gridColumn44.VisibleIndex = 22;
+            this.gridColumn44.Width = 94;
+            // 
+            // gridColumn45
+            // 
+            this.gridColumn45.Caption = "涓氬姟绫诲瀷";
+            this.gridColumn45.FieldName = "fBusinessType";
+            this.gridColumn45.MinWidth = 25;
+            this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.Visible = true;
+            this.gridColumn45.VisibleIndex = 23;
+            this.gridColumn45.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -954,35 +1168,35 @@
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
             this.panel1.Controls.Add(this.labelControl7);
-            this.panel1.Controls.Add(this.textEdit1);
+            this.panel1.Controls.Add(this.txt_fCreateDate);
             this.panel1.Controls.Add(this.labelControl8);
-            this.panel1.Controls.Add(this.textEdit2);
-            this.panel1.Controls.Add(this.txt_drhzlx);
+            this.panel1.Controls.Add(this.txt_fCreatorId);
+            this.panel1.Controls.Add(this.txt_fOwnerTypeInIdHead);
             this.panel1.Controls.Add(this.labelControl6);
-            this.panel1.Controls.Add(this.txt_dchzlx);
+            this.panel1.Controls.Add(this.txt_fOwnerTypeIdHead);
             this.panel1.Controls.Add(this.labelControl5);
-            this.panel1.Controls.Add(this.txt_dblx);
+            this.panel1.Controls.Add(this.txt_ftranstype);
             this.panel1.Controls.Add(this.labelControl4);
-            this.panel1.Controls.Add(this.txt_sqOrg);
+            this.panel1.Controls.Add(this.txt_fapporgid);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_ywlx);
+            this.panel1.Controls.Add(this.txt_fBusinessType);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.txt_isWc);
-            this.panel1.Controls.Add(this.txt_shState);
-            this.panel1.Controls.Add(this.txt_ftransferdirect);
-            this.panel1.Controls.Add(this.txt_djlx);
+            this.panel1.Controls.Add(this.txt_fRemarks);
+            this.panel1.Controls.Add(this.txt_wjStatus);
+            this.panel1.Controls.Add(this.txt_chkStatus);
+            this.panel1.Controls.Add(this.txt_fTransferDirect);
+            this.panel1.Controls.Add(this.txt_fBillTypeID);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_isWc);
             this.panel1.Controls.Add(this.lb_billno);
-            this.panel1.Controls.Add(this.txt_billno);
+            this.panel1.Controls.Add(this.txt_fBillNo);
             this.panel1.Controls.Add(this.lb_shState);
             this.panel1.Controls.Add(this.lb_shDate);
-            this.panel1.Controls.Add(this.txt_shDate);
+            this.panel1.Controls.Add(this.txt_fapprovedate);
             this.panel1.Controls.Add(this.lb_shBy);
-            this.panel1.Controls.Add(this.txt_shBy);
+            this.panel1.Controls.Add(this.txt_fapproveby);
             this.panel1.Controls.Add(this.lb_ftransferdirect);
             this.panel1.Controls.Add(this.lb_fbilltypeid);
             this.panel1.Controls.Add(this.lb_id);
@@ -1003,15 +1217,15 @@
             this.labelControl7.TabIndex = 385;
             this.labelControl7.Text = "鐢宠鏃堕棿";
             // 
-            // textEdit1
+            // txt_fCreateDate
             // 
-            this.textEdit1.Enabled = false;
-            this.textEdit1.Location = new System.Drawing.Point(704, 41);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(166, 28);
-            this.textEdit1.TabIndex = 386;
+            this.txt_fCreateDate.Enabled = false;
+            this.txt_fCreateDate.Location = new System.Drawing.Point(704, 41);
+            this.txt_fCreateDate.Name = "txt_fCreateDate";
+            this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_fCreateDate.Size = new System.Drawing.Size(166, 28);
+            this.txt_fCreateDate.TabIndex = 386;
             // 
             // labelControl8
             // 
@@ -1023,31 +1237,31 @@
             this.labelControl8.TabIndex = 383;
             this.labelControl8.Text = "鐢宠浜�";
             // 
-            // textEdit2
+            // txt_fCreatorId
             // 
-            this.textEdit2.Enabled = false;
-            this.textEdit2.Location = new System.Drawing.Point(704, 11);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit2.Properties.Appearance.Options.UseFont = true;
-            this.textEdit2.Size = new System.Drawing.Size(166, 28);
-            this.textEdit2.TabIndex = 384;
+            this.txt_fCreatorId.Enabled = false;
+            this.txt_fCreatorId.Location = new System.Drawing.Point(704, 11);
+            this.txt_fCreatorId.Name = "txt_fCreatorId";
+            this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
+            this.txt_fCreatorId.Size = new System.Drawing.Size(166, 28);
+            this.txt_fCreatorId.TabIndex = 384;
             // 
-            // txt_drhzlx
+            // txt_fOwnerTypeInIdHead
             // 
-            this.txt_drhzlx.EditValue = "鏍囧噯";
-            this.txt_drhzlx.Location = new System.Drawing.Point(442, 100);
-            this.txt_drhzlx.Name = "txt_drhzlx";
-            this.txt_drhzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_fOwnerTypeInIdHead.EditValue = "鏍囧噯";
+            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(442, 100);
+            this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
+            this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_drhzlx.Properties.Items.AddRange(new object[] {
+            this.txt_fOwnerTypeInIdHead.Properties.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
             "缁勭粐(BD_OwnerOrg)",
             "渚涘簲鍟�(BD_Supplier)",
             "瀹㈡埛(BD_Customer)"});
-            this.txt_drhzlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_drhzlx.Size = new System.Drawing.Size(182, 24);
-            this.txt_drhzlx.TabIndex = 382;
+            this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(182, 24);
+            this.txt_fOwnerTypeInIdHead.TabIndex = 382;
             // 
             // labelControl6
             // 
@@ -1059,21 +1273,21 @@
             this.labelControl6.TabIndex = 381;
             this.labelControl6.Text = "璋冨叆璐т富绫诲瀷 ";
             // 
-            // txt_dchzlx
+            // txt_fOwnerTypeIdHead
             // 
-            this.txt_dchzlx.EditValue = "鏍囧噯";
-            this.txt_dchzlx.Location = new System.Drawing.Point(442, 72);
-            this.txt_dchzlx.Name = "txt_dchzlx";
-            this.txt_dchzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_fOwnerTypeIdHead.EditValue = "鏍囧噯";
+            this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(442, 72);
+            this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
+            this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_dchzlx.Properties.Items.AddRange(new object[] {
+            this.txt_fOwnerTypeIdHead.Properties.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
             "缁勭粐(BD_OwnerOrg)",
             "渚涘簲鍟�(BD_Supplier)",
             "瀹㈡埛(BD_Customer)"});
-            this.txt_dchzlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_dchzlx.Size = new System.Drawing.Size(182, 24);
-            this.txt_dchzlx.TabIndex = 380;
+            this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(182, 24);
+            this.txt_fOwnerTypeIdHead.TabIndex = 380;
             // 
             // labelControl5
             // 
@@ -1085,19 +1299,19 @@
             this.labelControl5.TabIndex = 379;
             this.labelControl5.Text = "璋冨嚭璐т富绫诲瀷 ";
             // 
-            // txt_dblx
+            // txt_ftranstype
             // 
-            this.txt_dblx.EditValue = "鏍囧噯";
-            this.txt_dblx.Location = new System.Drawing.Point(403, 43);
-            this.txt_dblx.Name = "txt_dblx";
-            this.txt_dblx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_ftranstype.EditValue = "鏍囧噯";
+            this.txt_ftranstype.Location = new System.Drawing.Point(403, 43);
+            this.txt_ftranstype.Name = "txt_ftranstype";
+            this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_dblx.Properties.Items.AddRange(new object[] {
+            this.txt_ftranstype.Properties.Items.AddRange(new object[] {
             "缁勭粐鍐呰皟鎷�",
             "璺ㄧ粍缁囪皟鎷�"});
-            this.txt_dblx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_dblx.Size = new System.Drawing.Size(221, 24);
-            this.txt_dblx.TabIndex = 378;
+            this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_ftranstype.Size = new System.Drawing.Size(221, 24);
+            this.txt_ftranstype.TabIndex = 378;
             // 
             // labelControl4
             // 
@@ -1109,13 +1323,13 @@
             this.labelControl4.TabIndex = 377;
             this.labelControl4.Text = "璋冩嫧绫诲瀷 ";
             // 
-            // txt_sqOrg
+            // txt_fapporgid
             // 
-            this.txt_sqOrg.IsReadly = false;
-            this.txt_sqOrg.Location = new System.Drawing.Point(403, 10);
-            this.txt_sqOrg.Name = "txt_sqOrg";
-            this.txt_sqOrg.Size = new System.Drawing.Size(221, 30);
-            this.txt_sqOrg.TabIndex = 376;
+            this.txt_fapporgid.IsReadly = false;
+            this.txt_fapporgid.Location = new System.Drawing.Point(403, 10);
+            this.txt_fapporgid.Name = "txt_fapporgid";
+            this.txt_fapporgid.Size = new System.Drawing.Size(221, 30);
+            this.txt_fapporgid.TabIndex = 376;
             // 
             // labelControl3
             // 
@@ -1127,18 +1341,18 @@
             this.labelControl3.TabIndex = 375;
             this.labelControl3.Text = "鐢宠缁勭粐";
             // 
-            // txt_ywlx
+            // txt_fBusinessType
             // 
-            this.txt_ywlx.EditValue = "鏍囧噯";
-            this.txt_ywlx.Location = new System.Drawing.Point(94, 72);
-            this.txt_ywlx.Name = "txt_ywlx";
-            this.txt_ywlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_fBusinessType.EditValue = "鏍囧噯";
+            this.txt_fBusinessType.Location = new System.Drawing.Point(94, 72);
+            this.txt_fBusinessType.Name = "txt_fBusinessType";
+            this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_ywlx.Properties.Items.AddRange(new object[] {
+            this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
             "鏍囧噯"});
-            this.txt_ywlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_ywlx.Size = new System.Drawing.Size(227, 24);
-            this.txt_ywlx.TabIndex = 374;
+            this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fBusinessType.Size = new System.Drawing.Size(227, 24);
+            this.txt_fBusinessType.TabIndex = 374;
             // 
             // labelControl2
             // 
@@ -1160,65 +1374,65 @@
             this.labelControl1.TabIndex = 372;
             this.labelControl1.Text = "澶囨敞";
             // 
-            // txt_remark
+            // txt_fRemarks
             // 
-            this.txt_remark.Location = new System.Drawing.Point(94, 129);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(530, 28);
-            this.txt_remark.TabIndex = 371;
+            this.txt_fRemarks.Location = new System.Drawing.Point(94, 129);
+            this.txt_fRemarks.Name = "txt_fRemarks";
+            this.txt_fRemarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
+            this.txt_fRemarks.Size = new System.Drawing.Size(530, 28);
+            this.txt_fRemarks.TabIndex = 371;
             // 
-            // txt_isWc
+            // txt_wjStatus
             // 
-            this.txt_isWc.Enabled = false;
-            this.txt_isWc.Location = new System.Drawing.Point(818, 131);
-            this.txt_isWc.Name = "txt_isWc";
-            this.txt_isWc.Properties.Caption = "";
-            this.txt_isWc.Size = new System.Drawing.Size(39, 24);
-            this.txt_isWc.TabIndex = 364;
+            this.txt_wjStatus.Enabled = false;
+            this.txt_wjStatus.Location = new System.Drawing.Point(818, 131);
+            this.txt_wjStatus.Name = "txt_wjStatus";
+            this.txt_wjStatus.Properties.Caption = "";
+            this.txt_wjStatus.Size = new System.Drawing.Size(39, 24);
+            this.txt_wjStatus.TabIndex = 364;
             // 
-            // txt_shState
+            // txt_chkStatus
             // 
-            this.txt_shState.Enabled = false;
-            this.txt_shState.Location = new System.Drawing.Point(704, 131);
-            this.txt_shState.Name = "txt_shState";
-            this.txt_shState.Properties.Caption = "";
-            this.txt_shState.Size = new System.Drawing.Size(29, 24);
-            this.txt_shState.TabIndex = 363;
+            this.txt_chkStatus.Enabled = false;
+            this.txt_chkStatus.Location = new System.Drawing.Point(704, 131);
+            this.txt_chkStatus.Name = "txt_chkStatus";
+            this.txt_chkStatus.Properties.Caption = "";
+            this.txt_chkStatus.Size = new System.Drawing.Size(29, 24);
+            this.txt_chkStatus.TabIndex = 363;
             // 
-            // txt_ftransferdirect
+            // txt_fTransferDirect
             // 
-            this.txt_ftransferdirect.EditValue = "-璇烽�夋嫨-";
-            this.txt_ftransferdirect.Location = new System.Drawing.Point(94, 100);
-            this.txt_ftransferdirect.Name = "txt_ftransferdirect";
-            this.txt_ftransferdirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_fTransferDirect.EditValue = "-璇烽�夋嫨-";
+            this.txt_fTransferDirect.Location = new System.Drawing.Point(94, 100);
+            this.txt_fTransferDirect.Name = "txt_fTransferDirect";
+            this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_ftransferdirect.Properties.Items.AddRange(new object[] {
+            this.txt_fTransferDirect.Properties.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
             "閫�璐�(RETURN)",
             "鏅��(GENERAL)"});
-            this.txt_ftransferdirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_ftransferdirect.Size = new System.Drawing.Size(227, 24);
-            this.txt_ftransferdirect.TabIndex = 362;
+            this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fTransferDirect.Size = new System.Drawing.Size(227, 24);
+            this.txt_fTransferDirect.TabIndex = 362;
             // 
-            // txt_djlx
+            // txt_fBillTypeID
             // 
-            this.txt_djlx.EditValue = "-璇烽�夋嫨-";
-            this.txt_djlx.Location = new System.Drawing.Point(94, 43);
-            this.txt_djlx.Name = "txt_djlx";
-            this.txt_djlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_fBillTypeID.EditValue = "-璇烽�夋嫨-";
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(94, 43);
+            this.txt_fBillTypeID.Name = "txt_fBillTypeID";
+            this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_djlx.Properties.Items.AddRange(new object[] {
+            this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
             "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDBO1_SYS)",
             "瀵勫敭鐩存帴璋冩嫧鍗�(ZJDBO2_SYS)",
             "濮斿鐩存帴璋冩嫧鍗�(ZIDBO3_SYS)",
             "鍒嗛攢鐩存帴璋冩嫧鍗�(ZJDBO4_SYS)",
             "VMI鐩存帴璋冩嫧鍗�(ZJDBO5_SYS)"});
-            this.txt_djlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_djlx.Size = new System.Drawing.Size(227, 24);
-            this.txt_djlx.TabIndex = 361;
+            this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(227, 24);
+            this.txt_fBillTypeID.TabIndex = 361;
             // 
             // labelControl11
             // 
@@ -1228,6 +1442,7 @@
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
@@ -1236,6 +1451,7 @@
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            this.lbGuid.Visible = false;
             // 
             // lb_isWc
             // 
@@ -1257,15 +1473,15 @@
             this.lb_billno.TabIndex = 327;
             this.lb_billno.Text = "鐢宠鍗曞彿";
             // 
-            // txt_billno
+            // txt_fBillNo
             // 
-            this.txt_billno.Enabled = false;
-            this.txt_billno.Location = new System.Drawing.Point(94, 11);
-            this.txt_billno.Name = "txt_billno";
-            this.txt_billno.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_billno.Properties.Appearance.Options.UseFont = true;
-            this.txt_billno.Size = new System.Drawing.Size(227, 28);
-            this.txt_billno.TabIndex = 327;
+            this.txt_fBillNo.Enabled = false;
+            this.txt_fBillNo.Location = new System.Drawing.Point(94, 11);
+            this.txt_fBillNo.Name = "txt_fBillNo";
+            this.txt_fBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_fBillNo.Size = new System.Drawing.Size(227, 28);
+            this.txt_fBillNo.TabIndex = 327;
             // 
             // lb_shState
             // 
@@ -1287,15 +1503,15 @@
             this.lb_shDate.TabIndex = 262;
             this.lb_shDate.Text = "瀹℃牳鏃堕棿";
             // 
-            // txt_shDate
+            // txt_fapprovedate
             // 
-            this.txt_shDate.Enabled = false;
-            this.txt_shDate.Location = new System.Drawing.Point(704, 99);
-            this.txt_shDate.Name = "txt_shDate";
-            this.txt_shDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_shDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_shDate.Size = new System.Drawing.Size(166, 28);
-            this.txt_shDate.TabIndex = 262;
+            this.txt_fapprovedate.Enabled = false;
+            this.txt_fapprovedate.Location = new System.Drawing.Point(704, 99);
+            this.txt_fapprovedate.Name = "txt_fapprovedate";
+            this.txt_fapprovedate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
+            this.txt_fapprovedate.Size = new System.Drawing.Size(166, 28);
+            this.txt_fapprovedate.TabIndex = 262;
             // 
             // lb_shBy
             // 
@@ -1307,15 +1523,15 @@
             this.lb_shBy.TabIndex = 258;
             this.lb_shBy.Text = "瀹℃牳浜�";
             // 
-            // txt_shBy
+            // txt_fapproveby
             // 
-            this.txt_shBy.Enabled = false;
-            this.txt_shBy.Location = new System.Drawing.Point(704, 70);
-            this.txt_shBy.Name = "txt_shBy";
-            this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_shBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_shBy.Size = new System.Drawing.Size(166, 28);
-            this.txt_shBy.TabIndex = 258;
+            this.txt_fapproveby.Enabled = false;
+            this.txt_fapproveby.Location = new System.Drawing.Point(704, 70);
+            this.txt_fapproveby.Name = "txt_fapproveby";
+            this.txt_fapproveby.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fapproveby.Properties.Appearance.Options.UseFont = true;
+            this.txt_fapproveby.Size = new System.Drawing.Size(166, 28);
+            this.txt_fapproveby.TabIndex = 258;
             // 
             // lb_ftransferdirect
             // 
@@ -1358,177 +1574,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gridColumn25
-            // 
-            this.gridColumn25.Caption = "鍗曟嵁鐘舵��";
-            this.gridColumn25.MinWidth = 25;
-            this.gridColumn25.Name = "gridColumn25";
-            this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 3;
-            this.gridColumn25.Width = 94;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "鐢宠鏃ユ湡";
-            this.gridColumn26.MinWidth = 25;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 4;
-            this.gridColumn26.Width = 94;
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "鍗曟嵁绫诲瀷";
-            this.gridColumn27.MinWidth = 25;
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 5;
-            this.gridColumn27.Width = 94;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "璋冩嫧绫诲瀷";
-            this.gridColumn28.MinWidth = 25;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 6;
-            this.gridColumn28.Width = 94;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "璋冩嫧鏂瑰悜";
-            this.gridColumn29.MinWidth = 25;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 7;
-            this.gridColumn29.Width = 94;
-            // 
-            // gridColumn30
-            // 
-            this.gridColumn30.Caption = "璋冨嚭璐т富绫诲瀷";
-            this.gridColumn30.MinWidth = 25;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 8;
-            this.gridColumn30.Width = 94;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "璋冨叆璐т富绫诲瀷";
-            this.gridColumn31.MinWidth = 25;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 9;
-            this.gridColumn31.Width = 94;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "澶囨敞";
-            this.gridColumn32.MinWidth = 25;
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 10;
-            this.gridColumn32.Width = 94;
-            // 
-            // gridColumn33
-            // 
-            this.gridColumn33.Caption = "鍒涘缓浜�";
-            this.gridColumn33.MinWidth = 25;
-            this.gridColumn33.Name = "gridColumn33";
-            this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 11;
-            this.gridColumn33.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "鍒涘缓鏃ユ湡";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 12;
-            this.gridColumn34.Width = 94;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.Caption = "鏈�鍚庝慨鏀逛汉";
-            this.gridColumn35.MinWidth = 25;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 13;
-            this.gridColumn35.Width = 94;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.Caption = "鏈�鍚庝慨鏀规棩鏈�";
-            this.gridColumn36.MinWidth = 25;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 14;
-            this.gridColumn36.Width = 94;
-            // 
-            // gridColumn37
-            // 
-            this.gridColumn37.Caption = "瀹℃牳鏃ユ湡";
-            this.gridColumn37.MinWidth = 25;
-            this.gridColumn37.Name = "gridColumn37";
-            this.gridColumn37.Visible = true;
-            this.gridColumn37.VisibleIndex = 15;
-            this.gridColumn37.Width = 94;
-            // 
-            // gridColumn38
-            // 
-            this.gridColumn38.Caption = "瀹℃牳浜�";
-            this.gridColumn38.MinWidth = 25;
-            this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 16;
-            this.gridColumn38.Width = 94;
-            // 
-            // gridColumn39
-            // 
-            this.gridColumn39.Caption = "鍏抽棴鐘舵��";
-            this.gridColumn39.MinWidth = 25;
-            this.gridColumn39.Name = "gridColumn39";
-            this.gridColumn39.Visible = true;
-            this.gridColumn39.VisibleIndex = 17;
-            this.gridColumn39.Width = 94;
-            // 
-            // gridColumn40
-            // 
-            this.gridColumn40.Caption = "鍏抽棴浜�";
-            this.gridColumn40.MinWidth = 25;
-            this.gridColumn40.Name = "gridColumn40";
-            this.gridColumn40.Visible = true;
-            this.gridColumn40.VisibleIndex = 18;
-            this.gridColumn40.Width = 94;
-            // 
-            // gridColumn41
-            // 
-            this.gridColumn41.Caption = "鍏抽棴鏃ユ湡";
-            this.gridColumn41.MinWidth = 25;
-            this.gridColumn41.Name = "gridColumn41";
-            this.gridColumn41.Visible = true;
-            this.gridColumn41.VisibleIndex = 19;
-            this.gridColumn41.Width = 94;
-            // 
-            // gridColumn42
-            // 
-            this.gridColumn42.Caption = "BOM鐗堟湰";
-            this.gridColumn42.MinWidth = 25;
-            this.gridColumn42.Name = "gridColumn42";
-            this.gridColumn42.Visible = true;
-            this.gridColumn42.VisibleIndex = 20;
-            this.gridColumn42.Width = 94;
-            // 
-            // gridColumn43
-            // 
-            this.gridColumn43.Caption = "鐖堕」鐗╂枡缂栧彿";
-            this.gridColumn43.MinWidth = 25;
-            this.gridColumn43.Name = "gridColumn43";
-            this.gridColumn43.Visible = true;
-            this.gridColumn43.VisibleIndex = 21;
-            this.gridColumn43.Width = 94;
-            // 
             // Frm_MesDbck
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1563,20 +1608,20 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_drhzlx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dchzlx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dblx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ywlx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapproveby.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1615,21 +1660,21 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl lb_isWc;
         private DevExpress.XtraEditors.LabelControl lb_billno;
-        private DevExpress.XtraEditors.TextEdit txt_billno;
+        private DevExpress.XtraEditors.TextEdit txt_fBillNo;
         private DevExpress.XtraEditors.LabelControl lb_shState;
         private DevExpress.XtraEditors.LabelControl lb_shDate;
-        private DevExpress.XtraEditors.TextEdit txt_shDate;
+        private DevExpress.XtraEditors.TextEdit txt_fapprovedate;
         private DevExpress.XtraEditors.LabelControl lb_shBy;
-        private DevExpress.XtraEditors.TextEdit txt_shBy;
+        private DevExpress.XtraEditors.TextEdit txt_fapproveby;
         private DevExpress.XtraEditors.LabelControl lb_ftransferdirect;
         private DevExpress.XtraEditors.LabelControl lb_fbilltypeid;
         private DevExpress.XtraEditors.LabelControl lb_id;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_djlx;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_ftransferdirect;
-        private DevExpress.XtraEditors.CheckEdit txt_isWc;
-        private DevExpress.XtraEditors.CheckEdit txt_shState;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fTransferDirect;
+        private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
+        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
         private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.TextEdit txt_fRemarks;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1637,15 +1682,15 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_ywlx;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fBusinessType;
         private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_dchzlx;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fOwnerTypeIdHead;
         private DevExpress.XtraEditors.LabelControl labelControl5;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_dblx;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_ftranstype;
         private DevExpress.XtraEditors.LabelControl labelControl4;
-        private UserControl.UcLookOrg txt_sqOrg;
+        private UserControl.UcLookOrg txt_fapporgid;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_drhzlx;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fOwnerTypeInIdHead;
         private DevExpress.XtraEditors.LabelControl labelControl6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -1673,9 +1718,9 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrHz;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcHz;
         private DevExpress.XtraEditors.LabelControl labelControl7;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.TextEdit txt_fCreateDate;
         private DevExpress.XtraEditors.LabelControl labelControl8;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
@@ -1695,5 +1740,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 26359d1..8c38d79 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -29,8 +29,9 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+           // Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, this.panelControl3, splitContainerControl1.Panel1, label1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
             });
@@ -44,9 +45,9 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //璁剧疆鐢宠缁勭粐
-            this.txt_sqOrg.EditChanged += (s, e) =>
+            this.txt_fapporgid.EditChanged += (s, e) =>
             {
-                string _sqGuid = txt_sqOrg.GetId();
+                string _sqGuid = txt_fapporgid.GetId();
                 if (string.IsNullOrEmpty(_sqGuid))
                     return;
                 System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
@@ -126,7 +127,7 @@
         {
             string rowGuid = "", rowName = "";
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billno, gridView1, "billno");
+                lbGuid, txt_fBillNo, gridView1, "fBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -193,7 +194,7 @@
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "billno");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -234,41 +235,41 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string djlx = txt_djlx.SelectedText.ToString();
-            string ywlx = txt_ywlx.SelectedText.ToString();
-            string dbfx = txt_ftransferdirect.SelectedText.ToString();
-            string sqOrg = txt_sqOrg.GetId();
-            string dblx = txt_dblx.SelectedText.ToString();
-            string dchzlx = txt_dchzlx.SelectedText.ToString();
-            string drhzlx = txt_drhzlx.SelectedText.ToString();
-            if (txt_djlx.SelectedIndex <= 0)
+            string djlx = txt_fBillTypeID.Text.ToString();
+            string ywlx = txt_fBusinessType.Text.ToString();
+            string dbfx = txt_fTransferDirect.Text.ToString();
+            string sqOrg = txt_fapporgid.GetId();
+            string dblx = txt_ftranstype.Text.ToString();
+            string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
+            string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
+            if (txt_fBillTypeID.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
-                txt_djlx.Focus();
+                txt_fBillTypeID.Focus();
                 return;
             }
-            if (txt_ftransferdirect.SelectedIndex <= 0)
+            if (txt_fTransferDirect.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
-                txt_ftransferdirect.Focus();
+                txt_fTransferDirect.Focus();
                 return;
             }
             if (string.IsNullOrEmpty(sqOrg))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
-                txt_sqOrg.Focus();
+                txt_fapporgid.Focus();
                 return;
             }
-            if (txt_dchzlx.SelectedIndex <= 0)
+            if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
-                txt_dchzlx.Focus();
+                txt_fOwnerTypeIdHead.Focus();
                 return;
             }
-            if (txt_drhzlx.SelectedIndex <= 0)
+            if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
-                txt_drhzlx.Focus();
+                txt_fOwnerTypeInIdHead.Focus();
                 return;
             }
             var _obj = new
@@ -281,7 +282,7 @@
                 dblx = dblx,//璋冩嫧绫诲瀷
                 dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
                 drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
-                inRemark = txt_remark.Text.Trim(),//澶囨敞
+                inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -309,12 +310,12 @@
                         ItemId = (row["itemId"].ToString()),
                         Sqsl = (row["shNum"].ToString()),
                         Bz = (row["remark"].ToString()),
-                        dczz = (row["dcOrg"].ToString()),
-                        dcck = (row["dcCk"].ToString()),
-                        drzz = (row["drOrg"].ToString()),
-                        drck = (row["drCk"].ToString()),
-                        dchz = (row["dcHz"].ToString()),
-                        drhz = (row["drHz"].ToString()),
+                        dczz = (row["dcOrgGuid"].ToString()),
+                        dcck = (row["dcCkGuid"].ToString()),
+                        drzz = (row["drOrgGuid"].ToString()),
+                        drck = (row["drCkGuid"].ToString()),
+                        dchz = (row["dcHzGuid"].ToString()),
+                        drhz = (row["drHzGuid"].ToString()),
                     });
                 }
             }
@@ -326,7 +327,7 @@
                 if (_rtn.rtnCode > 0)
                 {
                     lbGuid.Text = _rtn.rtnData.outGuid;
-                    txt_billno.Text = _rtn.rtnData.outNo;
+                    txt_fBillNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
@@ -349,7 +350,7 @@
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billno, gridView1);
+                lbGuid, txt_fBillNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
         }
         /// <summary>
@@ -488,7 +489,7 @@
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -516,7 +517,7 @@
                     }
                     int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                     gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "shState", "shBy", "shDate", picCheckBox, this, _inFieldValue.ToString());
+                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
@@ -531,7 +532,8 @@
             DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
             gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
             gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemMpdel", SelectedDataRow["itemModel"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
             gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
             gvMx1.CloseEditor();
             gvMx1.UpdateCurrentRow();
@@ -758,7 +760,7 @@
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
-            int _drhzlx = txt_drhzlx.SelectedIndex;
+            int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
             if (_drhzlx <= 0)
             {
                 MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
@@ -785,7 +787,7 @@
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
-            int _drhzlx = txt_dchzlx.SelectedIndex;
+            int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
             if (_drhzlx <= 0)
             {
                 MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
new file mode 100644
index 0000000..f9fa77a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -0,0 +1,424 @@
+锘縩amespace Gs.DevApp.DevFrm
+{
+    partial class XtraForm1
+    {
+        /// <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.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitContainerControl2 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.panLayHead = new System.Windows.Forms.Panel();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_isWc = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
+            this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
+            this.lb_shState = new DevExpress.XtraEditors.LabelControl();
+            this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_shDate = new DevExpress.XtraEditors.TextEdit();
+            this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_shBy = new DevExpress.XtraEditors.TextEdit();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.panel1 = new System.Windows.Forms.Panel();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+            this.splitContainerControl1.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).BeginInit();
+            this.splitContainerControl2.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).BeginInit();
+            this.splitContainerControl2.Panel2.SuspendLayout();
+            this.splitContainerControl2.SuspendLayout();
+            this.panLayHead.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
+            this.panel3.SuspendLayout();
+            this.panel4.SuspendLayout();
+            this.panel5.SuspendLayout();
+            this.panel6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1057, 660);
+            this.xtraTabControl1.TabIndex = 0;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1055, 628);
+            this.xtraTabPage1.Text = "xtraTabPage1";
+            // 
+            // splitContainerControl1
+            // 
+            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainerControl1.Horizontal = false;
+            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainerControl1.Name = "splitContainerControl1";
+            // 
+            // splitContainerControl1.Panel1
+            // 
+            this.splitContainerControl1.Panel1.Text = "Panel1";
+            // 
+            // splitContainerControl1.Panel2
+            // 
+            this.splitContainerControl1.Panel2.Text = "Panel2";
+            this.splitContainerControl1.Size = new System.Drawing.Size(1055, 628);
+            this.splitContainerControl1.SplitterPosition = 255;
+            this.splitContainerControl1.TabIndex = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitContainerControl2);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1055, 628);
+            this.xtraTabPage2.Text = "xtraTabPage2";
+            // 
+            // splitContainerControl2
+            // 
+            this.splitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainerControl2.Horizontal = false;
+            this.splitContainerControl2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainerControl2.Name = "splitContainerControl2";
+            // 
+            // splitContainerControl2.Panel1
+            // 
+            this.splitContainerControl2.Panel1.Controls.Add(this.panLayHead);
+            this.splitContainerControl2.Panel1.Text = "Panel1";
+            // 
+            // splitContainerControl2.Panel2
+            // 
+            this.splitContainerControl2.Panel2.Controls.Add(this.label1);
+            this.splitContainerControl2.Panel2.Controls.Add(this.panel6);
+            this.splitContainerControl2.Panel2.Controls.Add(this.panel4);
+            this.splitContainerControl2.Panel2.Controls.Add(this.panel5);
+            this.splitContainerControl2.Panel2.Controls.Add(this.panel3);
+            this.splitContainerControl2.Panel2.Text = "Panel2";
+            this.splitContainerControl2.Size = new System.Drawing.Size(1055, 628);
+            this.splitContainerControl2.SplitterPosition = 255;
+            this.splitContainerControl2.TabIndex = 1;
+            // 
+            // panLayHead
+            // 
+            this.panLayHead.AutoScroll = true;
+            this.panLayHead.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panLayHead.Controls.Add(this.panel1);
+            this.panLayHead.Controls.Add(this.panelControl1);
+            this.panLayHead.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panLayHead.Location = new System.Drawing.Point(0, 0);
+            this.panLayHead.Name = "panLayHead";
+            this.panLayHead.Size = new System.Drawing.Size(1055, 255);
+            this.panLayHead.TabIndex = 400;
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl7.Appearance.Options.UseFont = true;
+            this.labelControl7.Location = new System.Drawing.Point(3, 16);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(68, 21);
+            this.labelControl7.TabIndex = 397;
+            this.labelControl7.Text = "鐢宠鏃堕棿";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Enabled = false;
+            this.textEdit1.Location = new System.Drawing.Point(75, 12);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit1.Properties.Appearance.Options.UseFont = true;
+            this.textEdit1.Size = new System.Drawing.Size(166, 28);
+            this.textEdit1.TabIndex = 398;
+            // 
+            // labelControl8
+            // 
+            this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl8.Appearance.Options.UseFont = true;
+            this.labelControl8.Location = new System.Drawing.Point(5, 32);
+            this.labelControl8.Name = "labelControl8";
+            this.labelControl8.Size = new System.Drawing.Size(51, 21);
+            this.labelControl8.TabIndex = 395;
+            this.labelControl8.Text = "鐢宠浜�";
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.Enabled = false;
+            this.textEdit2.Location = new System.Drawing.Point(60, 28);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit2.Properties.Appearance.Options.UseFont = true;
+            this.textEdit2.Size = new System.Drawing.Size(166, 28);
+            this.textEdit2.TabIndex = 396;
+            // 
+            // txt_isWc
+            // 
+            this.txt_isWc.Enabled = false;
+            this.txt_isWc.Location = new System.Drawing.Point(188, 38);
+            this.txt_isWc.Name = "txt_isWc";
+            this.txt_isWc.Properties.Caption = "";
+            this.txt_isWc.Size = new System.Drawing.Size(39, 24);
+            this.txt_isWc.TabIndex = 394;
+            // 
+            // txt_shState
+            // 
+            this.txt_shState.Enabled = false;
+            this.txt_shState.Location = new System.Drawing.Point(74, 38);
+            this.txt_shState.Name = "txt_shState";
+            this.txt_shState.Properties.Caption = "";
+            this.txt_shState.Size = new System.Drawing.Size(29, 24);
+            this.txt_shState.TabIndex = 393;
+            // 
+            // lb_isWc
+            // 
+            this.lb_isWc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_isWc.Appearance.Options.UseFont = true;
+            this.lb_isWc.Location = new System.Drawing.Point(112, 40);
+            this.lb_isWc.Name = "lb_isWc";
+            this.lb_isWc.Size = new System.Drawing.Size(73, 21);
+            this.lb_isWc.TabIndex = 392;
+            this.lb_isWc.Text = "瀹岀粨鏍囪瘑 ";
+            // 
+            // lb_shState
+            // 
+            this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shState.Appearance.Options.UseFont = true;
+            this.lb_shState.Location = new System.Drawing.Point(2, 40);
+            this.lb_shState.Name = "lb_shState";
+            this.lb_shState.Size = new System.Drawing.Size(68, 21);
+            this.lb_shState.TabIndex = 391;
+            this.lb_shState.Text = "瀹℃牳鐘舵��";
+            // 
+            // lb_shDate
+            // 
+            this.lb_shDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shDate.Appearance.Options.UseFont = true;
+            this.lb_shDate.Location = new System.Drawing.Point(3, 20);
+            this.lb_shDate.Name = "lb_shDate";
+            this.lb_shDate.Size = new System.Drawing.Size(68, 21);
+            this.lb_shDate.TabIndex = 389;
+            this.lb_shDate.Text = "瀹℃牳鏃堕棿";
+            // 
+            // txt_shDate
+            // 
+            this.txt_shDate.Enabled = false;
+            this.txt_shDate.Location = new System.Drawing.Point(75, 16);
+            this.txt_shDate.Name = "txt_shDate";
+            this.txt_shDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_shDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_shDate.Size = new System.Drawing.Size(166, 28);
+            this.txt_shDate.TabIndex = 390;
+            // 
+            // lb_shBy
+            // 
+            this.lb_shBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shBy.Appearance.Options.UseFont = true;
+            this.lb_shBy.Location = new System.Drawing.Point(3, 15);
+            this.lb_shBy.Name = "lb_shBy";
+            this.lb_shBy.Size = new System.Drawing.Size(51, 21);
+            this.lb_shBy.TabIndex = 387;
+            this.lb_shBy.Text = "瀹℃牳浜�";
+            // 
+            // txt_shBy
+            // 
+            this.txt_shBy.Enabled = false;
+            this.txt_shBy.Location = new System.Drawing.Point(58, 11);
+            this.txt_shBy.Name = "txt_shBy";
+            this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_shBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_shBy.Size = new System.Drawing.Size(166, 28);
+            this.txt_shBy.TabIndex = 388;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.labelControl7);
+            this.panel3.Controls.Add(this.textEdit1);
+            this.panel3.Location = new System.Drawing.Point(118, 45);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(256, 53);
+            this.panel3.TabIndex = 400;
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.lb_shBy);
+            this.panel4.Controls.Add(this.txt_shBy);
+            this.panel4.Location = new System.Drawing.Point(748, 118);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(237, 46);
+            this.panel4.TabIndex = 401;
+            // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.lb_shDate);
+            this.panel5.Controls.Add(this.txt_shDate);
+            this.panel5.Location = new System.Drawing.Point(453, 99);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(267, 58);
+            this.panel5.TabIndex = 402;
+            // 
+            // panel6
+            // 
+            this.panel6.Controls.Add(this.lb_isWc);
+            this.panel6.Controls.Add(this.txt_shState);
+            this.panel6.Controls.Add(this.lb_shState);
+            this.panel6.Controls.Add(this.txt_isWc);
+            this.panel6.Location = new System.Drawing.Point(116, 132);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(240, 70);
+            this.panel6.TabIndex = 403;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(383, 160);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(44, 18);
+            this.label1.TabIndex = 404;
+            this.label1.Text = "label1";
+            // 
+            // panelControl1
+            // 
+            this.panelControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.panelControl1.Appearance.BorderColor = System.Drawing.Color.Red;
+            this.panelControl1.Appearance.Options.UseBackColor = true;
+            this.panelControl1.Appearance.Options.UseBorderColor = true;
+            this.panelControl1.Controls.Add(this.textEdit2);
+            this.panelControl1.Controls.Add(this.labelControl8);
+            this.panelControl1.Location = new System.Drawing.Point(384, 50);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(283, 186);
+            this.panelControl1.TabIndex = 400;
+            // 
+            // panel1
+            // 
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Location = new System.Drawing.Point(83, 62);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(200, 100);
+            this.panel1.TabIndex = 401;
+            // 
+            // XtraForm1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1057, 660);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Name = "XtraForm1";
+            this.Text = "XtraForm1";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+            this.splitContainerControl1.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).EndInit();
+            this.splitContainerControl2.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).EndInit();
+            this.splitContainerControl2.Panel2.ResumeLayout(false);
+            this.splitContainerControl2.Panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).EndInit();
+            this.splitContainerControl2.ResumeLayout(false);
+            this.panLayHead.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            this.panel5.ResumeLayout(false);
+            this.panel5.PerformLayout();
+            this.panel6.ResumeLayout(false);
+            this.panel6.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            this.panelControl1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl2;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.LabelControl labelControl8;
+        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraEditors.CheckEdit txt_isWc;
+        private DevExpress.XtraEditors.CheckEdit txt_shState;
+        private DevExpress.XtraEditors.LabelControl lb_isWc;
+        private DevExpress.XtraEditors.LabelControl lb_shState;
+        private DevExpress.XtraEditors.LabelControl lb_shDate;
+        private DevExpress.XtraEditors.TextEdit txt_shDate;
+        private DevExpress.XtraEditors.LabelControl lb_shBy;
+        private DevExpress.XtraEditors.TextEdit txt_shBy;
+        private System.Windows.Forms.Panel panLayHead;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.Label label1;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
+        private System.Windows.Forms.Panel panel1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
new file mode 100644
index 0000000..0ecbda3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -0,0 +1,23 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
+    {
+        public XtraForm1()
+        {
+            InitializeComponent();
+            Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, panLayHead, label1);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -0,0 +1,120 @@
+锘�<?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>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ebf7249..28c9045 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -681,6 +681,12 @@
     <Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
       <DependentUpon>WwBlclDj.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\XtraForm1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\XtraForm1.Designer.cs">
+      <DependentUpon>XtraForm1.cs</DependentUpon>
+    </Compile>
     <Compile Include="Entity\LoginInfoModel.cs" />
     <Compile Include="Entity\PageQueryModel.cs" />
     <Compile Include="Entity\ReturnModel.cs" />
@@ -1175,6 +1181,9 @@
     <EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
       <DependentUpon>WwBlclDj.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\XtraForm1.resx">
+      <DependentUpon>XtraForm1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index f226192..fc262cf 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -38,7 +38,7 @@
         /// </summary>
         private static void _startLogin()
         {
-            //Application.Run(new XtraForm2());
+            //Application.Run(new XtraForm1());
             //return;
             CefSettings settings = new CefSettings();
             settings.Locale = "zh-CN";
diff --git a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
index a7a52f2..0206e17 100644
--- a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
+++ b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraCharts;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -90,19 +91,29 @@
             dragBox2_Container.Show();
         }
         #region Public Method
-        public static void RegisterControl(DevExpress.XtraEditors.XtraForm frm, Control control, Control box1, Label lbMsg)
+        public static void RegisterControl(DevExpress.XtraEditors.XtraForm frm, Control box1, Label lbMsg)
         {
             InitializeComponent(frm);
-            if (control != null)
+            foreach (Control control in box1.Controls)
             {
-                sbMsg = lbMsg;
-                dragBox1 = box1;
-                dragCurrent_Name = box1.Name;
-                control.MouseDown += new MouseEventHandler(control_MouseDown);
-                control.MouseLeave += new EventHandler(control_MouseLeave);
-                control.MouseMove += new MouseEventHandler(control_MouseMove);
-                control.Resize += myPanel_Resize;
+                if (control != null)
+                {
+                    sbMsg = lbMsg;
+                    dragBox1 = box1;
+                    dragCurrent_Name = box1.Name;
+                    control.MouseDown += new MouseEventHandler(control_MouseDown);
+                    control.MouseLeave += new EventHandler(control_MouseLeave);
+                    control.MouseMove += new MouseEventHandler(control_MouseMove);
+                    control.MouseUp += Control_MouseUp;
+                   
+                    control.Resize += myPanel_Resize;
+                }
             }
+        }
+
+        private static void Control_MouseUp(object sender, MouseEventArgs e)
+        {
+            (sender as Control).Refresh();
         }
 
         public static void UnRegisterControl(Control control)
@@ -123,6 +134,8 @@
             p1.Y = e.Y;
             isDragging = true;
             dragCurrent_Name = (sender as Control).Parent.Name;
+
+          
         }
 
         private static void myPanel_Resize(object sender, EventArgs e)
@@ -136,6 +149,8 @@
                     childControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
                     int newY = (panel.ClientSize.Height - childControl.Height) / 2;
                     childControl.Location = new Point(childControl.Location.X, newY);
+
+
                 }
 
             }
@@ -249,6 +264,16 @@
                     default:
                         break;
                 }
+
+                control.Refresh();
+                Graphics g = control.CreateGraphics();
+                int width = control.Width;
+                int height = control.Height;
+                Point[] ps =  { new Point(0, 0),new Point(width - 1, 0),
+    new Point(width - 1, height - 1),new Point(0, height - 1),new Point(0, 0) };
+                g.DrawLines(new Pen(Color.LightCoral), ps);
+
+
             }
 
 

--
Gitblit v1.9.3