From ef7d088a7d22677165e53b8e50c8de679b4b36dc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 三月 2025 21:54:22 +0800
Subject: [PATCH] 受退
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs | 2
DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs | 13
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs | 493 +++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs | 412 +++++++++++--------------
6 files changed, 449 insertions(+), 481 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 6455643..d198b59 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -69,7 +69,13 @@
this.txt_fCustId.Focus();
return;
}
- var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fIsLink.SelectedIndex.ToString());
+ if (string.IsNullOrEmpty(this.txt_fStockId.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浠撳簱锛�");
+ this.txt_fStockId.Focus();
+ return;
+ }
+ var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
index 03097f4..02f2def 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs
@@ -29,14 +29,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -47,21 +47,26 @@
this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_cusName = new DevExpress.XtraEditors.TextEdit();
@@ -71,6 +76,9 @@
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_statusChk = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_receivingOrg = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ckNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -78,6 +86,13 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -106,21 +121,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_receivingOrg = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_ckNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -141,7 +141,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cusName.Properties)).BeginInit();
@@ -151,6 +151,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_statusChk.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -158,6 +161,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -167,22 +177,13 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -333,6 +334,16 @@
this.gv_boardItem.VisibleIndex = 3;
this.gv_boardItem.Width = 94;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "浠撳簱缂栧彿";
+ this.gridColumn9.FieldName = "ckNo";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 4;
+ this.gridColumn9.Width = 94;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "浠撳簱鍚嶇О";
@@ -352,6 +363,26 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "瀹㈡埛缂栧彿";
+ this.gridColumn10.FieldName = "cusNo";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 7;
+ this.gridColumn10.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "瀹㈡埛鍚嶇О";
+ this.gridColumn12.FieldName = "cusName";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 8;
+ this.gridColumn12.Width = 94;
//
// gv_outType
//
@@ -428,7 +459,7 @@
this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
+ this.gv_remark.FieldName = "sqRemark";
this.gv_remark.MinWidth = 50;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -436,6 +467,24 @@
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 14;
this.gv_remark.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "涓婚敭Guid";
+ this.gridColumn8.FieldName = "guid";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "搴撳瓨缁勭粐";
+ this.gridColumn11.FieldName = "receivingOrg";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 15;
+ this.gridColumn11.Width = 94;
//
// pageBar1
//
@@ -480,7 +529,7 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_ckName);
- this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Controls.Add(this.txt_outType);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_cusName);
@@ -514,7 +563,7 @@
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(355, 72);
+ this.txt_ckName.Location = new System.Drawing.Point(355, 76);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
@@ -522,19 +571,19 @@
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 575;
//
- // txt_remark
+ // txt_sqRemark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 104);
- 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(466, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 243;
+ this.txt_sqRemark.Location = new System.Drawing.Point(84, 108);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_sqRemark.Size = new System.Drawing.Size(466, 28);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 243;
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(355, 8);
+ this.txt_outType.Location = new System.Drawing.Point(355, 12);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
@@ -544,7 +593,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(897, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(897, 44);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -554,7 +603,7 @@
//
// txt_cusName
//
- this.txt_cusName.Location = new System.Drawing.Point(355, 40);
+ this.txt_cusName.Location = new System.Drawing.Point(355, 44);
this.txt_cusName.Name = "txt_cusName";
this.txt_cusName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_cusName.Properties.Appearance.Options.UseFont = true;
@@ -564,7 +613,7 @@
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(84, 8);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
@@ -574,7 +623,7 @@
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(84, 40);
+ this.txt_taskNo.Location = new System.Drawing.Point(84, 44);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
@@ -584,7 +633,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 8);
+ this.txt_createBy.Location = new System.Drawing.Point(626, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -594,7 +643,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(897, 8);
+ this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -604,7 +653,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(626, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(626, 44);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -614,12 +663,40 @@
//
// txt_statusChk
//
- this.txt_statusChk.Location = new System.Drawing.Point(825, 72);
+ this.txt_statusChk.Location = new System.Drawing.Point(825, 76);
this.txt_statusChk.Name = "txt_statusChk";
this.txt_statusChk.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_statusChk.Size = new System.Drawing.Size(268, 24);
this.txt_statusChk.StyleController = this.layoutMx1;
this.txt_statusChk.TabIndex = 576;
+ //
+ // txt_receivingOrg
+ //
+ this.txt_receivingOrg.Location = new System.Drawing.Point(84, 76);
+ this.txt_receivingOrg.Name = "txt_receivingOrg";
+ this.txt_receivingOrg.Size = new System.Drawing.Size(195, 24);
+ this.txt_receivingOrg.StyleController = this.layoutMx1;
+ this.txt_receivingOrg.TabIndex = 577;
+ //
+ // txt_ckNo
+ //
+ this.txt_ckNo.Location = new System.Drawing.Point(626, 76);
+ this.txt_ckNo.Name = "txt_ckNo";
+ this.txt_ckNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_ckNo.StyleController = this.layoutMx1;
+ this.txt_ckNo.TabIndex = 578;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.lbGuid;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "lbGuid";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
//
// Root
//
@@ -641,32 +718,32 @@
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.Root.Size = new System.Drawing.Size(1105, 148);
this.Root.TextVisible = false;
//
@@ -731,6 +808,82 @@
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_statusChk;
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_ckName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "鍙戣揣浠撳簱";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_outType;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Text = "鍑哄簱绫诲埆";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_cusName;
+ this.layoutControlItem9.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "瀹㈡埛鍚嶇О";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_receivingOrg;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem13.Text = "浠撳簱缁勭粐";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_sqRemark;
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem10.Text = "澶囨敞淇℃伅";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_ckNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "浠撳簱缂栧彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -763,6 +916,8 @@
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1itemNo,
@@ -861,7 +1016,7 @@
this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
- this.gvMx1remark.FieldName = "remark";
+ this.gvMx1remark.FieldName = "sqRemark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
@@ -922,6 +1077,8 @@
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2itemBarcode,
this.gvMx2itemNo,
@@ -1071,158 +1228,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn9
- //
- this.gridColumn9.Caption = "浠撳簱缂栧彿";
- this.gridColumn9.FieldName = "ckNo";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 94;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "瀹㈡埛缂栧彿";
- this.gridColumn10.FieldName = "cusNo";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 7;
- this.gridColumn10.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "瀹㈡埛鍚嶇О";
- this.gridColumn12.FieldName = "cusName";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 8;
- this.gridColumn12.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "涓婚敭Guid";
- this.gridColumn8.FieldName = "guid";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 94;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "搴撳瓨缁勭粐";
- this.gridColumn11.FieldName = "receivingOrg";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 15;
- this.gridColumn11.Width = 94;
- //
- // txt_receivingOrg
- //
- this.txt_receivingOrg.Location = new System.Drawing.Point(84, 72);
- this.txt_receivingOrg.Name = "txt_receivingOrg";
- this.txt_receivingOrg.Size = new System.Drawing.Size(195, 24);
- this.txt_receivingOrg.StyleController = this.layoutMx1;
- this.txt_receivingOrg.TabIndex = 577;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.lbGuid;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "lbGuid";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_statusChk;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_ckName;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "鍙戣揣浠撳簱";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_outType;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem6.Text = "鍑哄簱绫诲埆";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_cusName;
- this.layoutControlItem9.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem9.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_receivingOrg;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem13.Text = "浠撳簱缁勭粐";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_remark;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem10.Text = "澶囨敞淇℃伅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_ckNo
- //
- this.txt_ckNo.Location = new System.Drawing.Point(626, 72);
- this.txt_ckNo.Name = "txt_ckNo";
- this.txt_ckNo.Size = new System.Drawing.Size(195, 24);
- this.txt_ckNo.StyleController = this.layoutMx1;
- this.txt_ckNo.TabIndex = 578;
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_ckNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "浠撳簱缂栧彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_MesShouTuiDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1253,7 +1258,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cusName.Properties)).EndInit();
@@ -1263,6 +1268,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_statusChk.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -1270,6 +1278,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1279,16 +1294,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -1321,7 +1326,7 @@
private DevExpress.XtraEditors.TextEdit txt_taskNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_cusName;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
index bf2c77c..c6e7483 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
@@ -232,6 +232,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -249,6 +250,7 @@
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
index 26266a5..c273449 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
@@ -54,7 +54,6 @@
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -62,13 +61,13 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_khName = new DevExpress.XtraEditors.TextEdit();
@@ -81,24 +80,16 @@
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_reason = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -124,7 +115,13 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -145,7 +142,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).BeginInit();
@@ -158,24 +154,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -185,6 +173,13 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -270,7 +265,6 @@
this.gv_createDate,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
- this.gv_remark,
this.bandedGridColumn4,
this.gv_checkUser,
this.gv_checkDate,
@@ -338,8 +332,6 @@
this.gv_depotsCode.Name = "gv_depotsCode";
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
- this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 3;
this.gv_depotsCode.Width = 94;
//
// gv_depotsId
@@ -353,7 +345,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 4;
+ this.gv_depotsId.VisibleIndex = 3;
this.gv_depotsId.Width = 89;
//
// bandedGridColumn1
@@ -363,7 +355,7 @@
this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 5;
+ this.bandedGridColumn1.VisibleIndex = 4;
this.bandedGridColumn1.Width = 94;
//
// gv_reason
@@ -371,13 +363,13 @@
this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
+ this.gv_reason.FieldName = "sqRemark";
this.gv_reason.MinWidth = 25;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.REASON";
this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 6;
+ this.gv_reason.VisibleIndex = 5;
this.gv_reason.Width = 94;
//
// gv_createBy
@@ -391,7 +383,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 7;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 66;
//
// gv_createDate
@@ -405,7 +397,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 8;
+ this.gv_createDate.VisibleIndex = 7;
this.gv_createDate.Width = 146;
//
// gv_lastupdateBy
@@ -419,7 +411,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 9;
+ this.gv_lastupdateBy.VisibleIndex = 8;
this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
@@ -433,22 +425,8 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 10;
+ this.gv_lastupdateDate.VisibleIndex = 9;
this.gv_lastupdateDate.Width = 94;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞 ";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.REMARK";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 11;
- this.gv_remark.Width = 119;
//
// bandedGridColumn4
//
@@ -457,7 +435,7 @@
this.bandedGridColumn4.MinWidth = 25;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 12;
+ this.bandedGridColumn4.VisibleIndex = 10;
this.bandedGridColumn4.Width = 94;
//
// gv_checkUser
@@ -471,7 +449,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 13;
+ this.gv_checkUser.VisibleIndex = 11;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -485,7 +463,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 14;
+ this.gv_checkDate.VisibleIndex = 12;
this.gv_checkDate.Width = 94;
//
// bandedGridColumn3
@@ -495,7 +473,7 @@
this.bandedGridColumn3.MinWidth = 25;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 15;
+ this.bandedGridColumn3.VisibleIndex = 13;
this.bandedGridColumn3.Width = 94;
//
// gridColumn7
@@ -504,8 +482,6 @@
this.gridColumn7.FieldName = "khId";
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 16;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -515,7 +491,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 17;
+ this.gridColumn8.VisibleIndex = 14;
this.gridColumn8.Width = 94;
//
// gv_guid
@@ -529,6 +505,16 @@
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
this.gv_guid.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "瀹㈡埛鍚嶇О";
+ this.gridColumn9.FieldName = "khName";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 15;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -573,7 +559,6 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_ckName);
- this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_khName);
@@ -586,7 +571,7 @@
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
- this.layoutMx1.Controls.Add(this.txt_reason);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19});
@@ -609,152 +594,142 @@
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(445, 76);
+ this.txt_ckName.Location = new System.Drawing.Point(114, 70);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(225, 28);
+ this.txt_ckName.Size = new System.Drawing.Size(220, 28);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 609;
//
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(114, 76);
- 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(225, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 240;
- //
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1107, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1092, 6);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(227, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(221, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 608;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 76);
+ this.txt_createDate.Location = new System.Drawing.Point(766, 38);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(220, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_khName
//
- this.txt_khName.Location = new System.Drawing.Point(445, 44);
+ this.txt_khName.Location = new System.Drawing.Point(440, 70);
this.txt_khName.Name = "txt_khName";
this.txt_khName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_khName.Properties.Appearance.Options.UseFont = true;
- this.txt_khName.Size = new System.Drawing.Size(225, 28);
+ this.txt_khName.Size = new System.Drawing.Size(220, 28);
this.txt_khName.StyleController = this.layoutMx1;
this.txt_khName.TabIndex = 595;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(114, 6);
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(225, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(220, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(445, 12);
+ this.txt_taskNo.Location = new System.Drawing.Point(440, 6);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(225, 28);
+ this.txt_taskNo.Size = new System.Drawing.Size(220, 28);
this.txt_taskNo.StyleController = this.layoutMx1;
this.txt_taskNo.TabIndex = 507;
//
// txt_inType
//
- this.txt_inType.Location = new System.Drawing.Point(776, 12);
+ this.txt_inType.Location = new System.Drawing.Point(440, 38);
this.txt_inType.Name = "txt_inType";
this.txt_inType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_inType.Properties.Appearance.Options.UseFont = true;
- this.txt_inType.Size = new System.Drawing.Size(225, 28);
+ this.txt_inType.Size = new System.Drawing.Size(220, 28);
this.txt_inType.StyleController = this.layoutMx1;
this.txt_inType.TabIndex = 598;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(776, 44);
+ this.txt_createBy.Location = new System.Drawing.Point(766, 6);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(220, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_rkOrg
//
- this.txt_rkOrg.Location = new System.Drawing.Point(114, 44);
+ this.txt_rkOrg.Location = new System.Drawing.Point(114, 38);
this.txt_rkOrg.Name = "txt_rkOrg";
this.txt_rkOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_rkOrg.Size = new System.Drawing.Size(225, 28);
+ this.txt_rkOrg.Size = new System.Drawing.Size(220, 28);
this.txt_rkOrg.StyleController = this.layoutMx1;
this.txt_rkOrg.TabIndex = 593;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1107, 44);
+ this.txt_checkDate.Location = new System.Drawing.Point(1092, 38);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(227, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(221, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(1005, 76);
+ this.txt_status.Location = new System.Drawing.Point(990, 70);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_status.Size = new System.Drawing.Size(329, 24);
+ this.txt_status.Size = new System.Drawing.Size(323, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 609;
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(776, 108);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(766, 70);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(225, 28);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(220, 28);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 610;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 108);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(766, 102);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 28);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(220, 28);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 611;
//
- // txt_reason
+ // txt_sqRemark
//
- this.txt_reason.Location = new System.Drawing.Point(114, 108);
- this.txt_reason.Name = "txt_reason";
- this.txt_reason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_reason.Properties.Appearance.Options.UseFont = true;
- this.txt_reason.Size = new System.Drawing.Size(556, 28);
- this.txt_reason.StyleController = this.layoutMx1;
- this.txt_reason.TabIndex = 613;
+ this.txt_sqRemark.Location = new System.Drawing.Point(114, 102);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_sqRemark.Size = new System.Drawing.Size(546, 28);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 613;
//
// layoutControlItem19
//
@@ -775,19 +750,18 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem8,
this.layoutControlItem12,
- this.layoutControlItem10,
+ this.layoutControlItem20,
this.layoutControlItem14,
+ this.layoutControlItem10,
+ this.layoutControlItem3,
this.layoutControlItem11,
this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem20,
- this.layoutControlItem18,
- this.layoutControlItem17});
+ this.layoutControlItem17,
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -816,7 +790,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1346, 148);
+ this.Root.Size = new System.Drawing.Size(1325, 148);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -824,37 +798,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_taskNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(326, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem2.Text = "鐢宠鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_inType;
- this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_checkUser;
- this.layoutControlItem4.Location = new System.Drawing.Point(993, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(978, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(327, 32);
this.layoutControlItem4.Text = "瀹℃牳浜�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -864,119 +828,43 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_checkDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(993, 32);
+ this.layoutControlItem8.Location = new System.Drawing.Point(978, 32);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(327, 32);
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_status;
- this.layoutControlItem12.Location = new System.Drawing.Point(993, 64);
+ this.layoutControlItem12.Location = new System.Drawing.Point(978, 64);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(327, 32);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_khName;
- this.layoutControlItem10.Location = new System.Drawing.Point(331, 32);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem10.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_ckName;
- this.layoutControlItem14.Location = new System.Drawing.Point(331, 64);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(662, 32);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem11.Text = "鍒涘缓浜�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_createDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(662, 64);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_remark;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem16.Text = "澶囨敞";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem20
//
- this.layoutControlItem20.Control = this.txt_reason;
+ this.layoutControlItem20.Control = this.txt_sqRemark;
this.layoutControlItem20.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(662, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(652, 32);
this.layoutControlItem20.Text = "鍘熷洜";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_lastupdateDate;
- this.layoutControlItem18.Location = new System.Drawing.Point(993, 96);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(333, 32);
- this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_lastupdateBy;
- this.layoutControlItem17.Location = new System.Drawing.Point(662, 96);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(331, 32);
- this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1283,15 +1171,80 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn9
+ // layoutControlItem14
//
- this.gridColumn9.Caption = "瀹㈡埛鍚嶇О";
- this.gridColumn9.FieldName = "khName";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 18;
- this.gridColumn9.Width = 94;
+ this.layoutControlItem14.Control = this.txt_ckName;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_khName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(326, 64);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem10.Text = "瀹㈡埛鍚嶇О";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_inType;
+ this.layoutControlItem3.Location = new System.Drawing.Point(326, 32);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_createBy;
+ this.layoutControlItem11.Location = new System.Drawing.Point(652, 0);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem11.Text = "鍒涘缓浜�";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_createDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(652, 32);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_lastupdateBy;
+ this.layoutControlItem17.Location = new System.Drawing.Point(652, 64);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_lastupdateDate;
+ this.layoutControlItem18.Location = new System.Drawing.Point(652, 96);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_MesShouTuoDj
//
@@ -1323,7 +1276,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).EndInit();
@@ -1336,24 +1288,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1363,6 +1307,13 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
this.ResumeLayout(false);
}
@@ -1385,7 +1336,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
@@ -1403,13 +1353,11 @@
private DevExpress.XtraEditors.TextEdit txt_rkOrg;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_taskNo;
- private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -1443,17 +1391,17 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraEditors.TextEdit txt_reason;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs
index 3989857..464524a 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs
@@ -15,18 +15,22 @@
private string cusId = "";
private string inOrgId = "";
private string isSource = "";
+ private string ckId = "";
/// <summary>
///
/// </summary>
- /// <param name="_suppId">渚涘簲鍟嗙紪鍙� </param>
- /// <param name="_inOrgId">缁勭粐缂栧彿</param>
- /// <param name="_isWw">0鏈夋簮1锛�1鏃犳簮</param>
- public SelectShuoTuiSq(string _cusId, string _inOrgId, string _isSource)
+ /// <param name="_cusId">瀹㈡埛</param>
+ /// <param name="_inOrgId">缁勭粐</param>
+ /// <param name="_ckId">浠撳簱</param>
+ /// <param name="_isSource">0鏈夋簮1锛�1鏃犳簮</param>
+ public SelectShuoTuiSq(string _cusId, string _inOrgId, string _ckId, string _isSource)
{
InitializeComponent();
this.cusId = _cusId;
this.inOrgId = _inOrgId;
+ this.ckId = _ckId;
this.isSource = _isSource;
+
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
@@ -94,6 +98,7 @@
inIsSource = this.isSource,
inCusId = this.cusId,
inOrgId = this.inOrgId,
+ inCkId = this.ckId
};
var json = JsonConvert.SerializeObject(_obj);
try
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index 219f32a..7ffac35 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -407,6 +407,8 @@
//
// gridColumn12
//
+ this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn12.Caption = "鍒悕";
--
Gitblit v1.9.3