From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 871 ++++++++++++++++++++++++++--------------------------------
1 files changed, 390 insertions(+), 481 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 1079444..302fe21 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
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();
@@ -48,54 +49,54 @@
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_returnType = 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.gridColumn7 = 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_fIsLink = new DevExpress.XtraEditors.RadioGroup();
+ this.txt_fCustId = new Gs.DevApp.UserControl.UcLookCustomer();
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_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_returnMethod = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_fReturnStyle = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
+ this.txt_fStockId = new Gs.DevApp.UserControl.UcLookCk();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
- this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
- this.txt_isOut = new DevExpress.XtraEditors.CheckEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_isFinish = 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.layoutControlItem13 = 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.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -104,9 +105,7 @@
this.rkmxGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1invBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -115,15 +114,13 @@
this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1eid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1erpid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1invWorkLine = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -143,47 +140,47 @@
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_fIsLink.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_returnMethod.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.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_isOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.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.layoutControlItem13)).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.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).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;
@@ -229,15 +226,14 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";
+ this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
- this.split1.SplitterPosition = 558;
+ this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
@@ -250,24 +246,23 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
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_returnType,
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.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -275,64 +270,46 @@
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
//
- this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_status.AppearanceCell.Options.UseFont = true;
- this.gv_status.Caption = "瀹℃牳鐘舵��";
- this.gv_status.FieldName = "status";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.Caption = "瀹℃牳鏍囪瘑";
+ this.gv_status.FieldName = "isCheck";
+ this.gv_status.MinWidth = 25;
this.gv_status.Name = "gv_status";
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.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isFinish.AppearanceCell.Options.UseFont = true;
- this.gv_isFinish.Caption = "鏄惁瀹屾垚";
+ this.gv_isFinish.Caption = "瀹屾垚鏍囪瘑";
this.gv_isFinish.FieldName = "isFinish";
- this.gv_isFinish.MaxWidth = 50;
- this.gv_isFinish.MinWidth = 50;
+ this.gv_isFinish.MinWidth = 25;
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.VisibleIndex = 1;
this.gv_isFinish.Width = 50;
//
- // gv_isOut
+ // gv_returnType
//
- this.gv_isOut.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- 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;
+ this.gv_returnType.AppearanceCell.Options.UseFont = true;
+ this.gv_returnType.Caption = "鏈夋棤婧愬崟";
+ this.gv_returnType.FieldName = "fIsLink";
+ 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 = 2;
+ this.gv_returnType.Width = 94;
//
// gv_billNo
//
- this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
this.gv_billNo.FieldName = "billNo";
@@ -340,38 +317,35 @@
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 = 3;
this.gv_billNo.Width = 120;
//
// gv_lastUpdateUser
//
- this.gv_lastUpdateUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
- this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+ this.gv_lastUpdateUser.FieldName = "lastupdateBy";
this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
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 = 4;
this.gv_lastUpdateUser.Width = 94;
//
// gv_lastUpdateTime
//
- this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
- this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+ this.gv_lastUpdateTime.FieldName = "lastupdateDate";
this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
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 = 5;
this.gv_lastUpdateTime.Width = 180;
//
// gv_checkUser
//
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
@@ -379,12 +353,11 @@
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 = 6;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
//
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
this.gv_checkDate.FieldName = "checkDate";
@@ -392,64 +365,47 @@
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 = 7;
this.gv_checkDate.Width = 94;
//
// gv_returnMethod
//
- this.gv_returnMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
- this.gv_returnMethod.FieldName = "returnMethod";
+ this.gv_returnMethod.FieldName = "fReturnStyle";
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.VisibleIndex = 8;
this.gv_returnMethod.Width = 94;
- //
- // gv_returnType
- //
- this.gv_returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_returnType.AppearanceCell.Options.UseFont = true;
- 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.Width = 94;
//
// gv_depotId
//
- this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "浠撳簱";
+ this.gv_depotId.Caption = "浠撳簱鍚嶇О";
this.gv_depotId.FieldName = "dptName";
this.gv_depotId.Name = "gv_depotId";
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 = 9;
this.gv_depotId.Width = 94;
//
// gv_suppId
//
- this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟�";
- this.gv_suppId.FieldName = "supName";
+ this.gv_suppId.Caption = "瀹㈡埛鍚嶇О";
+ this.gv_suppId.FieldName = "cusName";
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.VisibleIndex = 10;
this.gv_suppId.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";
@@ -457,8 +413,26 @@
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 = 12;
this.gv_remark.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "搴撳瓨缁勭粐";
+ this.gridColumn1.FieldName = "receivingOrg";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "org.fnamber";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 11;
+ this.gridColumn1.Width = 250;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婚敭Guid";
+ this.gridColumn7.FieldName = "guid";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
@@ -484,7 +458,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";
+ this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
//
// splitMx1.Panel1
//
@@ -496,40 +470,63 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 142;
+ this.splitMx1.SplitterPosition = 143;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_fIsLink);
+ this.layoutMx1.Controls.Add(this.txt_fCustId);
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_fStockOrgId);
this.layoutMx1.Controls.Add(this.txt_billNo);
- this.layoutMx1.Controls.Add(this.txt_returnMethod);
+ this.layoutMx1.Controls.Add(this.txt_fReturnStyle);
this.layoutMx1.Controls.Add(this.txt_checkDate);
- this.layoutMx1.Controls.Add(this.txt_depotId);
+ this.layoutMx1.Controls.Add(this.txt_fStockId);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_checkUser);
- this.layoutMx1.Controls.Add(this.txt_suppId);
- this.layoutMx1.Controls.Add(this.txt_isOut);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_isFinish);
- 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.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem13});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 409, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 142);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 143);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_fIsLink
+ //
+ this.txt_fIsLink.EditValue = "1";
+ this.txt_fIsLink.Location = new System.Drawing.Point(385, 74);
+ this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_fIsLink.Name = "txt_fIsLink";
+ this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
+ this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.txt_fIsLink.Size = new System.Drawing.Size(165, 27);
+ this.txt_fIsLink.StyleController = this.layoutMx1;
+ this.txt_fIsLink.TabIndex = 533;
+ //
+ // txt_fCustId
+ //
+ this.txt_fCustId.IsReadly = false;
+ this.txt_fCustId.Location = new System.Drawing.Point(385, 43);
+ this.txt_fCustId.Name = "txt_fCustId";
+ this.txt_fCustId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCustId.TabIndex = 532;
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 108);
+ this.btnSelect.Location = new System.Drawing.Point(12, 105);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -538,94 +535,72 @@
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(825, 103);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(268, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_thOrgId
+ // txt_fStockOrgId
//
- this.txt_thOrgId.IsReadly = false;
- this.txt_thOrgId.Location = new System.Drawing.Point(114, 44);
- this.txt_thOrgId.Name = "txt_thOrgId";
- this.txt_thOrgId.Size = new System.Drawing.Size(165, 28);
- this.txt_thOrgId.TabIndex = 526;
- //
- // txt_returnType
- //
- this.txt_returnType.EditValue = "-璇烽�夋嫨-";
- this.txt_returnType.Location = new System.Drawing.Point(385, 76);
- 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[] {
- "-璇烽�夋嫨-",
- "鏉ユ枡涓嶈壇",
- "渚涘簲鍟嗗閫�",
- "浣滀笟涓嶈壇",
- "渚涘簲鍟嗙墿鍝佸彿閿欒",
- "閲囪喘鏂欏彿鍙樻洿"});
- 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;
+ this.txt_fStockOrgId.IsReadly = false;
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 43);
+ this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fStockOrgId.TabIndex = 526;
//
// txt_billNo
//
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
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(165, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(165, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
- // txt_returnMethod
+ // txt_fReturnStyle
//
- this.txt_returnMethod.EditValue = "-璇烽�夋嫨-";
- this.txt_returnMethod.Location = new System.Drawing.Point(385, 44);
- this.txt_returnMethod.Name = "txt_returnMethod";
- this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_fReturnStyle.EditValue = "-璇烽�夋嫨-";
+ this.txt_fReturnStyle.Location = new System.Drawing.Point(385, 12);
+ this.txt_fReturnStyle.Name = "txt_fReturnStyle";
+ this.txt_fReturnStyle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_returnMethod.Properties.Items.AddRange(new object[] {
+ this.txt_fReturnStyle.Properties.Items.AddRange(new object[] {
"-璇烽�夋嫨-",
- "閫�鏂欒ˉ鏂�",
- "閫�鏂欏苟鎵ｆ"});
- this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnMethod.Size = new System.Drawing.Size(165, 24);
- this.txt_returnMethod.StyleController = this.layoutMx1;
- this.txt_returnMethod.TabIndex = 520;
+ "閫�鏂欎笉琛ユ枡(ReturnNoFeed)",
+ "閫�鏂欒ˉ鏂�(ReturnFeed)"});
+ this.txt_fReturnStyle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fReturnStyle.Size = new System.Drawing.Size(165, 24);
+ this.txt_fReturnStyle.StyleController = this.layoutMx1;
+ this.txt_fReturnStyle.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(927, 44);
+ this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
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(166, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
- // txt_depotId
+ // txt_fStockId
//
- this.txt_depotId.IsReadly = false;
- this.txt_depotId.Location = new System.Drawing.Point(114, 76);
- this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_depotId.Name = "txt_depotId";
- this.txt_depotId.Size = new System.Drawing.Size(165, 28);
- this.txt_depotId.TabIndex = 260;
+ this.txt_fStockId.IsReadly = false;
+ this.txt_fStockId.Location = new System.Drawing.Point(114, 74);
+ this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_fStockId.Name = "txt_fStockId";
+ this.txt_fStockId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fStockId.TabIndex = 260;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(656, 108);
+ this.txt_remark.Location = new System.Drawing.Point(385, 105);
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(165, 28);
+ this.txt_remark.Size = new System.Drawing.Size(436, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
@@ -633,68 +608,61 @@
//
this.txt_checkUser.Location = new System.Drawing.Point(927, 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;
- this.txt_checkUser.Size = new System.Drawing.Size(166, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readonly";
//
- // txt_suppId
- //
- this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(385, 108);
- this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(165, 28);
- this.txt_suppId.TabIndex = 259;
- //
- // txt_isOut
- //
- this.txt_isOut.Location = new System.Drawing.Point(283, 12);
- this.txt_isOut.Name = "txt_isOut";
- this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_isOut.Size = new System.Drawing.Size(267, 24);
- this.txt_isOut.StyleController = this.layoutMx1;
- this.txt_isOut.TabIndex = 527;
- //
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(554, 76);
+ this.txt_status.Location = new System.Drawing.Point(825, 74);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(267, 24);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(825, 76);
+ this.txt_isFinish.Location = new System.Drawing.Point(554, 74);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_isFinish.Size = new System.Drawing.Size(268, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 529;
this.txt_isFinish.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, 44);
- 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";
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.lbGuid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem13.Text = "lbGuid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// Root
//
@@ -704,19 +672,17 @@
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem6,
- this.layoutControlItem5,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
- this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
- this.layoutControlItem7,
+ this.layoutControlItem16,
+ this.layoutControlItem12,
+ this.layoutControlItem11,
+ this.layoutControlItem5,
this.layoutControlItem4,
- this.layoutControlItem16});
+ this.layoutControlItem6,
+ this.layoutControlItem7});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -745,7 +711,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1105, 148);
+ this.Root.Size = new System.Drawing.Size(1105, 144);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -753,62 +719,29 @@
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(271, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.txt_thOrgId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Control = this.txt_fStockOrgId;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.txt_depotId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Control = this.txt_fStockId;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_returnType;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem6.Text = "閫�鏂欏師鍥�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_returnMethod;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_isOut;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem8.Text = "濮斿鏍囪瘑";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem8.TextVisible = false;
//
// layoutControlItem9
//
@@ -816,87 +749,124 @@
this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_isFinish;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.lbGuid;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem13.Text = "lbGuid";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
- //
// 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, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.lastUpdateTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem15.Control = this.txt_lastUpdateTime;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.btnSelect;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem16.Text = "閫�璐ф槑缁�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_isFinish;
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_status;
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_fReturnStyle;
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fCustId;
+ this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fIsLink;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem6.Text = "鏈夋棤婧愬崟";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "閫�璐у娉�";
+ this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem7.Text = "鐢宠澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
@@ -905,7 +875,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 416);
+ this.tabMx.Size = new System.Drawing.Size(1126, 415);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -914,7 +884,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 383);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -924,8 +894,9 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 384);
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemComboBox1});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 383);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -936,9 +907,7 @@
this.rkmxGuid,
this.gvMx1id,
this.gvMx1mid,
- this.gvMx1isFinish,
this.gvMx1invBillNo,
- this.gvMx1ebeln,
this.gvMx1itemId,
this.gridColumn2,
this.gridColumn5,
@@ -947,10 +916,8 @@
this.gvMx1sqNum,
this.gvMx1ysNum,
this.gvMx1remark,
- this.gvMx1orderNo,
- this.gvMx1eid,
- this.gvMx1erpid,
- this.gvMx1invWorkLine,
+ this.gridColumn6,
+ this.gridColumn8,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -960,18 +927,17 @@
//
// rkmxGuid
//
- this.rkmxGuid.Caption = "gridColumn1";
- this.rkmxGuid.FieldName = "rkmxGuid";
+ this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏Guid";
+ this.rkmxGuid.FieldName = "aboutGuid";
this.rkmxGuid.MinWidth = 25;
this.rkmxGuid.Name = "rkmxGuid";
this.rkmxGuid.Width = 94;
//
// gvMx1id
//
- this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "ID ";
- this.gvMx1id.FieldName = "id";
+ this.gvMx1id.Caption = "涓婚敭Guid";
+ this.gvMx1id.FieldName = "guid";
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.ID";
@@ -979,63 +945,36 @@
//
// gvMx1mid
//
- this.gvMx1mid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1mid.AppearanceCell.Options.UseFont = true;
- this.gvMx1mid.Caption = "MID ";
- this.gvMx1mid.FieldName = "mid";
+ this.gvMx1mid.Caption = "澶栭敭Guid";
+ this.gvMx1mid.FieldName = "pGuid";
this.gvMx1mid.MinWidth = 50;
this.gvMx1mid.Name = "gvMx1mid";
this.gvMx1mid.Tag = "query_a.MID";
this.gvMx1mid.Width = 94;
//
- // gvMx1isFinish
- //
- this.gvMx1isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1isFinish.AppearanceCell.Options.UseFont = true;
- this.gvMx1isFinish.Caption = "鏄惁瀹屾垚";
- this.gvMx1isFinish.FieldName = "isFinish";
- this.gvMx1isFinish.MinWidth = 50;
- this.gvMx1isFinish.Name = "gvMx1isFinish";
- this.gvMx1isFinish.Tag = "query_a.IS_FINISH";
- this.gvMx1isFinish.Visible = true;
- this.gvMx1isFinish.VisibleIndex = 0;
- this.gvMx1isFinish.Width = 94;
- //
// gvMx1invBillNo
//
- this.gvMx1invBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
this.gvMx1invBillNo.Caption = "鍏ュ簱鍗曞彿";
- this.gvMx1invBillNo.FieldName = "invBillNo";
+ this.gvMx1invBillNo.FieldName = "rkNo";
this.gvMx1invBillNo.MinWidth = 50;
this.gvMx1invBillNo.Name = "gvMx1invBillNo";
this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
this.gvMx1invBillNo.Visible = true;
- this.gvMx1invBillNo.VisibleIndex = 1;
+ this.gvMx1invBillNo.VisibleIndex = 0;
this.gvMx1invBillNo.Width = 94;
- //
- // gvMx1ebeln
- //
- this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebeln.Caption = "閲囪喘璁㈠崟";
- this.gvMx1ebeln.FieldName = "ebeln";
- this.gvMx1ebeln.MinWidth = 50;
- this.gvMx1ebeln.Name = "gvMx1ebeln";
- this.gvMx1ebeln.Tag = "query_a.EBELN";
- this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 2;
- this.gvMx1ebeln.Width = 94;
//
// gvMx1itemId
//
- this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡id ";
this.gvMx1itemId.FieldName = "itemId";
this.gvMx1itemId.MinWidth = 50;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
+ this.gvMx1itemId.Visible = true;
+ this.gvMx1itemId.VisibleIndex = 1;
this.gvMx1itemId.Width = 94;
//
// gridColumn2
@@ -1045,7 +984,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 94;
//
// gridColumn5
@@ -1055,7 +994,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.VisibleIndex = 3;
this.gridColumn5.Width = 94;
//
// gridColumn3
@@ -1065,7 +1004,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 4;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -1075,99 +1014,99 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.VisibleIndex = 5;
this.gridColumn4.Width = 94;
//
// gvMx1sqNum
//
- this.gvMx1sqNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1sqNum.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
this.gvMx1sqNum.AppearanceCell.Options.UseForeColor = true;
this.gvMx1sqNum.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1sqNum.Caption = "鐢宠鏁伴噺";
- this.gvMx1sqNum.FieldName = "sqNum";
+ this.gvMx1sqNum.FieldName = "fQty";
this.gvMx1sqNum.MinWidth = 50;
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
- this.gvMx1sqNum.VisibleIndex = 7;
+ this.gvMx1sqNum.VisibleIndex = 6;
this.gvMx1sqNum.Width = 94;
//
// gvMx1ysNum
//
- this.gvMx1ysNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
this.gvMx1ysNum.Caption = "宸叉壂鏁伴噺";
- this.gvMx1ysNum.FieldName = "ysNum";
+ this.gvMx1ysNum.FieldName = "sQty";
this.gvMx1ysNum.MinWidth = 50;
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "query_a.YS_NUM";
this.gvMx1ysNum.Visible = true;
- this.gvMx1ysNum.VisibleIndex = 8;
+ this.gvMx1ysNum.VisibleIndex = 7;
this.gvMx1ysNum.Width = 94;
//
// gvMx1remark
//
- this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1remark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
this.gvMx1remark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1remark.Caption = "澶囨敞";
+ this.gvMx1remark.Caption = "鐢宠澶囨敞";
this.gvMx1remark.FieldName = "remark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 9;
+ this.gvMx1remark.VisibleIndex = 8;
this.gvMx1remark.Width = 94;
//
- // gvMx1orderNo
+ // gridColumn6
//
- this.gvMx1orderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1orderNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1orderNo.Caption = "搴忓彿";
- this.gvMx1orderNo.FieldName = "orderNo";
- this.gvMx1orderNo.MinWidth = 50;
- this.gvMx1orderNo.Name = "gvMx1orderNo";
- this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
- this.gvMx1orderNo.Width = 94;
+ this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn6.Caption = "搴撳瓨鐘舵��";
+ this.gridColumn6.ColumnEdit = this.repositoryItemComboBox1;
+ this.gridColumn6.FieldName = "fStockStatusId";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Tag = "edit";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 94;
//
- // gvMx1eid
+ // repositoryItemComboBox1
//
- this.gvMx1eid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1eid.AppearanceCell.Options.UseFont = true;
- this.gvMx1eid.Caption = "閲囪喘璁㈠崟id";
- this.gvMx1eid.FieldName = "eid";
- this.gvMx1eid.MinWidth = 50;
- this.gvMx1eid.Name = "gvMx1eid";
- this.gvMx1eid.Tag = "query_a.EID";
- this.gvMx1eid.Width = 94;
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "涓嶅弬涓庢牳绠�(KCZT001)",
+ "鍙敤(KCZT01_SYS)",
+ "寰呮(KCZT02_SYS)",
+ "鍐荤粨(KCZT03_SYS)",
+ "閫�鍥炲喕缁�(KCZT04_SYS)",
+ "鍦ㄩ��(KCZT05_SYS)",
+ "鏀惰揣鍐荤粨(KCZT06_SYS)",
+ "搴熷搧(KCZT07_SYS)",
+ "涓嶈壇(KCZT08_SYS)",
+ "澶栧��(KCZT99_SYS)"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
+ this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
- // gvMx1erpid
+ // gridColumn8
//
- this.gvMx1erpid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
- this.gvMx1erpid.Caption = "閲囪喘璁㈠崟琛宨d";
- this.gvMx1erpid.FieldName = "erpid";
- this.gvMx1erpid.MinWidth = 50;
- this.gvMx1erpid.Name = "gvMx1erpid";
- this.gvMx1erpid.Tag = "query_a.ERPID";
- this.gvMx1erpid.Width = 94;
- //
- // gvMx1invWorkLine
- //
- this.gvMx1invWorkLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1invWorkLine.AppearanceCell.Options.UseFont = true;
- this.gvMx1invWorkLine.Caption = "鍏ュ簱鍗曡鍙�";
- this.gvMx1invWorkLine.FieldName = "invWorkLine";
- this.gvMx1invWorkLine.MinWidth = 50;
- this.gvMx1invWorkLine.Name = "gvMx1invWorkLine";
- this.gvMx1invWorkLine.Tag = "query_a.INV_WORK_LINE";
- this.gvMx1invWorkLine.Width = 94;
+ this.gridColumn8.Caption = "娆″簭";
+ this.gridColumn8.FieldName = "fidx";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 94;
//
// gvMxDel
//
@@ -1176,7 +1115,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 10;
+ this.gvMxDel.VisibleIndex = 11;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1201,32 +1140,7 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem4.Text = "閫変緵搴斿晢";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem16.Text = "閫�璐ф槑缁�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // Frm_MesCgthSq
+ // Frm_MesShouTui
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -1234,8 +1148,8 @@
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_MesCgthSq";
- this.Text = "閲囪喘閫�璐х敵璇�";
+ this.Name = "Frm_MesShouTui";
+ this.Text = "鍙楁墭閫�鏂欑敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -1255,41 +1169,40 @@
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_fIsLink.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_returnMethod.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.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_isOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.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.layoutControlItem13)).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.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
@@ -1304,7 +1217,6 @@
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;
@@ -1320,12 +1232,10 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private UserControl.UcLookOrg txt_thOrgId;
+ private UserControl.UcLookOrg txt_fStockOrgId;
private DevExpress.XtraEditors.SimpleButton btnSelect;
- private DevExpress.XtraEditors.ComboBoxEdit txt_returnType;
- private DevExpress.XtraEditors.ComboBoxEdit txt_returnMethod;
- private UserControl.UcLookCk txt_depotId;
- private UserControl.UcLookSupplier txt_suppId;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fReturnStyle;
+ private UserControl.UcLookCk txt_fStockId;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
@@ -1334,22 +1244,15 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraEditors.CheckEdit txt_isOut;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_status;
private DevExpress.XtraEditors.CheckEdit txt_isFinish;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
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.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1357,9 +1260,7 @@
private DevExpress.XtraGrid.Columns.GridColumn rkmxGuid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFinish;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1invBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -1368,13 +1269,21 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1eid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1invWorkLine;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private UserControl.UcLookCustomer txt_fCustId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.Utils.ToolTipController tips;
}
}
\ No newline at end of file
--
Gitblit v1.9.3