From d00b1b617e50cb743de0e4f5fecd635f66d335fe Mon Sep 17 00:00:00 2001
From: huawei <huawei@2214094776>
Date: 星期二, 02 十二月 2025 15:37:59 +0800
Subject: [PATCH] 修改调拨申请根据选择单据类型自动变更申请类型逻辑、新增调拨列表工单单号字段
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 276 ++++++++------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx | 129 ++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/App.config | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 650 ++++++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs | 30 +
6 files changed, 665 insertions(+), 423 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index ec1c051..a68f868 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -38,7 +38,7 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
<add key="webapiurl" value="http://192.168.8.8:8081/" />
- <add key="WebApiUrl" value="http://192.168.8.8:81/" />
+ <!--<add key="WebApiUrl" value="http://192.168.8.8:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index b767373..437225a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -244,6 +244,7 @@
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.btnSelect1 = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -346,10 +347,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1022, 62);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1460, 97);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -357,10 +358,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 97);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1022, 469);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1460, 737);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -369,8 +371,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1020, 443);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1458, 699);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -379,6 +382,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -391,17 +395,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1020, 443);
+ this.split1.Size = new System.Drawing.Size(1458, 699);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1020, 402);
+ this.gcMain1.Size = new System.Drawing.Size(1458, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -411,7 +417,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 39;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_isWc,
this.gv_shState,
@@ -445,10 +451,11 @@
this.gv_id,
this.gridColumn51,
this.gridColumn52,
- this.gridColumn53});
- this.gridView1.DetailHeight = 272;
+ this.gridColumn53,
+ this.gridColumn57});
+ this.gridView1.DetailHeight = 427;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 43;
+ this.gridView1.IndicatorWidth = 61;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -459,335 +466,336 @@
this.gv_isWc.AppearanceCell.Options.UseFont = true;
this.gv_isWc.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_isWc.FieldName = "wjStatus";
- this.gv_isWc.MinWidth = 22;
+ this.gv_isWc.MinWidth = 31;
this.gv_isWc.Name = "gv_isWc";
this.gv_isWc.OptionsColumn.AllowEdit = false;
this.gv_isWc.Tag = "query_a.is_wc";
this.gv_isWc.Visible = true;
this.gv_isWc.VisibleIndex = 0;
- this.gv_isWc.Width = 43;
+ this.gv_isWc.Width = 61;
//
// gv_shState
//
this.gv_shState.AppearanceCell.Options.UseFont = true;
this.gv_shState.Caption = "瀹℃牳鐘舵�� ";
this.gv_shState.FieldName = "chkStatus";
- this.gv_shState.MinWidth = 22;
+ this.gv_shState.MinWidth = 31;
this.gv_shState.Name = "gv_shState";
this.gv_shState.OptionsColumn.AllowEdit = false;
this.gv_shState.Tag = "query_a.sh_state";
this.gv_shState.Visible = true;
this.gv_shState.VisibleIndex = 1;
- this.gv_shState.Width = 43;
+ this.gv_shState.Width = 61;
//
// gv_billno
//
this.gv_billno.AppearanceCell.Options.UseFont = true;
this.gv_billno.Caption = "鐢宠鍗曞崟鍙�";
this.gv_billno.FieldName = "fBillNo";
- this.gv_billno.MinWidth = 22;
+ this.gv_billno.MinWidth = 31;
this.gv_billno.Name = "gv_billno";
this.gv_billno.OptionsColumn.AllowEdit = false;
this.gv_billno.Tag = "query_a.billno";
this.gv_billno.Visible = true;
this.gv_billno.VisibleIndex = 2;
- this.gv_billno.Width = 87;
+ this.gv_billno.Width = 124;
//
// gridColumn25
//
this.gridColumn25.Caption = "鍗曟嵁鐘舵��";
this.gridColumn25.FieldName = "fDocumentStatusTxt";
- this.gridColumn25.MinWidth = 22;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 82;
+ this.gridColumn25.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "鐢宠鏃ユ湡";
this.gridColumn26.FieldName = "fDate";
- this.gridColumn26.MinWidth = 22;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 82;
+ this.gridColumn26.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "鐢宠绫诲瀷";
this.gridColumn27.FieldName = "fBillTypeID";
- this.gridColumn27.MinWidth = 22;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 82;
+ this.gridColumn27.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "璋冩嫧绫诲瀷";
this.gridColumn28.FieldName = "ftranstype";
- this.gridColumn28.MinWidth = 22;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 6;
- this.gridColumn28.Width = 82;
+ this.gridColumn28.Width = 117;
//
// gridColumn29
//
this.gridColumn29.Caption = "璋冩嫧鏂瑰悜";
this.gridColumn29.FieldName = "fTransferDirect";
- this.gridColumn29.MinWidth = 22;
+ this.gridColumn29.MinWidth = 31;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 7;
- this.gridColumn29.Width = 82;
+ this.gridColumn29.Width = 117;
//
// gridColumn30
//
this.gridColumn30.Caption = "璋冨嚭璐т富绫诲瀷";
this.gridColumn30.FieldName = "fOwnerTypeIdHead";
- this.gridColumn30.MinWidth = 22;
+ this.gridColumn30.MinWidth = 31;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 8;
- this.gridColumn30.Width = 82;
+ this.gridColumn30.Width = 117;
//
// gridColumn31
//
this.gridColumn31.Caption = "璋冨叆璐т富绫诲瀷";
this.gridColumn31.FieldName = "fOwnerTypeInIdHead";
- this.gridColumn31.MinWidth = 22;
+ this.gridColumn31.MinWidth = 31;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 9;
- this.gridColumn31.Width = 82;
+ this.gridColumn31.Width = 117;
//
// gridColumn32
//
this.gridColumn32.Caption = "澶囨敞";
this.gridColumn32.FieldName = "fRemarks";
- this.gridColumn32.MinWidth = 22;
+ this.gridColumn32.MinWidth = 31;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 10;
- this.gridColumn32.Width = 82;
+ this.gridColumn32.Width = 117;
//
// gridColumn33
//
this.gridColumn33.Caption = "鍒涘缓浜篒D";
this.gridColumn33.FieldName = "fCreatorId";
- this.gridColumn33.MinWidth = 22;
+ this.gridColumn33.MinWidth = 31;
this.gridColumn33.Name = "gridColumn33";
- this.gridColumn33.Width = 82;
+ this.gridColumn33.Width = 117;
//
// gridColumn34
//
this.gridColumn34.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn34.FieldName = "fCreateDate";
- this.gridColumn34.MinWidth = 22;
+ this.gridColumn34.MinWidth = 31;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 11;
- this.gridColumn34.Width = 82;
+ this.gridColumn34.Width = 117;
//
// gridColumn35
//
this.gridColumn35.Caption = "鏈�鍚庝慨鏀逛汉ID";
this.gridColumn35.FieldName = "fModifierId";
- this.gridColumn35.MinWidth = 22;
+ this.gridColumn35.MinWidth = 31;
this.gridColumn35.Name = "gridColumn35";
- this.gridColumn35.Width = 82;
+ this.gridColumn35.Width = 117;
//
// gridColumn36
//
this.gridColumn36.Caption = "鏈�鍚庝慨鏀规棩鏈�";
this.gridColumn36.FieldName = "fModifyDate";
- this.gridColumn36.MinWidth = 22;
+ this.gridColumn36.MinWidth = 31;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 13;
- this.gridColumn36.Width = 82;
+ this.gridColumn36.Width = 117;
//
// gridColumn37
//
this.gridColumn37.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn37.FieldName = "fapprovedate";
- this.gridColumn37.MinWidth = 22;
+ this.gridColumn37.MinWidth = 31;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 15;
- this.gridColumn37.Width = 82;
+ this.gridColumn37.Width = 117;
//
// gridColumn38
//
this.gridColumn38.Caption = "瀹℃牳浜�";
this.gridColumn38.FieldNameSortGroup = "fapproveby";
- this.gridColumn38.MinWidth = 22;
+ this.gridColumn38.MinWidth = 31;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 16;
- this.gridColumn38.Width = 82;
+ this.gridColumn38.Width = 117;
//
// gridColumn39
//
this.gridColumn39.Caption = "鍏抽棴鐘舵��";
this.gridColumn39.FieldName = "fCloseStatusTxt";
- this.gridColumn39.MinWidth = 22;
+ this.gridColumn39.MinWidth = 31;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
this.gridColumn39.VisibleIndex = 17;
- this.gridColumn39.Width = 82;
+ this.gridColumn39.Width = 117;
//
// gridColumn40
//
this.gridColumn40.Caption = "鍏抽棴浜�";
this.gridColumn40.FieldNameSortGroup = "fCloserId";
- this.gridColumn40.MinWidth = 22;
+ this.gridColumn40.MinWidth = 31;
this.gridColumn40.Name = "gridColumn40";
- this.gridColumn40.Width = 82;
+ this.gridColumn40.Width = 117;
//
// gridColumn41
//
this.gridColumn41.Caption = "鍏抽棴鏃ユ湡";
this.gridColumn41.FieldNameSortGroup = "fCloseDate";
- this.gridColumn41.MinWidth = 22;
+ this.gridColumn41.MinWidth = 31;
this.gridColumn41.Name = "gridColumn41";
- this.gridColumn41.Width = 82;
+ this.gridColumn41.Width = 117;
//
// gridColumn42
//
this.gridColumn42.Caption = "BOM鐗堟湰";
this.gridColumn42.FieldNameSortGroup = "fUnwBaseBombb";
- this.gridColumn42.MinWidth = 22;
+ this.gridColumn42.MinWidth = 31;
this.gridColumn42.Name = "gridColumn42";
- this.gridColumn42.Width = 82;
+ this.gridColumn42.Width = 117;
//
// gridColumn43
//
this.gridColumn43.Caption = "鐖堕」鐗╂枡缂栧彿";
this.gridColumn43.FieldNameSortGroup = "fUnwBaseFxwlbm";
- this.gridColumn43.MinWidth = 22;
+ this.gridColumn43.MinWidth = 31;
this.gridColumn43.Name = "gridColumn43";
- this.gridColumn43.Width = 82;
+ this.gridColumn43.Width = 117;
//
// gridColumn44
//
this.gridColumn44.Caption = "鐢宠缁勭粐ID";
this.gridColumn44.FieldName = "fapporgid";
- this.gridColumn44.MinWidth = 22;
+ this.gridColumn44.MinWidth = 31;
this.gridColumn44.Name = "gridColumn44";
- this.gridColumn44.Width = 82;
+ this.gridColumn44.Width = 117;
//
// gridColumn45
//
this.gridColumn45.Caption = "涓氬姟绫诲瀷";
this.gridColumn45.FieldName = "fBusinessType";
- this.gridColumn45.MinWidth = 22;
+ this.gridColumn45.MinWidth = 31;
this.gridColumn45.Name = "gridColumn45";
this.gridColumn45.Visible = true;
this.gridColumn45.VisibleIndex = 18;
- this.gridColumn45.Width = 82;
+ this.gridColumn45.Width = 117;
//
// gridColumn46
//
this.gridColumn46.Caption = "鍒涘缓浜�";
this.gridColumn46.FieldName = "fCreatorName";
- this.gridColumn46.MinWidth = 22;
+ this.gridColumn46.MinWidth = 31;
this.gridColumn46.Name = "gridColumn46";
this.gridColumn46.Visible = true;
this.gridColumn46.VisibleIndex = 12;
- this.gridColumn46.Width = 82;
+ this.gridColumn46.Width = 117;
//
// gridColumn47
//
this.gridColumn47.Caption = "鐢宠缁勭粐";
this.gridColumn47.FieldName = "fapporgName";
- this.gridColumn47.MinWidth = 22;
+ this.gridColumn47.MinWidth = 31;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
this.gridColumn47.VisibleIndex = 19;
- this.gridColumn47.Width = 82;
+ this.gridColumn47.Width = 117;
//
// gridColumn48
//
this.gridColumn48.Caption = "鏈�鍚庝慨鏀逛汉";
this.gridColumn48.FieldName = "fModifierName";
- this.gridColumn48.MinWidth = 22;
+ this.gridColumn48.MinWidth = 31;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
this.gridColumn48.VisibleIndex = 14;
- this.gridColumn48.Width = 82;
+ this.gridColumn48.Width = 117;
//
// gridColumn49
//
this.gridColumn49.Caption = "鍗曟嵁绫诲瀷";
this.gridColumn49.FieldName = "djtype";
- this.gridColumn49.MinWidth = 22;
+ this.gridColumn49.MinWidth = 31;
this.gridColumn49.Name = "gridColumn49";
this.gridColumn49.Visible = true;
this.gridColumn49.VisibleIndex = 20;
- this.gridColumn49.Width = 82;
+ this.gridColumn49.Width = 117;
//
// gridColumn50
//
this.gridColumn50.Caption = "鏉ユ簮";
this.gridColumn50.FieldName = "source";
- this.gridColumn50.MinWidth = 22;
+ this.gridColumn50.MinWidth = 31;
this.gridColumn50.Name = "gridColumn50";
this.gridColumn50.Visible = true;
this.gridColumn50.VisibleIndex = 21;
- this.gridColumn50.Width = 82;
+ this.gridColumn50.Width = 117;
//
// gv_id
//
this.gv_id.Caption = "涓婚敭GUID";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 22;
+ this.gv_id.MinWidth = 31;
this.gv_id.Name = "gv_id";
- this.gv_id.Width = 82;
+ this.gv_id.Width = 117;
//
// gridColumn51
//
this.gridColumn51.Caption = "鍞悗瀹℃牳";
this.gridColumn51.FieldName = "qt026Chk";
- this.gridColumn51.MinWidth = 22;
+ this.gridColumn51.MinWidth = 31;
this.gridColumn51.Name = "gridColumn51";
- this.gridColumn51.Width = 82;
+ this.gridColumn51.Width = 117;
//
// gridColumn52
//
this.gridColumn52.Caption = "鍞悗瀹℃牳浜�";
this.gridColumn52.FieldName = "qt028";
- this.gridColumn52.MinWidth = 22;
+ this.gridColumn52.MinWidth = 31;
this.gridColumn52.Name = "gridColumn52";
- this.gridColumn52.Width = 82;
+ this.gridColumn52.Width = 117;
//
// gridColumn53
//
this.gridColumn53.Caption = "鍞悗瀹℃牳鏃堕棿";
this.gridColumn53.FieldName = "qt027";
- this.gridColumn53.MinWidth = 22;
+ this.gridColumn53.MinWidth = 31;
this.gridColumn53.Name = "gridColumn53";
- this.gridColumn53.Width = 82;
+ this.gridColumn53.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 402);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1020, 31);
+ this.pageBar1.Size = new System.Drawing.Size(1458, 49);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitMx1);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1020, 443);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1458, 699);
this.xtraTabPage3.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -795,6 +803,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -807,8 +816,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1020, 443);
- this.splitMx1.SplitterPosition = 197;
+ this.splitMx1.Size = new System.Drawing.Size(1458, 699);
+ this.splitMx1.SplitterPosition = 310;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -849,19 +858,21 @@
this.layoutControlItem25,
this.layoutControlItem29});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 777, 1060, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1020, 197);
+ this.layoutMx1.Size = new System.Drawing.Size(1458, 310);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
- this.btnCopyXls.Location = new System.Drawing.Point(8, 161);
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 252);
+ this.btnCopyXls.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnCopyXls.Name = "btnCopyXls";
- this.btnCopyXls.Size = new System.Drawing.Size(103, 22);
+ this.btnCopyXls.Size = new System.Drawing.Size(146, 34);
this.btnCopyXls.StyleController = this.layoutMx1;
this.btnCopyXls.TabIndex = 445;
this.btnCopyXls.Text = "蹇嵎褰曞叆";
@@ -869,7 +880,8 @@
// txt_djtype
//
this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)";
- this.txt_djtype.Location = new System.Drawing.Point(339, 130);
+ this.txt_djtype.Location = new System.Drawing.Point(491, 204);
+ this.txt_djtype.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_djtype.Name = "txt_djtype";
this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -879,32 +891,35 @@
"鐢熶骇鐩存帴璋冩嫧鍗�(SCDB01_SYS)"});
this.txt_djtype.Properties.ReadOnly = true;
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_djtype.Size = new System.Drawing.Size(169, 20);
+ this.txt_djtype.Size = new System.Drawing.Size(235, 28);
this.txt_djtype.StyleController = this.layoutMx1;
this.txt_djtype.TabIndex = 391;
this.txt_djtype.Tag = "readonly";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(735, 95);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 149);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(239, 25);
+ this.lbGuid.Size = new System.Drawing.Size(341, 39);
this.lbGuid.TabIndex = 389;
this.lbGuid.Text = "lbGuid";
//
// txt_fRemarks
//
- this.txt_fRemarks.Location = new System.Drawing.Point(88, 130);
+ this.txt_fRemarks.Location = new System.Drawing.Point(132, 204);
+ this.txt_fRemarks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fRemarks.Name = "txt_fRemarks";
this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
- this.txt_fRemarks.Size = new System.Drawing.Size(169, 20);
+ this.txt_fRemarks.Size = new System.Drawing.Size(235, 28);
this.txt_fRemarks.StyleController = this.layoutMx1;
this.txt_fRemarks.TabIndex = 371;
//
// txt_fOwnerTypeInIdHead
//
this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(339, 99);
+ this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(491, 156);
+ this.txt_fOwnerTypeInIdHead.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -913,16 +928,17 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(169, 20);
+ this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(235, 28);
this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeInIdHead.TabIndex = 382;
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(590, 37);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(850, 60);
+ this.txt_fCreateDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(169, 20);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(235, 28);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 386;
this.txt_fCreateDate.Tag = "readonly";
@@ -930,7 +946,8 @@
// txt_fOwnerTypeIdHead
//
this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(339, 68);
+ this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(491, 108);
+ this.txt_fOwnerTypeIdHead.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -939,14 +956,15 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(169, 20);
+ this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(235, 28);
this.txt_fOwnerTypeIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeIdHead.TabIndex = 380;
//
// txt_fBusinessType
//
this.txt_fBusinessType.EditValue = "鏍囧噯(NORMAL)";
- this.txt_fBusinessType.Location = new System.Drawing.Point(88, 68);
+ this.txt_fBusinessType.Location = new System.Drawing.Point(132, 108);
+ this.txt_fBusinessType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fBusinessType.Name = "txt_fBusinessType";
this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -957,7 +975,7 @@
this.txt_fBusinessType.Properties.ReadOnly = true;
this.txt_fBusinessType.Properties.Tag = "readonly";
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBusinessType.Size = new System.Drawing.Size(169, 20);
+ this.txt_fBusinessType.Size = new System.Drawing.Size(235, 28);
this.txt_fBusinessType.StyleController = this.layoutMx1;
this.txt_fBusinessType.TabIndex = 374;
this.txt_fBusinessType.Tag = "readonly";
@@ -965,7 +983,8 @@
// txt_fTransferDirect
//
this.txt_fTransferDirect.EditValue = "鏅��(GENERAL)";
- this.txt_fTransferDirect.Location = new System.Drawing.Point(88, 99);
+ this.txt_fTransferDirect.Location = new System.Drawing.Point(132, 156);
+ this.txt_fTransferDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fTransferDirect.Name = "txt_fTransferDirect";
this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -973,26 +992,28 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fTransferDirect.Size = new System.Drawing.Size(169, 20);
+ this.txt_fTransferDirect.Size = new System.Drawing.Size(235, 28);
this.txt_fTransferDirect.StyleController = this.layoutMx1;
this.txt_fTransferDirect.TabIndex = 362;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(590, 7);
+ this.txt_createBy.Location = new System.Drawing.Point(850, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(169, 20);
+ this.txt_createBy.Size = new System.Drawing.Size(235, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 384;
this.txt_createBy.Tag = "readonly";
//
// txt_fBillNo
//
- this.txt_fBillNo.Location = new System.Drawing.Point(88, 7);
+ this.txt_fBillNo.Location = new System.Drawing.Point(132, 12);
+ this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fBillNo.Name = "txt_fBillNo";
this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fBillNo.Size = new System.Drawing.Size(169, 20);
+ this.txt_fBillNo.Size = new System.Drawing.Size(235, 28);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 327;
this.txt_fBillNo.Tag = "readonly";
@@ -1000,7 +1021,8 @@
// txt_ftranstype
//
this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)";
- this.txt_ftranstype.Location = new System.Drawing.Point(339, 37);
+ this.txt_ftranstype.Location = new System.Drawing.Point(491, 60);
+ this.txt_ftranstype.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_ftranstype.Name = "txt_ftranstype";
this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1008,23 +1030,24 @@
"缁勭粐鍐呰皟鎷�(InnerOrgTransfer)",
"璺ㄧ粍缁囪皟鎷�(OverOrgTransfer)"});
this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftranstype.Size = new System.Drawing.Size(169, 20);
+ this.txt_ftranstype.Size = new System.Drawing.Size(235, 28);
this.txt_ftranstype.StyleController = this.layoutMx1;
this.txt_ftranstype.TabIndex = 378;
//
// txt_fapporgid
//
this.txt_fapporgid.IsReadly = false;
- this.txt_fapporgid.Location = new System.Drawing.Point(339, 7);
- this.txt_fapporgid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_fapporgid.Location = new System.Drawing.Point(491, 12);
+ this.txt_fapporgid.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.txt_fapporgid.Name = "txt_fapporgid";
- this.txt_fapporgid.Size = new System.Drawing.Size(169, 20);
+ this.txt_fapporgid.Size = new System.Drawing.Size(235, 28);
this.txt_fapporgid.TabIndex = 376;
//
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(88, 37);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(132, 60);
+ this.txt_fBillTypeID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1035,110 +1058,121 @@
this.txt_fBillTypeID.Properties.SuppressMouseEventOnOuterMouseClick = true;
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fBillTypeID.Properties.EditValueChanged += new System.EventHandler(this.txt_fBillTypeID_EditValueChanged);
- this.txt_fBillTypeID.Size = new System.Drawing.Size(169, 20);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(235, 28);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 361;
//
// txt_chkBy
//
- this.txt_chkBy.Location = new System.Drawing.Point(841, 7);
+ this.txt_chkBy.Location = new System.Drawing.Point(1209, 12);
+ this.txt_chkBy.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_chkBy.Name = "txt_chkBy";
this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_chkBy.Size = new System.Drawing.Size(171, 20);
+ this.txt_chkBy.Size = new System.Drawing.Size(237, 28);
this.txt_chkBy.StyleController = this.layoutMx1;
this.txt_chkBy.TabIndex = 258;
this.txt_chkBy.Tag = "readonly";
//
// txt_fapprovedate
//
- this.txt_fapprovedate.Location = new System.Drawing.Point(841, 37);
+ this.txt_fapprovedate.Location = new System.Drawing.Point(1209, 60);
+ this.txt_fapprovedate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fapprovedate.Name = "txt_fapprovedate";
this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
- this.txt_fapprovedate.Size = new System.Drawing.Size(171, 20);
+ this.txt_fapprovedate.Size = new System.Drawing.Size(237, 28);
this.txt_fapprovedate.StyleController = this.layoutMx1;
this.txt_fapprovedate.TabIndex = 262;
this.txt_fapprovedate.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(761, 130);
+ this.txt_wjStatus.Location = new System.Drawing.Point(1089, 204);
+ this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(251, 20);
+ this.txt_wjStatus.Size = new System.Drawing.Size(357, 27);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 387;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(761, 68);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1089, 108);
+ this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(251, 20);
+ this.txt_chkStatus.Size = new System.Drawing.Size(357, 27);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 388;
this.txt_chkStatus.Tag = "readonly";
//
// txt_source
//
- this.txt_source.Location = new System.Drawing.Point(590, 130);
+ this.txt_source.Location = new System.Drawing.Point(850, 204);
+ this.txt_source.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_source.Name = "txt_source";
- this.txt_source.Size = new System.Drawing.Size(169, 20);
+ this.txt_source.Size = new System.Drawing.Size(235, 28);
this.txt_source.StyleController = this.layoutMx1;
this.txt_source.TabIndex = 390;
this.txt_source.Tag = "readonly";
//
// txt_fCloserId
//
- this.txt_fCloserId.Location = new System.Drawing.Point(590, 99);
+ this.txt_fCloserId.Location = new System.Drawing.Point(850, 156);
+ this.txt_fCloserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fCloserId.Name = "txt_fCloserId";
- this.txt_fCloserId.Size = new System.Drawing.Size(169, 20);
+ this.txt_fCloserId.Size = new System.Drawing.Size(235, 28);
this.txt_fCloserId.StyleController = this.layoutMx1;
this.txt_fCloserId.TabIndex = 392;
this.txt_fCloserId.Tag = "readonly";
//
// txt_fCloseDate
//
- this.txt_fCloseDate.Location = new System.Drawing.Point(841, 99);
+ this.txt_fCloseDate.Location = new System.Drawing.Point(1209, 156);
+ this.txt_fCloseDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fCloseDate.Name = "txt_fCloseDate";
- this.txt_fCloseDate.Size = new System.Drawing.Size(171, 20);
+ this.txt_fCloseDate.Size = new System.Drawing.Size(237, 28);
this.txt_fCloseDate.StyleController = this.layoutMx1;
this.txt_fCloseDate.TabIndex = 393;
this.txt_fCloseDate.Tag = "readonly";
//
// txt_fCloseStatusTxt
//
- this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(590, 68);
+ this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(850, 108);
+ this.txt_fCloseStatusTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt";
- this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(169, 20);
+ this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(235, 28);
this.txt_fCloseStatusTxt.StyleController = this.layoutMx1;
this.txt_fCloseStatusTxt.TabIndex = 394;
this.txt_fCloseStatusTxt.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(808, 81);
+ this.txt_qt028.Location = new System.Drawing.Point(1154, 127);
+ this.txt_qt028.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(150, 20);
+ this.txt_qt028.Size = new System.Drawing.Size(214, 28);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 395;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(808, 106);
+ this.txt_qt027.Location = new System.Drawing.Point(1154, 167);
+ this.txt_qt027.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(150, 20);
+ this.txt_qt027.Size = new System.Drawing.Size(214, 28);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 396;
this.txt_qt027.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(749, 119);
+ this.txt_qt026.Location = new System.Drawing.Point(1070, 187);
+ this.txt_qt026.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��";
- this.txt_qt026.Size = new System.Drawing.Size(244, 20);
+ this.txt_qt026.Size = new System.Drawing.Size(349, 27);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 397;
this.txt_qt026.Tag = "readonly";
@@ -1146,9 +1180,10 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSelect.ImageOptions.Image")));
- this.btnSelect.Location = new System.Drawing.Point(259, 161);
+ this.btnSelect.Location = new System.Drawing.Point(371, 252);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(145, 27);
+ this.btnSelect.Size = new System.Drawing.Size(206, 42);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 445;
this.btnSelect.Text = "閫夋嫨鐢熶骇/濮斿鍗曟嵁";
@@ -1156,19 +1191,21 @@
// btnScdd
//
this.btnScdd.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnScdd.ImageOptions.Image")));
- this.btnScdd.Location = new System.Drawing.Point(511, 157);
+ this.btnScdd.Location = new System.Drawing.Point(730, 247);
+ this.btnScdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnScdd.Name = "btnScdd";
- this.btnScdd.Size = new System.Drawing.Size(128, 27);
+ this.btnScdd.Size = new System.Drawing.Size(183, 42);
this.btnScdd.StyleController = this.layoutMx1;
this.btnScdd.TabIndex = 445;
this.btnScdd.Text = "閫夋嫨璁㈠崟";
//
// txt_FSourceOrder
//
- this.txt_FSourceOrder.Location = new System.Drawing.Point(590, 161);
+ this.txt_FSourceOrder.Location = new System.Drawing.Point(850, 252);
+ this.txt_FSourceOrder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_FSourceOrder.Name = "txt_FSourceOrder";
this.txt_FSourceOrder.Properties.ReadOnly = true;
- this.txt_FSourceOrder.Size = new System.Drawing.Size(169, 20);
+ this.txt_FSourceOrder.Size = new System.Drawing.Size(235, 28);
this.txt_FSourceOrder.StyleController = this.layoutMx1;
this.txt_FSourceOrder.TabIndex = 390;
this.txt_FSourceOrder.Tag = "readonly";
@@ -1194,7 +1231,7 @@
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem23.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(78, 0);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(111, 0);
//
// layoutControlItem24
//
@@ -1205,7 +1242,7 @@
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem24.Size = new System.Drawing.Size(341, 38);
this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(78, 14);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(111, 22);
//
// layoutControlItem25
//
@@ -1225,8 +1262,8 @@
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "蹇嵎褰曞叆";
this.layoutControlItem29.Location = new System.Drawing.Point(718, 235);
- this.layoutControlItem29.MaxSize = new System.Drawing.Size(131, 29);
- this.layoutControlItem29.MinSize = new System.Drawing.Size(98, 29);
+ this.layoutControlItem29.MaxSize = new System.Drawing.Size(187, 46);
+ this.layoutControlItem29.MinSize = new System.Drawing.Size(140, 46);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 5;
@@ -1298,154 +1335,154 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1020, 197);
+ this.Root.Size = new System.Drawing.Size(1458, 310);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fapporgid;
- this.layoutControlItem2.Location = new System.Drawing.Point(251, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(359, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(251, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem2.Text = "鐢宠缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(502, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(718, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(251, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem3.Text = "鐢宠浜哄憳";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fBillTypeID;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem4.Text = "鐢宠绫诲瀷";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_ftranstype;
- this.layoutControlItem5.Location = new System.Drawing.Point(251, 30);
+ this.layoutControlItem5.Location = new System.Drawing.Point(359, 48);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 ";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fCreateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(502, 30);
+ this.layoutControlItem6.Location = new System.Drawing.Point(718, 48);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem6.Text = "鐢宠鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fBusinessType;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 61);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead;
- this.layoutControlItem8.Location = new System.Drawing.Point(251, 61);
+ this.layoutControlItem8.Location = new System.Drawing.Point(359, 96);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_chkBy;
- this.layoutControlItem9.Location = new System.Drawing.Point(753, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1077, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(253, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(361, 48);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fapprovedate;
- this.layoutControlItem10.Location = new System.Drawing.Point(753, 30);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1077, 48);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(253, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(361, 48);
this.layoutControlItem10.Tag = "readonly";
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fTransferDirect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 92);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 144);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead;
- this.layoutControlItem14.Location = new System.Drawing.Point(251, 92);
+ this.layoutControlItem14.Location = new System.Drawing.Point(359, 144);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_djtype;
- this.layoutControlItem19.Location = new System.Drawing.Point(251, 123);
+ this.layoutControlItem19.Location = new System.Drawing.Point(359, 192);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fRemarks;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 123);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 192);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem15.Text = "鐢宠澶囨敞";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_chkStatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(753, 61);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1077, 96);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(253, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(361, 48);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -1453,23 +1490,23 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_fCloseStatusTxt;
- this.layoutControlItem22.Location = new System.Drawing.Point(502, 61);
+ this.layoutControlItem22.Location = new System.Drawing.Point(718, 96);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem22.Text = "鍏抽棴鐘舵��";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.btnCopyXls;
- this.layoutControlItem26.Location = new System.Drawing.Point(0, 154);
- this.layoutControlItem26.MaxSize = new System.Drawing.Size(105, 24);
- this.layoutControlItem26.MinSize = new System.Drawing.Size(78, 24);
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 240);
+ this.layoutControlItem26.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem26.MinSize = new System.Drawing.Size(111, 38);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem26.Size = new System.Drawing.Size(359, 50);
this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem26.Text = "蹇嵎褰曞叆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
@@ -1478,44 +1515,44 @@
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_fCloserId;
- this.layoutControlItem20.Location = new System.Drawing.Point(502, 92);
+ this.layoutControlItem20.Location = new System.Drawing.Point(718, 144);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem20.Text = "鍏抽棴浜哄憳";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_fCloseDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(753, 92);
+ this.layoutControlItem21.Location = new System.Drawing.Point(1077, 144);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(253, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(361, 48);
this.layoutControlItem21.Text = "鍏抽棴鏃堕棿";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_source;
- this.layoutControlItem17.Location = new System.Drawing.Point(502, 123);
+ this.layoutControlItem17.Location = new System.Drawing.Point(718, 192);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wjStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(753, 123);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1077, 192);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(253, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(361, 48);
this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1525,13 +1562,13 @@
this.layoutControlItem27.Control = this.btnSelect;
this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem27.CustomizationFormText = "蹇嵎褰曞叆";
- this.layoutControlItem27.Location = new System.Drawing.Point(251, 154);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(147, 29);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(98, 29);
+ this.layoutControlItem27.Location = new System.Drawing.Point(359, 240);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(210, 46);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(140, 46);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem27.Size = new System.Drawing.Size(359, 50);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "閫夋嫨鐢熶骇璁㈠崟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1542,30 +1579,31 @@
this.layoutControlItem30.Control = this.txt_FSourceOrder;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "宸ュ崟鍗曞彿";
- this.layoutControlItem30.Location = new System.Drawing.Point(502, 154);
+ this.layoutControlItem30.Location = new System.Drawing.Point(718, 240);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem30.Size = new System.Drawing.Size(251, 31);
+ this.layoutControlItem30.Size = new System.Drawing.Size(359, 50);
this.layoutControlItem30.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fBillNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(251, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(359, 48);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1020, 236);
+ this.tabMx.Size = new System.Drawing.Size(1458, 374);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1573,15 +1611,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1018, 210);
+ this.tabMxPage1.Size = new System.Drawing.Size(1456, 336);
this.tabMxPage1.Text = "璋冩嫧鐢宠鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
@@ -1595,7 +1636,7 @@
this.rptDrHz,
this.rptDcHz,
this.btnTest1});
- this.gcMx1.Size = new System.Drawing.Size(1018, 210);
+ this.gcMx1.Size = new System.Drawing.Size(1456, 336);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1634,8 +1675,8 @@
this.gridColumn54,
this.gridColumn55,
this.gridColumn56});
- this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(1141, 492, 272, 190);
- this.gvMx1.DetailHeight = 272;
+ this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(1141, 492, 389, 299);
+ this.gvMx1.DetailHeight = 427;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1648,22 +1689,22 @@
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "ID";
this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 43;
+ this.gvMx1id.MinWidth = 61;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.OptionsColumn.ReadOnly = true;
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Width = 82;
+ this.gvMx1id.Width = 117;
//
// gvMx1mid
//
this.gvMx1mid.AppearanceCell.Options.UseFont = true;
this.gvMx1mid.Caption = "MID";
this.gvMx1mid.FieldName = "pid";
- this.gvMx1mid.MinWidth = 43;
+ this.gvMx1mid.MinWidth = 61;
this.gvMx1mid.Name = "gvMx1mid";
this.gvMx1mid.OptionsColumn.ReadOnly = true;
this.gvMx1mid.Tag = "query_a.mid";
- this.gvMx1mid.Width = 82;
+ this.gvMx1mid.Width = 117;
//
// gvMx1bld012
//
@@ -1674,12 +1715,12 @@
this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld012.Caption = "璇烽�夋嫨";
this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gvMx1bld012.MinWidth = 43;
+ this.gvMx1bld012.MinWidth = 61;
this.gvMx1bld012.Name = "gvMx1bld012";
this.gvMx1bld012.Tag = "edit";
this.gvMx1bld012.Visible = true;
this.gvMx1bld012.VisibleIndex = 0;
- this.gvMx1bld012.Width = 82;
+ this.gvMx1bld012.Width = 117;
//
// repositoryItemSearchLookUpEdit1
//
@@ -1702,7 +1743,7 @@
this.gridColumn5,
this.gridColumn7,
this.gridColumn6});
- this.gridView2.DetailHeight = 272;
+ this.gridView2.DetailHeight = 427;
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1712,100 +1753,100 @@
//
this.gridColumn2.Caption = "鐗╂枡ID";
this.gridColumn2.FieldName = "id";
- this.gridColumn2.MinWidth = 17;
+ this.gridColumn2.MinWidth = 24;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 36;
+ this.gridColumn2.Width = 51;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栧彿";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 17;
+ this.gridColumn3.MinWidth = 24;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 36;
+ this.gridColumn3.Width = 51;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.MinWidth = 17;
+ this.gridColumn4.MinWidth = 24;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 80;
+ this.gridColumn4.Width = 114;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 17;
+ this.gridColumn5.MinWidth = 24;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 87;
+ this.gridColumn5.Width = 124;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍗曚綅";
this.gridColumn7.FieldName = "dwName";
- this.gridColumn7.MinWidth = 17;
+ this.gridColumn7.MinWidth = 24;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 4;
- this.gridColumn7.Width = 49;
+ this.gridColumn7.Width = 70;
//
// gridColumn6
//
this.gridColumn6.Caption = "浣跨敤缁勭粐";
this.gridColumn6.FieldName = "fSubsidiary";
- this.gridColumn6.MinWidth = 17;
+ this.gridColumn6.MinWidth = 24;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 38;
+ this.gridColumn6.Width = 54;
//
// gvMx1bld002
//
this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
this.gvMx1bld002.Caption = "鐗╂枡缂栧彿";
this.gvMx1bld002.FieldName = "itemNo";
- this.gvMx1bld002.MinWidth = 22;
+ this.gvMx1bld002.MinWidth = 31;
this.gvMx1bld002.Name = "gvMx1bld002";
this.gvMx1bld002.OptionsColumn.ReadOnly = true;
this.gvMx1bld002.Tag = "query_a.bld002";
this.gvMx1bld002.Visible = true;
this.gvMx1bld002.VisibleIndex = 1;
- this.gvMx1bld002.Width = 87;
+ this.gvMx1bld002.Width = 124;
//
// gvMx1bld003
//
this.gvMx1bld003.AppearanceCell.Options.UseFont = true;
this.gvMx1bld003.Caption = "鐗╂枡鍚嶇О";
this.gvMx1bld003.FieldName = "itemName";
- this.gvMx1bld003.MinWidth = 22;
+ this.gvMx1bld003.MinWidth = 31;
this.gvMx1bld003.Name = "gvMx1bld003";
this.gvMx1bld003.OptionsColumn.ReadOnly = true;
this.gvMx1bld003.Tag = "query_a.bld003";
this.gvMx1bld003.Visible = true;
this.gvMx1bld003.VisibleIndex = 2;
- this.gvMx1bld003.Width = 105;
+ this.gvMx1bld003.Width = 150;
//
// itemModel
//
this.itemModel.AppearanceCell.Options.UseFont = true;
this.itemModel.Caption = "瑙勬牸鍨嬪彿";
this.itemModel.FieldName = "itemModel";
- this.itemModel.MinWidth = 22;
+ this.itemModel.MinWidth = 31;
this.itemModel.Name = "itemModel";
this.itemModel.OptionsColumn.ReadOnly = true;
this.itemModel.Tag = "query_a.bld004";
this.itemModel.Visible = true;
this.itemModel.VisibleIndex = 3;
- this.itemModel.Width = 105;
+ this.itemModel.Width = 150;
//
// gvMx1bld007
//
@@ -1816,12 +1857,12 @@
this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld007.Caption = "鐢宠鏁伴噺";
this.gvMx1bld007.FieldName = "shNum";
- this.gvMx1bld007.MinWidth = 43;
+ this.gvMx1bld007.MinWidth = 61;
this.gvMx1bld007.Name = "gvMx1bld007";
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
this.gvMx1bld007.VisibleIndex = 4;
- this.gvMx1bld007.Width = 82;
+ this.gvMx1bld007.Width = 117;
//
// gvMx1bld010
//
@@ -1832,35 +1873,35 @@
this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld010.Caption = "澶囨敞";
this.gvMx1bld010.FieldName = "remark";
- this.gvMx1bld010.MinWidth = 43;
+ this.gvMx1bld010.MinWidth = 61;
this.gvMx1bld010.Name = "gvMx1bld010";
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
this.gvMx1bld010.VisibleIndex = 5;
- this.gvMx1bld010.Width = 131;
+ this.gvMx1bld010.Width = 187;
//
// gvMx1bld008
//
this.gvMx1bld008.AppearanceCell.Options.UseFont = true;
this.gvMx1bld008.Caption = "宸叉壂鏁伴噺";
this.gvMx1bld008.FieldName = "sQty";
- this.gvMx1bld008.MinWidth = 43;
+ this.gvMx1bld008.MinWidth = 61;
this.gvMx1bld008.Name = "gvMx1bld008";
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
this.gvMx1bld008.VisibleIndex = 6;
- this.gvMx1bld008.Width = 82;
+ this.gvMx1bld008.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍗曚綅鍚嶇О";
this.gridColumn1.FieldName = "itemUnit";
- this.gridColumn1.MinWidth = 22;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 7;
- this.gridColumn1.Width = 82;
+ this.gridColumn1.Width = 117;
//
// gridColumn9
//
@@ -1871,11 +1912,11 @@
this.gridColumn9.Caption = "璋冨嚭缁勭粐";
this.gridColumn9.ColumnEdit = this.rptDcOrg;
this.gridColumn9.FieldName = "dcOrg";
- this.gridColumn9.MinWidth = 22;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 8;
- this.gridColumn9.Width = 82;
+ this.gridColumn9.Width = 117;
//
// rptDcOrg
//
@@ -1895,11 +1936,11 @@
this.gridColumn10.Caption = "璋冨嚭浠撳簱";
this.gridColumn10.ColumnEdit = this.rptDcCk;
this.gridColumn10.FieldName = "dcCk";
- this.gridColumn10.MinWidth = 22;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 9;
- this.gridColumn10.Width = 82;
+ this.gridColumn10.Width = 117;
//
// rptDcCk
//
@@ -1917,9 +1958,9 @@
this.gridColumn11.Caption = "璋冨嚭浠撲綅";
this.gridColumn11.ColumnEdit = this.rptDcCw;
this.gridColumn11.FieldName = "dcCw";
- this.gridColumn11.MinWidth = 22;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Width = 82;
+ this.gridColumn11.Width = 117;
//
// rptDcCw
//
@@ -1939,11 +1980,11 @@
this.gridColumn12.Caption = "璋冨叆缁勭粐";
this.gridColumn12.ColumnEdit = this.rptDrOrg;
this.gridColumn12.FieldName = "drOrg";
- this.gridColumn12.MinWidth = 22;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 10;
- this.gridColumn12.Width = 82;
+ this.gridColumn12.Width = 117;
//
// rptDrOrg
//
@@ -1963,11 +2004,11 @@
this.gridColumn16.Caption = "璋冨叆浠撳簱";
this.gridColumn16.ColumnEdit = this.rptDrCk;
this.gridColumn16.FieldName = "drCk";
- this.gridColumn16.MinWidth = 22;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 11;
- this.gridColumn16.Width = 82;
+ this.gridColumn16.Width = 117;
//
// rptDrCk
//
@@ -1983,9 +2024,9 @@
this.gridColumn17.Caption = "璋冨叆浠撲綅";
this.gridColumn17.ColumnEdit = this.rptDrCw;
this.gridColumn17.FieldName = "drCw";
- this.gridColumn17.MinWidth = 22;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 82;
+ this.gridColumn17.Width = 117;
//
// rptDrCw
//
@@ -2005,11 +2046,11 @@
this.gridColumn23.Caption = "璋冨嚭璐т富";
this.gridColumn23.ColumnEdit = this.rptDcHz;
this.gridColumn23.FieldName = "dcHz";
- this.gridColumn23.MinWidth = 22;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 12;
- this.gridColumn23.Width = 82;
+ this.gridColumn23.Width = 117;
//
// rptDcHz
//
@@ -2029,11 +2070,11 @@
this.gridColumn24.Caption = "璋冨叆璐т富";
this.gridColumn24.ColumnEdit = this.rptDrHz;
this.gridColumn24.FieldName = "drHz";
- this.gridColumn24.MinWidth = 22;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 13;
- this.gridColumn24.Width = 82;
+ this.gridColumn24.Width = 117;
//
// rptDrHz
//
@@ -2048,11 +2089,11 @@
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 22;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 14;
- this.gvMxDel.Width = 82;
+ this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -2069,102 +2110,102 @@
//
this.gridColumn8.Caption = "鐗╂枡ID";
this.gridColumn8.FieldName = "itemId";
- this.gridColumn8.MinWidth = 22;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 82;
+ this.gridColumn8.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "璋冨嚭缁勭粐Guid";
this.gridColumn14.FieldName = "dcOrgGuid";
- this.gridColumn14.MinWidth = 22;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Width = 82;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "璋冨嚭浠撳簱Guid";
this.gridColumn15.FieldName = "dcCkGuid";
- this.gridColumn15.MinWidth = 22;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Width = 82;
+ this.gridColumn15.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "璋冨嚭浠撲綅Guid";
this.gridColumn13.FieldName = "dcCwGuid";
- this.gridColumn13.MinWidth = 22;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 82;
+ this.gridColumn13.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "璋冨叆缁勭粐Guid";
this.gridColumn18.FieldName = "drOrgGuid";
- this.gridColumn18.MinWidth = 22;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Width = 82;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "璋冨叆浠撳簱Guid";
this.gridColumn19.FieldName = "drCkGuid";
- this.gridColumn19.MinWidth = 22;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Width = 82;
+ this.gridColumn19.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "璋冨叆浠撲綅Guid";
this.gridColumn20.FieldName = "drCwGuid";
- this.gridColumn20.MinWidth = 22;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Width = 82;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "璋冨嚭璐т富Guid";
this.gridColumn21.ColumnEdit = this.rptDcHz;
this.gridColumn21.FieldName = "dcHzGuid";
- this.gridColumn21.MinWidth = 22;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Width = 82;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "璋冨叆璐т富Guid";
this.gridColumn22.FieldName = "drHzGuid";
- this.gridColumn22.MinWidth = 22;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Width = 82;
+ this.gridColumn22.Width = 117;
//
// gridColumn54
//
this.gridColumn54.Caption = "宸ュ崟鍗曞彿";
this.gridColumn54.FieldName = "daa001";
- this.gridColumn54.MinWidth = 21;
+ this.gridColumn54.MinWidth = 30;
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.Visible = true;
this.gridColumn54.VisibleIndex = 15;
- this.gridColumn54.Width = 78;
+ this.gridColumn54.Width = 111;
//
// gridColumn55
//
this.gridColumn55.Caption = "澶囨枡鏄庣粏guid";
this.gridColumn55.FieldName = "dabErpId";
- this.gridColumn55.MinWidth = 21;
+ this.gridColumn55.MinWidth = 30;
this.gridColumn55.Name = "gridColumn55";
- this.gridColumn55.Width = 78;
+ this.gridColumn55.Width = 111;
//
// gridColumn56
//
this.gridColumn56.Caption = "鐗╂枡瀵瑰簲浠撶";
this.gridColumn56.FieldName = "depotMan";
- this.gridColumn56.MinWidth = 21;
+ this.gridColumn56.MinWidth = 30;
this.gridColumn56.Name = "gridColumn56";
this.gridColumn56.Visible = true;
this.gridColumn56.VisibleIndex = 16;
- this.gridColumn56.Width = 78;
+ this.gridColumn56.Width = 111;
//
// btnTest1
//
@@ -2176,9 +2217,10 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(832, 43);
+ this.picCheckBox.Location = new System.Drawing.Point(1189, 68);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.Size = new System.Drawing.Size(126, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
@@ -2218,14 +2260,25 @@
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
//
+ // gridColumn57
+ //
+ this.gridColumn57.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn57.FieldName = "workOrderNumber";
+ this.gridColumn57.MinWidth = 30;
+ this.gridColumn57.Name = "gridColumn57";
+ this.gridColumn57.Visible = true;
+ this.gridColumn57.VisibleIndex = 22;
+ this.gridColumn57.Width = 112;
+ //
// Frm_MesDbck
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1022, 531);
+ this.ClientSize = new System.Drawing.Size(1460, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "Frm_MesDbck";
this.Text = "璋冩嫧鍑哄簱鐢宠";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2481,5 +2534,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index d2f6469..8a82291 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
+using DevExpress.XtraPrinting.Native;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -33,6 +34,7 @@
toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -48,7 +50,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆鐢宠缁勭粐
+ //设置申请组织
this.txt_fapporgid.EditChanged += (s, e) =>
{
string _sqGuid = txt_fapporgid.GetId();
@@ -69,7 +71,7 @@
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
};
@@ -88,20 +90,20 @@
gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
};
- #region 2025-08-27 澶嶅埗beg
+ #region 2025-08-27 复制beg
btnCopyXls.Click += (s, e) =>
{
string kcZz = txt_fapporgid.GetId();
if (string.IsNullOrEmpty(kcZz))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能使用复制功能！");
txt_fapporgid.Focus();
return;
}
string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
if (File.Exists(filePath))
{
- var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鐗╂枡璋冩嫧.ToString());
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.物料调拨.ToString());
frm.UpdateParent += (ss, ee) =>
{
try
@@ -150,23 +152,51 @@
}
else
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
}
};
#endregion
- #region 2025-10-17 閫夋嫨鐢熶骇/濮斿璁㈠崟
+ #region 2025-10-17 选择生产/委外订单
btnSelect.Click += (s, e) =>
{
string kcZz = txt_fapporgid.GetId();
if (string.IsNullOrEmpty(kcZz))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳介�夋嫨鐢熶骇璁㈠崟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择生产订单！");
txt_fapporgid.Focus();
return;
}
- var frm = new SelectSqmx();
- //璧嬪�肩粰鏄庣粏琛�
+
+ // 根据当前申请类型判断应该打开哪个类型的弹窗
+ string selectedValue = txt_fBillTypeID.EditValue?.ToString();
+ string defaultType = "1"; // 默认生产
+
+ if (!string.IsNullOrEmpty(selectedValue) && selectedValue.Contains("委外"))
+ {
+ defaultType = "2"; // 委外
+ }
+
+ var frm = new SelectSqmx(defaultType);
+ //var frm = new SelectSqmx();
+
+ // 监听选择类型变化事件，同步更新申请类型
+ frm.SelectionTypeChanged += (ss, ee) =>
+ {
+ string workId = ee.Data; // 1是生产，2是委外
+ if (workId == "1")
+ {
+ // 生产订单，设置对应的申请类型
+ SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
+ }
+ else if (workId == "2")
+ {
+ // 委外订单，设置对应的申请类型
+ SetComboBoxValue(txt_fBillTypeID, "委外调拨申请单(DBSQD02_WW)");
+ }
+ };
+
+ //赋值给明细表
frm.UpdateParent += (ss, ee) =>
{
try
@@ -195,16 +225,17 @@
};
var strReturn = UtilityHelper.HttpPost("", "MesInvItemMovesManager/SelectScddToView", JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
- if (dt.rtnCode == -102 && dt.rtnMsg=="濮斿")
+ if (dt.rtnCode == -102 && dt.rtnMsg == "委外")
{
- MsgHelper.ShowError("鎻愮ず锛氫笟鍔＄被鍨嬩负濮斿(WW)鏃讹紝鍙兘閫夋嫨濮斿璁㈠崟锛�");
+ MsgHelper.ShowError("提示：业务类型为委外(WW)时，只能选择委外订单！");
return;
}
- else if(dt.rtnCode == -102 && dt.rtnMsg == "鐢熶骇")
+ else if (dt.rtnCode == -102 && dt.rtnMsg == "生产")
{
- MsgHelper.ShowError("鎻愮ず锛氫笟鍔＄被鍨嬩负鏍囧噯(NORMAL)鏃讹紝鍙兘閫夋嫨鐢熶骇璁㈠崟锛�");
+ MsgHelper.ShowError("提示：业务类型为标准(NORMAL)时，只能选择生产订单！");
return;
- };
+ }
+ ;
DataTable _newTable = dt.rtnData;
DataTable _oldTable = (DataTable)gcMx1.DataSource;
DataRow[] sourceRows = _newTable.Select();
@@ -223,25 +254,25 @@
}
catch(Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
};
frm.ShowDialog();
};
#endregion
- #region 2025-10-17 閫夋嫨濮斿璁㈠崟
+ #region 2025-10-17 选择委外订单
btnScdd.Click += (s, e) =>
{
string kcZz = txt_fapporgid.GetId();
if (string.IsNullOrEmpty(kcZz))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳介�夋嫨濮斿璁㈠崟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择委外订单！");
txt_fapporgid.Focus();
return;
}
var frm = new SelectScdd("1");
- //璧嬪�肩粰鏄庣粏琛�
+ //赋值给明细表
frm.UpdateParent += (ss, ee) =>
{
try
@@ -269,7 +300,7 @@
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
};
frm.ShowDialog();
@@ -279,7 +310,7 @@
}
/// <summary>
- /// 杩欐槸鎵撳嵃
+ /// 这是打印
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -291,7 +322,7 @@
lbGuid, txt_fBillNo, gridView1, "fBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("请先选择你要操作的行！");
return;
}
this.toolBarMenu1.rptParameter = "rpt_sdzjdb{"
@@ -312,7 +343,7 @@
getPageList(1);
}
/// <summary>
- /// 鍒嗛〉浜嬩欢
+ /// 分页事件
/// </summary>
/// <param name="curPage"></param>
/// <param name="pageSize"></param>
@@ -321,7 +352,7 @@
getPageList(curPage);
}
/// <summary>
- /// 鏌ヨ浜嬩欢
+ /// 查询事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -335,7 +366,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 鏌ヨ鍥炶皟
+ /// 查询回调
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -346,7 +377,7 @@
}
/// <summary>
- /// 鍙栨秷浜嬩欢
+ /// 取消事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -356,7 +387,7 @@
}
/// <summary>
- /// 鍒犻櫎浜嬩欢
+ /// 删除事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -367,10 +398,10 @@
lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("请先选择你要操作的行！");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
return;
var _obj = new
{
@@ -383,7 +414,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
@@ -391,16 +422,16 @@
getPageList(this.pageBar1.CurrentPage);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 刷新事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -422,7 +453,7 @@
}
}
/// <summary>
- /// 淇敼浜嬩欢
+ /// 修改事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -432,7 +463,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -446,7 +477,7 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
}
- //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼渚涘簲鍟嗗拰缁勭粐srm,绂佺敤
+ //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
txt_fapporgid.IsReadly = true;
txt_ftranstype.ReadOnly = true;
txt_fOwnerTypeIdHead.ReadOnly = true;
@@ -455,7 +486,7 @@
txt_djtype.Properties.ReadOnly = true;
}
/// <summary>
- /// 鏂板浜嬩欢
+ /// 新增事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -467,14 +498,14 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- //澧炲姞鏃讹紝榛樿缁勭粐
+ //增加时，默认组织
string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);
txt_fBusinessType.Properties.ReadOnly = true;
txt_djtype.Properties.ReadOnly = true;
}
/// <summary>
- /// 淇濆瓨浜嬩欢
+ /// 保存事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -491,54 +522,54 @@
string gdbh = txt_FSourceOrder.Text.ToString();
//if (txt_fBillTypeID.SelectedIndex <= 0)
//{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
// txt_fBillTypeID.Focus();
// return;
//}
if (string.IsNullOrEmpty(dbfx))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择调拨方向！");
txt_fTransferDirect.Focus();
return;
}
if (string.IsNullOrEmpty(sqOrg))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐢宠缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择申请组织！");
txt_fapporgid.Focus();
return;
}
//if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
//{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
// txt_fOwnerTypeIdHead.Focus();
// return;
//}
//if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
//{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
// txt_fOwnerTypeInIdHead.Focus();
// return;
//}
var _obj = new
{
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- djlx = djlx,//鍗曟嵁绫诲瀷
- ywlx = ywlx,//涓氬姟绫诲瀷
- dbfx = dbfx,//璋冩嫧鏂瑰悜
- sqOrg = sqOrg,//瀹¤缁勭粐
- dblx = dblx,//璋冩嫧绫诲瀷
- dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
- drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
- inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
+ djlx = djlx,//单据类型
+ ywlx = ywlx,//业务类型
+ dbfx = dbfx,//调拨方向
+ sqOrg = sqOrg,//审请组织
+ dblx = dblx,//调拨类型
+ dchzlx = dchzlx,//调出货主类型
+ drhzlx = drhzlx,//调入货主类型
+ inRemark = txt_fRemarks.Text.Trim(),//备注
list = new List<dynamic>(),
- gdbh = gdbh //宸ュ崟鍗曞彿
+ gdbh = gdbh //工单单号
};
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
- MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鐢宠鏄庣粏锛�");
+ MsgHelper.ShowError("明细不能为空，请选择你的申请明细！");
return;
}
for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -550,37 +581,37 @@
string _msl = row["shNum"].ToString();
if (string.IsNullOrEmpty(_msl))
{
- MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("数量不能为空！");
return;
}
if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨嚭缁勭粐涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调出组织不能为空！");
return;
}
if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨嚭浠撳簱涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调出仓库不能为空！");
return;
}
if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨叆缁勭粐涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调入组织不能为空！");
return;
}
if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨叆浠撳簱涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调入仓库不能为空！");
return;
}
if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨嚭璐т富涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调出货主不能为空！");
return;
}
if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
{
- MsgHelper.ShowError("璋冨叆璐т富涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("调入货主不能为空！");
return;
}
_obj.list.Add(new
@@ -607,7 +638,7 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_fBillNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -618,15 +649,15 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
else
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
}
}
/// <summary>
- /// 鏃ュ織
+ /// 日志
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -641,8 +672,8 @@
/// <summary>
///
/// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ /// <param name="curPage">第几页</param>
+ /// <param name="pageSize">每页几条</param>
private void getPageList(int curPage)
{
gcMain1.DataSource = null;
@@ -670,18 +701,18 @@
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ pageBar1.TotalPages = dd.rtnData.pages;//总页
+ pageBar1.CurrentPage = curPage;//当前页
+ pageBar1.RecordCount = dd.rtnData.total;//总记录数
}
else
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
}
}
@@ -692,12 +723,12 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
return;
}
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid,//主建
};
try
{
@@ -731,17 +762,17 @@
}
}
else
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
}
}
/// <summary>
- /// 瀹℃牳浜嬩欢
+ /// 审核事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -751,7 +782,7 @@
}
/// <summary>
- /// 鍙嶅鏍�
+ /// 反审核
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -761,7 +792,7 @@
_toolCk(0);
}
/// <summary>
- /// 鍞悗瀹℃牳
+ /// 售后审核
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -772,7 +803,7 @@
}
/// <summary>
- /// 鍞悗鍙嶅鏍�
+ /// 售后反审核
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -782,7 +813,7 @@
_toolCk(21);
}
/// <summary>
- /// 宸ュ叿鏉′簨浠�
+ /// 工具条事件
/// </summary>
/// <param name="inFieldValue"></param>
private void _toolCk(int _inFieldValue)
@@ -791,16 +822,16 @@
switch (_inFieldValue)
{
case 1:
- strMsg = "瀹℃牳";
+ strMsg = "审核";
break;
case 0:
- strMsg = "鍙嶅鏍�";
+ strMsg = "反审核";
break;
case 20:
- strMsg = "鍞悗瀹℃牳";
+ strMsg = "售后审核";
break;
case 21:
- strMsg = "鍞悗鍙嶅鏍�";
+ strMsg = "售后反审核";
break;
}
;
@@ -809,10 +840,10 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("请先选择你要操作的行！");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
return;
var _obj = new
{
@@ -838,7 +869,7 @@
}
else
{
- //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ //注意，这里和其它页面有点不一样
getPageList(this.pageBar1.CurrentPage);
int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
@@ -849,13 +880,13 @@
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
}
/// <summary>
- /// 閫夋嫨鐗╂枡
+ /// 选择物料
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -874,7 +905,7 @@
}
/// <summary>
- /// 鍒犻櫎鐗╂枡
+ /// 删除物料
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -887,7 +918,7 @@
{
var dr = gvMx1.GetDataRow(rowhandle);
var mxGuid = dr["id"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
return;
if (string.IsNullOrEmpty(mxGuid))
{
@@ -907,22 +938,22 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
getModel(lbGuid.Text);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("提示：" + ex.Message);
}
}
}
/// <summary>
- /// 鏌ユ壘璋冨嚭缁勭粐
+ /// 查找调出组织
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -942,7 +973,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 鏌ユ壘璋冨嚭浠撳簱
+ /// 查找调出仓库
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -955,7 +986,7 @@
var strOrgGuid = dr["dcOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ MsgHelper.ShowError("提示：请先选择调出组织！");
return;
}
;
@@ -970,7 +1001,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 鏌ユ壘浠撲綅
+ /// 查找仓位
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -982,14 +1013,14 @@
var dr = gvMx1.GetDataRow(rowhandle);
if (dr["dcCkGuid"] == null)
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ MsgHelper.ShowError("提示：请先选择调出仓库！");
return;
}
;
var strCkGuid = dr["dcCkGuid"].ToString();
if (string.IsNullOrEmpty(strCkGuid))
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ MsgHelper.ShowError("提示：请先选择调出仓库！");
return;
}
;
@@ -1005,7 +1036,7 @@
}
/// <summary>
- /// 璋冨叆缁勭粐
+ /// 调入组织
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1025,7 +1056,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 璋冨叆浠撳簱
+ /// 调入仓库
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1038,7 +1069,7 @@
var strOrgGuid = dr["drOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
+ MsgHelper.ShowError("提示：请先选择调入组织！");
return;
}
;
@@ -1053,7 +1084,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 璋冨叆浠撲綅
+ /// 调入仓位
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1065,14 +1096,14 @@
var dr = gvMx1.GetDataRow(rowhandle);
if (dr["drCkGuid"] == null)
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ MsgHelper.ShowError("提示：请先选择调入仓库！");
return;
}
;
var strCkGuid = dr["drCkGuid"].ToString();
if (string.IsNullOrEmpty(strCkGuid))
{
- MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ MsgHelper.ShowError("提示：请先选择调入仓库！");
return;
}
;
@@ -1088,7 +1119,7 @@
}
/// <summary>
- /// 璋冨叆璐т富
+ /// 调入货主
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1100,7 +1131,7 @@
int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
//if (_drhzlx <= 0)
//{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
+ // MsgHelper.Warning("提示：请先选择调入货主类型！");
// return;
//}
SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1115,7 +1146,7 @@
frm.ShowDialog();
}
/// <summary>
- /// 璋冨嚭璐т富
+ /// 调出货主
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1128,7 +1159,7 @@
int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
//if (_drhzlx <= 0)
//{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+ // MsgHelper.Warning("提示：请先选择调出货主类型！");
// return;
//}
SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1143,7 +1174,7 @@
}
/// <summary>
- /// 棰勮寮�宸ユ椂闂村彉鍖栦簨浠�
+ /// 预计开工时间变化事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -1154,20 +1185,21 @@
if (string.IsNullOrEmpty(selectedValue))
return;
- if (selectedValue == "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)")
+ if (selectedValue == "委外调拨申请单(DBSQD02_WW)")
{
- SetComboBoxValue(txt_fBusinessType, "濮斿(WW)");
- SetComboBoxValue(txt_djtype, "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)");
+ SetComboBoxValue(txt_fBusinessType, "委外(WW)");
+ SetComboBoxValue(txt_djtype, "委外直接调拨单(WWDB01_SYS)");
+
}
- else if (selectedValue == "鐢熶骇璋冩嫧鐢宠鍗�(DBSQD03_SC)")
+ else if (selectedValue == "生产调拨申请单(DBSQD03_SC)")
{
- SetComboBoxValue(txt_fBusinessType, "鐢熶骇(SC)");
- SetComboBoxValue(txt_djtype, "鐢熶骇鐩存帴璋冩嫧鍗�(SCDB01_SYS)");
+ SetComboBoxValue(txt_fBusinessType, "生产(SC)");
+ SetComboBoxValue(txt_djtype, "生产直接调拨单(SCDB01_SYS)");
}
else
{
- SetComboBoxValue(txt_fBusinessType, "鏍囧噯(NORMAL)");
- SetComboBoxValue(txt_djtype, "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)");
+ SetComboBoxValue(txt_fBusinessType, "标准(NORMAL)");
+ SetComboBoxValue(txt_djtype, "标准直接调拨单(ZJDB01_SYS)");
}
}
@@ -1179,7 +1211,7 @@
}
else
{
- // 濡傛灉鍊间笉瀛樺湪锛岃缃负绗竴涓�夐」鎴栫┖
+ // 如果值不存在，设置为第一个选项或空
if (comboBox.Properties.Items.Count > 0)
comboBox.EditValue = comboBox.Properties.Items[0];
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
index cffef68..beca5df 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
@@ -117,6 +117,36 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="toolBarMenu1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="xtraTabControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="xtraTabPage1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="split1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="gcMain1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="pageBar1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="xtraTabPage3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="splitMx1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="layoutMx1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="btnCopyXls.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnCopyXls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -135,6 +165,81 @@
zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
</value>
</data>
+ <metadata name="txt_djtype.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="lbGuid.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fRemarks.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fOwnerTypeInIdHead.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fCreateDate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fOwnerTypeIdHead.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fBusinessType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fTransferDirect.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_createBy.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fBillNo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_ftranstype.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fapporgid.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fBillTypeID.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_chkBy.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fapprovedate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_wjStatus.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_chkStatus.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_source.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fCloserId.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fCloseDate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_fCloseStatusTxt.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_qt028.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_qt027.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="txt_qt026.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="btnSelect.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<data name="btnSelect.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -152,6 +257,9 @@
zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
</value>
</data>
+ <metadata name="btnScdd.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<data name="btnScdd.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -169,8 +277,26 @@
zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
</value>
</data>
+ <metadata name="txt_FSourceOrder.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="tabMx.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="tabMxPage1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="gcMx1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="picCheckBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
+ </metadata>
+ <metadata name="btnSelect1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
</metadata>
<data name="btnSelect1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -189,4 +315,7 @@
zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
</value>
</data>
+ <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
index b24ee7f..7a6d5bf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
@@ -23,7 +23,8 @@
/// <param name="_suppId">渚涘簲鍟�</param>
/// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
/// <param name="_isWw">鏄惁濮斿</param>
- public SelectSqmx()
+ /// <param name="defaultType">榛樿绫诲瀷:1-鐢熶骇,2-濮斿</param>
+ public SelectSqmx(string defaultType = "1")
{
InitializeComponent();
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
@@ -33,8 +34,28 @@
this.colChkInt.OptionsFilter.AllowFilter = false;
this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
radioGroup1.SelectedIndex = 0;
+ // 鏍规嵁浼犲叆鐨勯粯璁ょ被鍨嬭缃崟閫夋寜閽�
+ if (defaultType == "2")
+ {
+ radioGroup1.SelectedIndex = 1; // 濮斿
+ }
+ else
+ {
+ radioGroup1.SelectedIndex = 0; // 鐢熶骇
+ }
+
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
+
+ // 娣诲姞浜嬩欢澶勭悊绋嬪簭锛屽綋radioGroup1閫夋嫨鍙樺寲鏃堕�氱煡澶栭儴
+ radioGroup1.SelectedIndexChanged += (s, e) =>
+ {
+ // 瑙﹀彂鑷畾涔変簨浠讹紝浼犻�掑綋鍓嶉�夋嫨鐨勭被鍨嬶紙鐢熶骇鎴栧澶栵級
+ SelectionTypeChanged?.Invoke(this, new UpdateParentEventArgs { Data = (radioGroup1.SelectedIndex + 1).ToString() });
+ getPageList(1);
+
+ };
+
btnIn.Click += (s, e) =>
{
gridView1.PostEditor();
@@ -71,7 +92,7 @@
}
}
}
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list , Data = workId , DynamicList = list_gd }); Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list , Data = workId , DynamicList = list_gd ,}); Close();
};
radioGroup1.SelectedIndexChanged += (s, e) =>
{
@@ -80,6 +101,11 @@
}
/// <summary>
+ /// 褰撻�夋嫨绫诲瀷锛堢敓浜�/濮斿锛夊彂鐢熷彉鍖栨椂瑙﹀彂鐨勪簨浠�
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> SelectionTypeChanged;
+
+ /// <summary>
/// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2054491..b450925 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -2163,6 +2163,7 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDbck.resx">
<DependentUpon>Frm_MesDbck.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\Frm_MesItemQt.resx">
<DependentUpon>Frm_MesItemQt.cs</DependentUpon>
--
Gitblit v1.9.3