From 3ee759fb8ca911b0fa3c4ccb82d318ca8ee559ad Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 18 八月 2025 11:00:54 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs | 360 +++++++++++++++++++++++++----------------------------------
1 files changed, 154 insertions(+), 206 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
index acdc974..3ba3360 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
@@ -30,54 +30,50 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = 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.txt_returnType = new Gs.DevApp.UserControl.UcDictionaryComBox();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_thOrgId = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_returnType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
- this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -89,10 +85,10 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -113,6 +109,8 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -132,14 +130,13 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -151,10 +148,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -239,36 +236,22 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
this.gv_status,
- this.gv_isFinish,
- this.gv_isOut,
this.gv_billNo,
this.gv_lastUpdateUser,
this.gv_lastUpdateTime,
this.gv_checkUser,
this.gv_checkDate,
- this.gv_returnMethod,
this.gv_returnType,
this.gv_depotId,
- this.gv_suppId,
- this.gv_remark});
+ this.gv_remark,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "閫�璐х粍缁�";
- this.gridColumn1.FieldName = "receivingOrg";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "org.fnamber";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 250;
//
// gv_status
//
@@ -281,36 +264,8 @@
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 1;
+ this.gv_status.VisibleIndex = 0;
this.gv_status.Width = 50;
- //
- // gv_isFinish
- //
- this.gv_isFinish.AppearanceCell.Options.UseFont = true;
- this.gv_isFinish.Caption = "鏄惁瀹屾垚";
- this.gv_isFinish.FieldName = "isFinish";
- this.gv_isFinish.MaxWidth = 50;
- this.gv_isFinish.MinWidth = 50;
- this.gv_isFinish.Name = "gv_isFinish";
- this.gv_isFinish.OptionsColumn.AllowEdit = false;
- this.gv_isFinish.Tag = "query_a.IS_FINISH";
- this.gv_isFinish.Visible = true;
- this.gv_isFinish.VisibleIndex = 2;
- this.gv_isFinish.Width = 50;
- //
- // gv_isOut
- //
- this.gv_isOut.AppearanceCell.Options.UseFont = true;
- this.gv_isOut.Caption = "濮斿鏍囪瘑";
- this.gv_isOut.FieldName = "isOut";
- this.gv_isOut.MaxWidth = 50;
- this.gv_isOut.MinWidth = 50;
- this.gv_isOut.Name = "gv_isOut";
- this.gv_isOut.OptionsColumn.AllowEdit = false;
- this.gv_isOut.Tag = "query_a.IS_OUT";
- this.gv_isOut.Visible = true;
- this.gv_isOut.VisibleIndex = 3;
- this.gv_isOut.Width = 50;
//
// gv_billNo
//
@@ -321,7 +276,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 4;
+ this.gv_billNo.VisibleIndex = 1;
this.gv_billNo.Width = 120;
//
// gv_lastUpdateUser
@@ -333,7 +288,7 @@
this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
this.gv_lastUpdateUser.Visible = true;
- this.gv_lastUpdateUser.VisibleIndex = 5;
+ this.gv_lastUpdateUser.VisibleIndex = 2;
this.gv_lastUpdateUser.Width = 94;
//
// gv_lastUpdateTime
@@ -345,7 +300,7 @@
this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
this.gv_lastUpdateTime.Visible = true;
- this.gv_lastUpdateTime.VisibleIndex = 6;
+ this.gv_lastUpdateTime.VisibleIndex = 3;
this.gv_lastUpdateTime.Width = 180;
//
// gv_checkUser
@@ -357,7 +312,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 7;
+ this.gv_checkUser.VisibleIndex = 4;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -369,31 +324,19 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 8;
+ this.gv_checkDate.VisibleIndex = 5;
this.gv_checkDate.Width = 94;
- //
- // gv_returnMethod
- //
- this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
- this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
- this.gv_returnMethod.FieldName = "returnMethod";
- this.gv_returnMethod.Name = "gv_returnMethod";
- this.gv_returnMethod.OptionsColumn.AllowEdit = false;
- this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
- this.gv_returnMethod.Visible = true;
- this.gv_returnMethod.VisibleIndex = 9;
- this.gv_returnMethod.Width = 94;
//
// gv_returnType
//
this.gv_returnType.AppearanceCell.Options.UseFont = true;
- this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
+ this.gv_returnType.Caption = "閫�搴撶被鍨� ";
this.gv_returnType.FieldName = "returnType";
this.gv_returnType.Name = "gv_returnType";
this.gv_returnType.OptionsColumn.AllowEdit = false;
this.gv_returnType.Tag = "query_a.RETURN_TYPE";
this.gv_returnType.Visible = true;
- this.gv_returnType.VisibleIndex = 10;
+ this.gv_returnType.VisibleIndex = 6;
this.gv_returnType.Width = 94;
//
// gv_depotId
@@ -405,20 +348,8 @@
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 11;
+ this.gv_depotId.VisibleIndex = 7;
this.gv_depotId.Width = 94;
- //
- // gv_suppId
- //
- this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟�";
- this.gv_suppId.FieldName = "supName";
- this.gv_suppId.Name = "gv_suppId";
- this.gv_suppId.OptionsColumn.AllowEdit = false;
- this.gv_suppId.Tag = "query_a.SUPP_ID";
- this.gv_suppId.Visible = true;
- this.gv_suppId.VisibleIndex = 12;
- this.gv_suppId.Width = 94;
//
// gv_remark
//
@@ -429,8 +360,16 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 13;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "涓婚敭";
+ this.gridColumn1.FieldName = "guid";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Width = 94;
//
// pageBar1
//
@@ -474,18 +413,18 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_returnType);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_thOrgId);
- this.layoutMx1.Controls.Add(this.txt_returnType);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_depotId);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Controls.Add(this.lastUpdateUser);
- this.layoutMx1.Controls.Add(this.lastUpdateTime);
+ this.layoutMx1.Controls.Add(this.txt_lastUpdateUser);
+ this.layoutMx1.Controls.Add(this.txt_lastUpdateTime);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -499,6 +438,15 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_returnType
+ //
+ this.txt_returnType.Location = new System.Drawing.Point(385, 12);
+ this.txt_returnType.Name = "txt_returnType";
+ this.txt_returnType.Size = new System.Drawing.Size(165, 24);
+ this.txt_returnType.TabIndex = 533;
+ this.txt_returnType.TextTxt = "";
+ this.txt_returnType.WhereTxt = "a.s_type=\'鐢熶骇閫�搴撳師鍥燶' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+ //
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
@@ -507,7 +455,7 @@
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 525;
- this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
+ this.btnSelect.Text = "閫夋嫨閫�搴撴槑缁�";
//
// lbGuid
//
@@ -525,25 +473,6 @@
this.txt_thOrgId.Name = "txt_thOrgId";
this.txt_thOrgId.Size = new System.Drawing.Size(165, 24);
this.txt_thOrgId.TabIndex = 526;
- //
- // txt_returnType
- //
- this.txt_returnType.EditValue = "-璇烽�夋嫨-";
- this.txt_returnType.Location = new System.Drawing.Point(385, 12);
- this.txt_returnType.Name = "txt_returnType";
- this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_returnType.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "TKYY01_SYS(璁㈠崟鏈夎)",
- "TKYY02_SYS(鏁伴噺鏈夎)",
- "TKYY03_SYS(缂栫爜鏈夎)",
- "TKYY04_SYS(璐ㄩ噺闂)",
- "TKYY05_SYS(鍖呰璋冩暣)"});
- this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnType.Size = new System.Drawing.Size(165, 24);
- this.txt_returnType.StyleController = this.layoutMx1;
- this.txt_returnType.TabIndex = 521;
//
// txt_billNo
//
@@ -603,23 +532,23 @@
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
- // lastUpdateUser
+ // txt_lastUpdateUser
//
- this.lastUpdateUser.Location = new System.Drawing.Point(656, 12);
- this.lastUpdateUser.Name = "lastUpdateUser";
- this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
- this.lastUpdateUser.StyleController = this.layoutMx1;
- this.lastUpdateUser.TabIndex = 530;
- this.lastUpdateUser.Tag = "readonly";
+ this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12);
+ this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
+ this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24);
+ this.txt_lastUpdateUser.StyleController = this.layoutMx1;
+ this.txt_lastUpdateUser.TabIndex = 530;
+ this.txt_lastUpdateUser.Tag = "readonly";
//
- // lastUpdateTime
+ // txt_lastUpdateTime
//
- this.lastUpdateTime.Location = new System.Drawing.Point(656, 43);
- this.lastUpdateTime.Name = "lastUpdateTime";
- this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
- this.lastUpdateTime.StyleController = this.layoutMx1;
- this.lastUpdateTime.TabIndex = 531;
- this.lastUpdateTime.Tag = "readonly";
+ this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
+ this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
+ this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
+ this.txt_lastUpdateTime.StyleController = this.layoutMx1;
+ this.txt_lastUpdateTime.TabIndex = 531;
+ this.txt_lastUpdateTime.Tag = "readonly";
//
// txt_guid
//
@@ -664,35 +593,35 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem11,
- this.layoutControlItem6,
this.layoutControlItem3,
this.layoutControlItem7,
- this.layoutControlItem16});
+ this.layoutControlItem16,
+ this.layoutControlItem4});
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;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1105, 113);
this.Root.TextVisible = false;
//
@@ -722,7 +651,7 @@
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
- this.layoutControlItem9.Text = "瀹℃牳浜�";
+ this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
@@ -738,17 +667,17 @@
//
// layoutControlItem14
//
- this.layoutControlItem14.Control = this.lastUpdateUser;
+ this.layoutControlItem14.Control = this.txt_lastUpdateUser;
this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
+ this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉鍛�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.lastUpdateTime;
+ this.layoutControlItem15.Control = this.txt_lastUpdateTime;
this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -768,16 +697,6 @@
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_returnType;
- 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, 31);
- this.layoutControlItem6.Text = "閫�搴撳師鍥�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
@@ -815,6 +734,16 @@
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_returnType;
+ this.layoutControlItem4.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Text = "閫�搴撳師鍥�";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -862,7 +791,9 @@
this.gvMx1sqNum,
this.gvMx1ysNum,
this.gvMx1remark,
- this.gvMxDel});
+ this.gvMxDel,
+ this.gridColumn6,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -871,7 +802,7 @@
//
// rkmxGuid
//
- this.rkmxGuid.Caption = "gridColumn1";
+ this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏琛℅uid";
this.rkmxGuid.FieldName = "rkmxGuid";
this.rkmxGuid.MinWidth = 25;
this.rkmxGuid.Name = "rkmxGuid";
@@ -880,7 +811,7 @@
// gvMx1id
//
this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "ID ";
+ this.gvMx1id.Caption = "鐢宠鏄庣粏Guid";
this.gvMx1id.FieldName = "id";
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
@@ -890,7 +821,7 @@
// gvMx1mid
//
this.gvMx1mid.AppearanceCell.Options.UseFont = true;
- this.gvMx1mid.Caption = "MID ";
+ this.gvMx1mid.Caption = "涓昏〃Guid";
this.gvMx1mid.FieldName = "mid";
this.gvMx1mid.MinWidth = 50;
this.gvMx1mid.Name = "gvMx1mid";
@@ -906,7 +837,7 @@
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.Tag = "query_a.EBELN";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 0;
+ this.gvMx1ebeln.VisibleIndex = 2;
this.gvMx1ebeln.Width = 94;
//
// gvMx1itemId
@@ -926,7 +857,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 94;
//
// gridColumn5
@@ -936,7 +867,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.VisibleIndex = 4;
this.gridColumn5.Width = 94;
//
// gridColumn3
@@ -946,7 +877,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -956,7 +887,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 94;
//
// gvMx1sqNum
@@ -972,7 +903,7 @@
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
- this.gvMx1sqNum.VisibleIndex = 5;
+ this.gvMx1sqNum.VisibleIndex = 7;
this.gvMx1sqNum.Width = 94;
//
// gvMx1ysNum
@@ -984,7 +915,7 @@
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "query_a.YS_NUM";
this.gvMx1ysNum.Visible = true;
- this.gvMx1ysNum.VisibleIndex = 6;
+ this.gvMx1ysNum.VisibleIndex = 8;
this.gvMx1ysNum.Width = 94;
//
// gvMx1remark
@@ -1000,7 +931,7 @@
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 7;
+ this.gvMx1remark.VisibleIndex = 9;
this.gvMx1remark.Width = 94;
//
// gvMxDel
@@ -1010,16 +941,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.VisibleIndex = 10;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1034,6 +965,26 @@
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "宸ュ崟鍙�";
+ this.gridColumn6.FieldName = "daa001";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn7.FieldName = "daa021";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 1;
+ this.gridColumn7.Width = 94;
//
// Frm_MesSctkSq
//
@@ -1064,14 +1015,13 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_returnType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1083,10 +1033,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1105,19 +1055,14 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1126,7 +1071,6 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private UserControl.UcLookOrg txt_thOrgId;
private DevExpress.XtraEditors.SimpleButton btnSelect;
- private DevExpress.XtraEditors.ComboBoxEdit txt_returnType;
private UserControl.UcLookCk txt_depotId;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1139,8 +1083,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraEditors.TextEdit lastUpdateUser;
- private DevExpress.XtraEditors.TextEdit lastUpdateTime;
+ private DevExpress.XtraEditors.TextEdit txt_lastUpdateUser;
+ private DevExpress.XtraEditors.TextEdit txt_lastUpdateTime;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1165,9 +1109,13 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private UserControl.UcDictionaryComBox txt_returnType;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3