From 0182a12e08e1253e9fb2d1b4dabb353babf1feea Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 25 十月 2025 09:01:49 +0800
Subject: [PATCH] 更新操作人
---
DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs | 15
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 172 +++---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 12
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 9
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 267 ++++-----
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 260 +++++-----
DevApp/Gs.DevApp/UserControl/SelectDaa.cs | 1
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 62 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs | 102 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 402 +++++++--------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 158 ++---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 1
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 38
17 files changed, 731 insertions(+), 780 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 986de58..df81b01 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -125,18 +125,12 @@
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -169,8 +163,12 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrgAll();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -224,18 +222,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -246,7 +238,12 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -647,7 +644,6 @@
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.txt_qt024);
this.layoutMx1.Controls.Add(this.txt_wwgys);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -688,7 +684,7 @@
// txt_wwgys
//
this.txt_wwgys.IsReadly = false;
- this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
+ this.txt_wwgys.Location = new System.Drawing.Point(385, 163);
this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwgys.Name = "txt_wwgys";
this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
@@ -697,7 +693,7 @@
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
- this.btnCopyXls.Location = new System.Drawing.Point(12, 198);
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 194);
this.btnCopyXls.Name = "btnCopyXls";
this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
this.btnCopyXls.StyleController = this.layoutMx1;
@@ -717,7 +713,7 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 70);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
@@ -726,7 +722,7 @@
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 136);
+ this.txt_qt010.Location = new System.Drawing.Point(114, 132);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
this.txt_qt010.Size = new System.Drawing.Size(165, 24);
@@ -736,7 +732,7 @@
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(385, 136);
+ this.txt_qt009.Location = new System.Drawing.Point(385, 101);
this.txt_qt009.Name = "txt_qt009";
this.txt_qt009.Size = new System.Drawing.Size(165, 24);
this.txt_qt009.TabIndex = 316;
@@ -744,14 +740,14 @@
// txt_qt013
//
this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(385, 105);
+ this.txt_qt013.Location = new System.Drawing.Point(385, 70);
this.txt_qt013.Name = "txt_qt013";
this.txt_qt013.Size = new System.Drawing.Size(165, 24);
this.txt_qt013.TabIndex = 304;
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(114, 12);
+ this.txt_qtck.Location = new System.Drawing.Point(114, 8);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
this.txt_qtck.Size = new System.Drawing.Size(165, 24);
@@ -762,7 +758,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)";
- this.txt_qt019.Location = new System.Drawing.Point(385, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(385, 8);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -780,7 +776,7 @@
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(385, 74);
+ this.txt_qt020.Location = new System.Drawing.Point(385, 39);
this.txt_qt020.Name = "txt_qt020";
this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -795,14 +791,14 @@
// txt_qt023
//
this.txt_qt023.IsReadly = false;
- this.txt_qt023.Location = new System.Drawing.Point(114, 43);
+ this.txt_qt023.Location = new System.Drawing.Point(114, 39);
this.txt_qt023.Name = "txt_qt023";
this.txt_qt023.Size = new System.Drawing.Size(165, 24);
this.txt_qt023.TabIndex = 307;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(927, 12);
+ this.txt_qt016.Location = new System.Drawing.Point(927, 8);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
this.txt_qt016.Size = new System.Drawing.Size(166, 24);
@@ -812,7 +808,7 @@
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(927, 43);
+ this.txt_qt002.Location = new System.Drawing.Point(927, 39);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
this.txt_qt002.Size = new System.Drawing.Size(166, 24);
@@ -822,7 +818,7 @@
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(825, 74);
+ this.txt_qt015.Location = new System.Drawing.Point(825, 70);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_qt015.Size = new System.Drawing.Size(268, 24);
@@ -832,7 +828,7 @@
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(927, 105);
+ this.txt_qt031.Location = new System.Drawing.Point(927, 101);
this.txt_qt031.Name = "txt_qt031";
this.txt_qt031.Size = new System.Drawing.Size(166, 24);
this.txt_qt031.StyleController = this.layoutMx1;
@@ -841,7 +837,7 @@
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(927, 136);
+ this.txt_qt030.Location = new System.Drawing.Point(927, 132);
this.txt_qt030.Name = "txt_qt030";
this.txt_qt030.Size = new System.Drawing.Size(166, 24);
this.txt_qt030.StyleController = this.layoutMx1;
@@ -850,7 +846,7 @@
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(825, 167);
+ this.txt_qt029.Location = new System.Drawing.Point(825, 163);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
this.txt_qt029.Size = new System.Drawing.Size(268, 24);
@@ -860,7 +856,7 @@
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(656, 105);
+ this.txt_qt028.Location = new System.Drawing.Point(656, 101);
this.txt_qt028.Name = "txt_qt028";
this.txt_qt028.Size = new System.Drawing.Size(165, 24);
this.txt_qt028.StyleController = this.layoutMx1;
@@ -869,7 +865,7 @@
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(656, 136);
+ this.txt_qt027.Location = new System.Drawing.Point(656, 132);
this.txt_qt027.Name = "txt_qt027";
this.txt_qt027.Size = new System.Drawing.Size(165, 24);
this.txt_qt027.StyleController = this.layoutMx1;
@@ -878,7 +874,7 @@
//
// txt_qt034
//
- this.txt_qt034.Location = new System.Drawing.Point(656, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(656, 8);
this.txt_qt034.Name = "txt_qt034";
this.txt_qt034.Size = new System.Drawing.Size(165, 24);
this.txt_qt034.StyleController = this.layoutMx1;
@@ -887,7 +883,7 @@
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(554, 167);
+ this.txt_qt026.Location = new System.Drawing.Point(554, 163);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑";
this.txt_qt026.Size = new System.Drawing.Size(267, 24);
@@ -897,7 +893,7 @@
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(656, 43);
+ this.txt_qt033.Location = new System.Drawing.Point(656, 39);
this.txt_qt033.Name = "txt_qt033";
this.txt_qt033.Size = new System.Drawing.Size(165, 24);
this.txt_qt033.StyleController = this.layoutMx1;
@@ -906,7 +902,7 @@
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(554, 74);
+ this.txt_qt032.Location = new System.Drawing.Point(554, 70);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
this.txt_qt032.Size = new System.Drawing.Size(267, 24);
@@ -916,7 +912,7 @@
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(114, 167);
+ this.txt_qt035.Location = new System.Drawing.Point(114, 163);
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
@@ -927,7 +923,7 @@
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(385, 167);
+ this.txt_qtlx.Location = new System.Drawing.Point(385, 132);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -948,9 +944,9 @@
//
// txt_lyRemark
//
- this.txt_lyRemark.Location = new System.Drawing.Point(656, 198);
+ this.txt_lyRemark.Location = new System.Drawing.Point(385, 194);
this.txt_lyRemark.Name = "txt_lyRemark";
- this.txt_lyRemark.Size = new System.Drawing.Size(437, 27);
+ this.txt_lyRemark.Size = new System.Drawing.Size(436, 27);
this.txt_lyRemark.StyleController = this.layoutMx1;
this.txt_lyRemark.TabIndex = 447;
this.txt_lyRemark.Tag = "readonly";
@@ -985,19 +981,18 @@
this.layoutControlItem19,
this.layoutControlItem21,
this.layoutControlItem20,
- this.layoutControlItem3,
- this.layoutControlItem11,
this.layoutControlItem22,
this.layoutControlItem23,
- this.layoutControlItem10,
this.layoutControlItem13,
this.layoutControlItem24,
- this.layoutControlItem12,
this.layoutControlItem1,
this.layoutControlItem25,
+ this.layoutControlItem3,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
this.layItemWwgys,
- this.txt_lyRemarklb,
- this.layoutControlItem5});
+ this.txt_lyRemarklb});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1181,28 +1176,6 @@
this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_qt020;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 62);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_qt009;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 124);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_qt033;
@@ -1226,17 +1199,6 @@
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 93);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem10.Text = "瀹㈡埛";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_qt010;
@@ -1256,17 +1218,6 @@
this.layoutControlItem24.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_qtlx;
- this.layoutControlItem12.Location = new System.Drawing.Point(271, 155);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem1
//
@@ -1290,32 +1241,6 @@
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
- //
- // layItemWwgys
- //
- this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
- this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
- this.layItemWwgys.Control = this.txt_wwgys;
- this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
- this.layItemWwgys.Name = "layItemWwgys";
- this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
- this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
- this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
- this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
- this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- //
- // txt_lyRemarklb
- //
- this.txt_lyRemarklb.Control = this.txt_lyRemark;
- this.txt_lyRemarklb.Location = new System.Drawing.Point(542, 186);
- this.txt_lyRemarklb.Name = "txt_lyRemarklb";
- this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 2;
- this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
- this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
- this.txt_lyRemarklb.Size = new System.Drawing.Size(543, 31);
- this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
- this.txt_lyRemarklb.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1686,24 +1611,75 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_qt024
+ // layoutControlItem3
//
- this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(385, 43);
- this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(165, 24);
- this.txt_qt024.TabIndex = 448;
+ this.layoutControlItem3.Control = this.txt_qt020;
+ this.layoutControlItem3.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem5
+ // layoutControlItem10
//
- this.layoutControlItem5.Control = this.txt_qt024;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.Control = this.txt_qt013;
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem10.Text = "瀹㈡埛";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_qt009;
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 93);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_qtlx;
+ this.layoutControlItem12.Location = new System.Drawing.Point(271, 124);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layItemWwgys
+ //
+ this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
+ this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
+ this.layItemWwgys.Control = this.txt_wwgys;
+ this.layItemWwgys.Location = new System.Drawing.Point(271, 155);
+ this.layItemWwgys.Name = "layItemWwgys";
+ this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 5;
+ this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
+ this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
+ this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
+ this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // txt_lyRemarklb
+ //
+ this.txt_lyRemarklb.Control = this.txt_lyRemark;
+ this.txt_lyRemarklb.Location = new System.Drawing.Point(271, 186);
+ this.txt_lyRemarklb.Name = "txt_lyRemarklb";
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
+ this.txt_lyRemarklb.Size = new System.Drawing.Size(542, 31);
+ this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
+ this.txt_lyRemarklb.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_MesItemQt
//
@@ -1768,18 +1744,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1790,7 +1760,12 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
this.ResumeLayout(false);
}
@@ -1884,19 +1859,15 @@
private DevExpress.XtraEditors.TextEdit txt_qt033;
private DevExpress.XtraEditors.CheckEdit txt_qt032;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraEditors.ButtonEdit txt_qt035;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.SimpleButton btnCopyXls;
@@ -1904,15 +1875,17 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private UserControl.UcLookSupplier txt_wwgys;
- private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraEditors.MemoEdit txt_lyRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
private DevExpress.XtraLayout.LayoutControlItem txt_lyRemarklb;
- private UserControl.UcLookOrgAll txt_qt024;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 5020849..49cf3f2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -68,17 +68,20 @@
ucLookHuoZhu1.SetHzLx(_ucHzlx);
ucLookHuoZhu1.SetHzId(_ucHz);
_bindLookSearch(txt_qt035.Text.Trim(), "","");
- };
- //閫夋嫨棰嗙敤缁勭粐
- txt_qt024.EditChanged += (s, e) =>
- {
- string _orgId = txt_qt024.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
txt_qt013.getSuppler(_orgId, _ucKh);
- txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_qt009.getSuppler(_orgId, _ucBm, " len(a.departmentcode)>2 ");
txt_wwgys.getSuppler(_orgId, _ucGys);
};
+ //閫夋嫨棰嗙敤缁勭粐2025骞�-10-24宸茶绂佺敤锛屼负鑰冭檻鎬ц兘锛屽垹闄�
+ //txt_qt024.EditChanged += (s, e) =>
+ //{
+ // string _orgId = txt_qt024.GetId();
+ // if (string.IsNullOrEmpty(_orgId))
+ // return;
+ // txt_qt013.getSuppler(_orgId, _ucKh);
+ // txt_qt009.getSuppler(_orgId, _ucBm);
+ // txt_wwgys.getSuppler(_orgId, _ucGys);
+ //};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
{
@@ -420,7 +423,7 @@
}
//2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
txt_qt023.IsReadly = true;
- txt_qt024.IsReadly = true;
+ //txt_qt024.IsReadly = true;
ucLookHuoZhu1.Enabled = false;
}
/// <summary>
@@ -439,7 +442,7 @@
ucLookHuoZhu1.Enabled = true;
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
- string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
+ //string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -454,7 +457,8 @@
string inHz = ucLookHuoZhu1.GetHzId();//璐т富
string inRkyy = txt_qt010.Text.Trim();//鍘熷洜
string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷
- string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ // string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ string inLyOrg = inOrgId;//棰嗙敤缁勭粐绛変簬搴撳瓨缁勭粐
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
@@ -476,12 +480,12 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (string.IsNullOrEmpty(inLyOrg))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
- txt_qt024.Focus();
- return;
- }
+ //if (string.IsNullOrEmpty(inLyOrg))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
+ // txt_qt024.Focus();
+ // return;
+ //}
if (txt_qtlx.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍑哄簱绫诲瀷锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 7a82dca..a18c74c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -401,7 +401,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
@@ -425,7 +425,7 @@
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "shPeople";
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
@@ -520,7 +520,7 @@
// gridColumn23
//
this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
- this.gridColumn23.FieldName = "鍒拌揣鎬婚噺";
+ this.gridColumn23.FieldName = "qtyDh";
this.gridColumn23.MinWidth = 24;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
@@ -530,7 +530,7 @@
// gridColumn24
//
this.gridColumn24.Caption = "妫�楠屾暟閲�";
- this.gridColumn24.FieldName = "妫�楠屾�婚噺";
+ this.gridColumn24.FieldName = "jyQty";
this.gridColumn24.MinWidth = 24;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Width = 90;
@@ -538,7 +538,7 @@
// gridColumn25
//
this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
- this.gridColumn25.FieldName = "鍏ュ簱鎬婚噺";
+ this.gridColumn25.FieldName = "rkQty";
this.gridColumn25.MinWidth = 24;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
@@ -548,7 +548,7 @@
// gridColumn26
//
this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
- this.gridColumn26.FieldName = "鎵撳嵃鎬婚噺";
+ this.gridColumn26.FieldName = "printQty";
this.gridColumn26.MinWidth = 24;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Width = 90;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 4a9249e..429b8e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -387,7 +387,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
@@ -411,7 +411,7 @@
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.FieldName = "gxPeople";
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 185b09f..984785a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -501,7 +501,7 @@
//
this.gv_qt005.AppearanceCell.Options.UseFont = true;
this.gv_qt005.Caption = "鐢宠浜�";
- this.gv_qt005.FieldName = "qt005";
+ this.gv_qt005.FieldName = "cjPeople";
this.gv_qt005.MinWidth = 25;
this.gv_qt005.Name = "gv_qt005";
this.gv_qt005.OptionsColumn.AllowEdit = false;
@@ -527,7 +527,7 @@
//
this.gv_qt016.AppearanceCell.Options.UseFont = true;
this.gv_qt016.Caption = "瀹℃牳浜� ";
- this.gv_qt016.FieldName = "qt016";
+ this.gv_qt016.FieldName = "shPeople";
this.gv_qt016.MinWidth = 25;
this.gv_qt016.Name = "gv_qt016";
this.gv_qt016.OptionsColumn.AllowEdit = false;
@@ -1414,11 +1414,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1432,7 +1432,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 32);
+ this.radOut.Size = new System.Drawing.Size(336, 33);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1440,10 +1440,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 84);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 86);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 32);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 33);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1487,7 +1487,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1495,7 +1495,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1505,7 +1505,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1523,7 +1523,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1542,7 +1542,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 48);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 49);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1562,7 +1562,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 48);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 49);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1572,7 +1572,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 86);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1632,7 +1632,7 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1641,7 +1641,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1649,11 +1649,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1666,7 +1666,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1675,11 +1675,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1691,7 +1691,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1700,11 +1700,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1715,7 +1715,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1724,10 +1724,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1736,22 +1736,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 2c093d9..57d4f71 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -384,7 +384,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index ccaa4c1..d63ae4e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -580,7 +580,7 @@
//
this.gv_tbl009.AppearanceCell.Options.UseFont = true;
this.gv_tbl009.Caption = "鍒涘缓浜� ";
- this.gv_tbl009.FieldName = "tbl009";
+ this.gv_tbl009.FieldName = "cjPeople";
this.gv_tbl009.MinWidth = 50;
this.gv_tbl009.Name = "gv_tbl009";
this.gv_tbl009.OptionsColumn.AllowEdit = false;
@@ -606,7 +606,7 @@
//
this.gv_tbl011.AppearanceCell.Options.UseFont = true;
this.gv_tbl011.Caption = "瀹℃牳浜� ";
- this.gv_tbl011.FieldName = "tbl011";
+ this.gv_tbl011.FieldName = "shPeople";
this.gv_tbl011.MinWidth = 50;
this.gv_tbl011.Name = "gv_tbl011";
this.gv_tbl011.OptionsColumn.AllowEdit = false;
@@ -784,7 +784,7 @@
this.txt_tbl023.IsReadly = false;
this.txt_tbl023.Location = new System.Drawing.Point(114, 43);
this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(239, 24);
+ this.txt_tbl023.Size = new System.Drawing.Size(245, 24);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl005
@@ -800,7 +800,7 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(239, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(245, 24);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
@@ -809,7 +809,7 @@
this.txt_tbl006.Location = new System.Drawing.Point(114, 136);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(239, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(245, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
@@ -819,25 +819,25 @@
this.txt_tbl002.IsReadly = false;
this.txt_tbl002.Location = new System.Drawing.Point(114, 74);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(239, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(245, 24);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(459, 43);
+ this.txt_workName.Location = new System.Drawing.Point(465, 43);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(240, 24);
+ this.txt_workName.Size = new System.Drawing.Size(245, 24);
this.txt_workName.StyleController = this.layoutMx1;
this.txt_workName.TabIndex = 298;
this.txt_workName.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(805, 136);
+ this.txt_tbl012.Location = new System.Drawing.Point(816, 136);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(245, 24);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
@@ -847,66 +847,66 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(239, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(245, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(459, 12);
+ this.txt_rwd.Location = new System.Drawing.Point(465, 12);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(240, 24);
+ this.txt_rwd.Size = new System.Drawing.Size(245, 24);
this.txt_rwd.StyleController = this.layoutMx1;
this.txt_rwd.TabIndex = 217;
this.txt_rwd.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(805, 105);
+ this.txt_tbl011.Location = new System.Drawing.Point(816, 105);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(245, 24);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(459, 105);
+ this.txt_itemName.Location = new System.Drawing.Point(465, 105);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(240, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(245, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "readonly";
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(703, 167);
+ this.txt_tbl013.Location = new System.Drawing.Point(714, 167);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.txt_tbl013.Size = new System.Drawing.Size(342, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(347, 24);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 463;
this.txt_tbl013.Tag = "readonly";
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(805, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(816, 12);
this.txt_tbl009.Name = "txt_tbl009";
- this.txt_tbl009.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl009.Size = new System.Drawing.Size(245, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
this.txt_tbl009.TabIndex = 464;
this.txt_tbl009.Tag = "readonly";
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(805, 43);
+ this.txt_tbl010.Location = new System.Drawing.Point(816, 43);
this.txt_tbl010.Name = "txt_tbl010";
- this.txt_tbl010.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl010.Size = new System.Drawing.Size(245, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
this.txt_tbl010.TabIndex = 465;
this.txt_tbl010.Tag = "readonly";
@@ -923,9 +923,9 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(805, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(816, 74);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(240, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(245, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 467;
this.txt_itemNo.Tag = "readonly";
@@ -941,85 +941,85 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(459, 136);
+ this.txt_daa014.Location = new System.Drawing.Point(465, 136);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(240, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(245, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 469;
this.txt_daa014.Tag = "readonly";
//
// txt_tbl026
//
- this.txt_tbl026.Location = new System.Drawing.Point(1151, 105);
+ this.txt_tbl026.Location = new System.Drawing.Point(1167, 105);
this.txt_tbl026.Name = "txt_tbl026";
- this.txt_tbl026.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl026.Size = new System.Drawing.Size(245, 24);
this.txt_tbl026.StyleController = this.layoutMx1;
this.txt_tbl026.TabIndex = 470;
this.txt_tbl026.Tag = "readonly";
//
// txt_tbl025
//
- this.txt_tbl025.Location = new System.Drawing.Point(1151, 136);
+ this.txt_tbl025.Location = new System.Drawing.Point(1167, 136);
this.txt_tbl025.Name = "txt_tbl025";
- this.txt_tbl025.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl025.Size = new System.Drawing.Size(245, 24);
this.txt_tbl025.StyleController = this.layoutMx1;
this.txt_tbl025.TabIndex = 471;
this.txt_tbl025.Tag = "readonly";
//
// txt_chkOut
//
- this.txt_chkOut.Location = new System.Drawing.Point(357, 167);
+ this.txt_chkOut.Location = new System.Drawing.Point(363, 167);
this.txt_chkOut.Name = "txt_chkOut";
this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
- this.txt_chkOut.Size = new System.Drawing.Size(342, 24);
+ this.txt_chkOut.Size = new System.Drawing.Size(347, 24);
this.txt_chkOut.StyleController = this.layoutMx1;
this.txt_chkOut.TabIndex = 472;
//
// txt_tbl024
//
- this.txt_tbl024.Location = new System.Drawing.Point(1049, 167);
+ this.txt_tbl024.Location = new System.Drawing.Point(1065, 167);
this.txt_tbl024.Name = "txt_tbl024";
this.txt_tbl024.Properties.Caption = "鎵瑰噯鐘舵��";
- this.txt_tbl024.Size = new System.Drawing.Size(342, 24);
+ this.txt_tbl024.Size = new System.Drawing.Size(347, 24);
this.txt_tbl024.StyleController = this.layoutMx1;
this.txt_tbl024.TabIndex = 473;
this.txt_tbl024.Tag = "readonly";
//
// txt_tbl028
//
- this.txt_tbl028.Location = new System.Drawing.Point(1151, 43);
+ this.txt_tbl028.Location = new System.Drawing.Point(1167, 43);
this.txt_tbl028.Name = "txt_tbl028";
- this.txt_tbl028.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl028.Size = new System.Drawing.Size(245, 24);
this.txt_tbl028.StyleController = this.layoutMx1;
this.txt_tbl028.TabIndex = 475;
this.txt_tbl028.Tag = "readonly";
//
// txt_tbl029
//
- this.txt_tbl029.Location = new System.Drawing.Point(1151, 12);
+ this.txt_tbl029.Location = new System.Drawing.Point(1167, 12);
this.txt_tbl029.Name = "txt_tbl029";
- this.txt_tbl029.Size = new System.Drawing.Size(240, 24);
+ this.txt_tbl029.Size = new System.Drawing.Size(245, 24);
this.txt_tbl029.StyleController = this.layoutMx1;
this.txt_tbl029.TabIndex = 476;
this.txt_tbl029.Tag = "readonly";
//
// txt_tbl027
//
- this.txt_tbl027.Location = new System.Drawing.Point(1049, 74);
+ this.txt_tbl027.Location = new System.Drawing.Point(1065, 74);
this.txt_tbl027.Name = "txt_tbl027";
this.txt_tbl027.Properties.Caption = "鍝佽川瀹℃牳鐘舵��";
- this.txt_tbl027.Size = new System.Drawing.Size(342, 24);
+ this.txt_tbl027.Size = new System.Drawing.Size(347, 24);
this.txt_tbl027.StyleController = this.layoutMx1;
this.txt_tbl027.TabIndex = 477;
this.txt_tbl027.Tag = "readonly";
//
// txt_line
//
- this.txt_line.Location = new System.Drawing.Point(459, 74);
+ this.txt_line.Location = new System.Drawing.Point(465, 74);
this.txt_line.Name = "txt_line";
- this.txt_line.Size = new System.Drawing.Size(240, 24);
+ this.txt_line.Size = new System.Drawing.Size(245, 24);
this.txt_line.StyleController = this.layoutMx1;
this.txt_line.TabIndex = 478;
this.txt_line.Tag = "readonly";
@@ -1122,27 +1122,27 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1403, 206);
+ this.Root.Size = new System.Drawing.Size(1424, 206);
this.Root.TextVisible = false;
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_tbl009;
- this.layoutControlItem12.Location = new System.Drawing.Point(691, 0);
+ this.layoutControlItem12.Location = new System.Drawing.Point(702, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem12.Text = "鍒跺崟浜哄憳";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_tbl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(691, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(702, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem13.Text = "鍒跺崟鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1152,7 +1152,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1162,7 +1162,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1172,18 +1172,18 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_itemNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(691, 62);
+ this.layoutControlItem18.Location = new System.Drawing.Point(702, 62);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem18.Text = "浜у搧缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1192,61 +1192,61 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_workName;
- this.layoutControlItem6.Location = new System.Drawing.Point(345, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(351, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(345, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(351, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(691, 93);
+ this.layoutControlItem9.Location = new System.Drawing.Point(702, 93);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(691, 124);
+ this.layoutControlItem10.Location = new System.Drawing.Point(702, 124);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(691, 155);
+ this.layoutControlItem11.Location = new System.Drawing.Point(702, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1259,7 +1259,7 @@
this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem16.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -1268,65 +1268,65 @@
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txt_tbl029;
- this.layoutControlItem36.Location = new System.Drawing.Point(1037, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(1053, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem36.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem36.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem36.Text = "鍝佽川瀹℃牳浜哄憳";
this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_tbl028;
- this.layoutControlItem37.Location = new System.Drawing.Point(1037, 31);
+ this.layoutControlItem37.Location = new System.Drawing.Point(1053, 31);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem37.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem37.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem37.Text = "鍝佽川瀹℃牳鏃堕棿";
this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_tbl027;
- this.layoutControlItem38.Location = new System.Drawing.Point(1037, 62);
+ this.layoutControlItem38.Location = new System.Drawing.Point(1053, 62);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem38.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem38.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_tbl024;
- this.layoutControlItem35.Location = new System.Drawing.Point(1037, 155);
+ this.layoutControlItem35.Location = new System.Drawing.Point(1053, 155);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem35.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_tbl025;
- this.layoutControlItem20.Location = new System.Drawing.Point(1037, 124);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1053, 124);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_tbl026;
- this.layoutControlItem19.Location = new System.Drawing.Point(1037, 93);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1053, 93);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1336,51 +1336,51 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(345, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem15.Text = "澶囨敞璇存槑";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_chkOut;
- this.layoutControlItem34.Location = new System.Drawing.Point(345, 155);
+ this.layoutControlItem34.Location = new System.Drawing.Point(351, 155);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem34.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
// lab_daa014
//
this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(345, 124);
+ this.lab_daa014.Location = new System.Drawing.Point(351, 124);
this.lab_daa014.Name = "lab_daa014";
this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(346, 31);
+ this.lab_daa014.Size = new System.Drawing.Size(351, 31);
this.lab_daa014.Text = "鎶曟枡鍗曞彿";
this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(345, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(351, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem8.Text = "浜у搧鍚嶇О";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_line;
- this.layoutControlItem39.Location = new System.Drawing.Point(345, 62);
+ this.layoutControlItem39.Location = new System.Drawing.Point(351, 62);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem39.Size = new System.Drawing.Size(346, 31);
+ this.layoutControlItem39.Size = new System.Drawing.Size(351, 31);
this.layoutControlItem39.Text = "鐢熶骇绾垮埆";
this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
index 41b3f90..02c3ed0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -390,7 +390,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -416,7 +416,7 @@
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.FieldName = "gxPeople";
this.gv_lastupdateBy.MinWidth = 25;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs
index 197aee1..3225b87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs
@@ -41,6 +41,7 @@
this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -130,7 +131,8 @@
this.gridColumn2,
this.gridColumn4,
this.gv_itemBarcode,
- this.gv_quantity});
+ this.gv_quantity,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -219,6 +221,16 @@
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鐩稿叧缁勭粐";
+ this.gridColumn1.FieldName = "orgName";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 94;
+ //
// SysTuiSong
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -256,5 +268,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 9b87f89..4cab475 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -30,25 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -103,6 +103,7 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -122,7 +123,6 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -204,6 +204,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -223,7 +224,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -400,7 +400,7 @@
//
this.gv_fCreatorId.AppearanceCell.Options.UseFont = true;
this.gv_fCreatorId.Caption = "鍒涘缓浜� ";
- this.gv_fCreatorId.FieldName = "fCreatorId";
+ this.gv_fCreatorId.FieldName = "cjPeople";
this.gv_fCreatorId.MinWidth = 50;
this.gv_fCreatorId.Name = "gv_fCreatorId";
this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
@@ -413,7 +413,7 @@
//
this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
this.gv_fApproverID.Caption = "瀹℃牳浜�";
- this.gv_fApproverID.FieldName = "fApproverID";
+ this.gv_fApproverID.FieldName = "shPeople";
this.gv_fApproverID.MinWidth = 50;
this.gv_fApproverID.Name = "gv_fApproverID";
this.gv_fApproverID.OptionsColumn.AllowEdit = false;
@@ -534,7 +534,7 @@
// gridColumn39
//
this.gridColumn39.Caption = "璐㈠姟瀹℃牳浜�";
- this.gridColumn39.FieldName = "qt031";
+ this.gridColumn39.FieldName = "cwPeople";
this.gridColumn39.MinWidth = 25;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
@@ -648,10 +648,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(671, 74);
+ this.txt_chkStatus.Location = new System.Drawing.Point(682, 74);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(326, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 376;
this.txt_chkStatus.Tag = "readonly";
@@ -671,7 +671,7 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(223, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(229, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -686,16 +686,16 @@
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(223, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 362;
//
// txt_fApproverID
//
- this.txt_fApproverID.Location = new System.Drawing.Point(773, 12);
+ this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
this.txt_fApproverID.Name = "txt_fApproverID";
this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproverID.Size = new System.Drawing.Size(224, 24);
+ this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
this.txt_fApproverID.StyleController = this.layoutMx1;
this.txt_fApproverID.TabIndex = 222;
this.txt_fApproverID.Tag = "readonly";
@@ -705,35 +705,35 @@
this.txt_salesId.IsReadly = false;
this.txt_salesId.Location = new System.Drawing.Point(114, 74);
this.txt_salesId.Name = "txt_salesId";
- this.txt_salesId.Size = new System.Drawing.Size(223, 24);
+ this.txt_salesId.Size = new System.Drawing.Size(229, 24);
this.txt_salesId.TabIndex = 367;
//
// txt_fSaleOrgIdTxt
//
- this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(443, 12);
+ this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(224, 24);
+ this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
this.txt_fSaleOrgIdTxt.TabIndex = 365;
this.txt_fSaleOrgIdTxt.Tag = "readonly";
//
// txt_fCreatorId
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(1103, 105);
+ this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 105);
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(224, 24);
+ this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
this.txt_fCreatorId.StyleController = this.layoutMx1;
this.txt_fCreatorId.TabIndex = 219;
this.txt_fCreatorId.Tag = "readonly";
//
// txt_fApproveDate
//
- this.txt_fApproveDate.Location = new System.Drawing.Point(773, 43);
+ this.txt_fApproveDate.Location = new System.Drawing.Point(784, 43);
this.txt_fApproveDate.Name = "txt_fApproveDate";
this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fApproveDate.Size = new System.Drawing.Size(224, 24);
+ this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
this.txt_fApproveDate.StyleController = this.layoutMx1;
this.txt_fApproveDate.TabIndex = 228;
this.txt_fApproveDate.Tag = "readonly";
@@ -743,54 +743,54 @@
this.txt_fNote.Location = new System.Drawing.Point(114, 105);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(223, 24);
+ this.txt_fNote.Size = new System.Drawing.Size(229, 24);
this.txt_fNote.StyleController = this.layoutMx1;
this.txt_fNote.TabIndex = 243;
//
// txt_fSalesManIDTxt
//
- this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(773, 105);
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 105);
this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(224, 24);
+ this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
this.txt_fSalesManIDTxt.TabIndex = 231;
this.txt_fSalesManIDTxt.Tag = "readonly";
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(1103, 136);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 136);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(224, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 226;
this.txt_fCreateDate.Tag = "readonly";
//
// txt_fCustomerIDTxt
//
- this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(443, 43);
+ this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 43);
this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(224, 24);
+ this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
this.txt_fCustomerIDTxt.TabIndex = 368;
this.txt_fCustomerIDTxt.Tag = "readonly";
//
// txt_shf
//
- this.txt_shf.Location = new System.Drawing.Point(443, 74);
+ this.txt_shf.Location = new System.Drawing.Point(449, 74);
this.txt_shf.Name = "txt_shf";
- this.txt_shf.Size = new System.Drawing.Size(224, 24);
+ this.txt_shf.Size = new System.Drawing.Size(229, 24);
this.txt_shf.StyleController = this.layoutMx1;
this.txt_shf.TabIndex = 373;
this.txt_shf.Tag = "readonly";
//
// txt_shName
//
- this.txt_shName.Location = new System.Drawing.Point(443, 105);
+ this.txt_shName.Location = new System.Drawing.Point(449, 105);
this.txt_shName.Name = "txt_shName";
- this.txt_shName.Size = new System.Drawing.Size(224, 24);
+ this.txt_shName.Size = new System.Drawing.Size(229, 24);
this.txt_shName.StyleController = this.layoutMx1;
this.txt_shName.TabIndex = 374;
this.txt_shName.Tag = "readonly";
@@ -807,31 +807,31 @@
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(1103, 12);
+ this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
this.txt_qt031.Name = "txt_qt031";
this.txt_qt031.Properties.ReadOnly = true;
- this.txt_qt031.Size = new System.Drawing.Size(224, 24);
+ this.txt_qt031.Size = new System.Drawing.Size(229, 24);
this.txt_qt031.StyleController = this.layoutMx1;
this.txt_qt031.TabIndex = 378;
this.txt_qt031.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(1103, 43);
+ this.txt_qt030.Location = new System.Drawing.Point(1119, 43);
this.txt_qt030.Name = "txt_qt030";
this.txt_qt030.Properties.ReadOnly = true;
- this.txt_qt030.Size = new System.Drawing.Size(224, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(229, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 379;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(1001, 74);
+ this.txt_qt029.Location = new System.Drawing.Point(1017, 74);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
this.txt_qt029.Properties.ReadOnly = true;
- this.txt_qt029.Size = new System.Drawing.Size(326, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(331, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 380;
this.txt_qt029.Tag = "readonly";
@@ -884,6 +884,17 @@
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_SaleOrgId;
+ this.layoutControlItem22.Location = new System.Drawing.Point(329, 124);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -909,36 +920,36 @@
this.layoutControlItem21});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 175);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem13
@@ -946,11 +957,11 @@
this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
- this.layoutControlItem13.Location = new System.Drawing.Point(329, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(335, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -959,10 +970,10 @@
this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
- this.layoutControlItem5.Location = new System.Drawing.Point(329, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem5.Text = "閿�鍞粍缁�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -971,11 +982,11 @@
this.layoutControlItem14.Control = this.txt_shf;
this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(329, 62);
+ this.layoutControlItem14.Location = new System.Drawing.Point(335, 62);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem14.Text = "鏀惰揣鏂�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
@@ -987,7 +998,7 @@
this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem8.Text = "鐢宠澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
@@ -999,7 +1010,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem4.Text = "閿�鍞鍗�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1008,10 +1019,10 @@
this.layoutControlItem10.Control = this.txt_fApproverID;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
- this.layoutControlItem10.Location = new System.Drawing.Point(659, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1020,22 +1031,22 @@
this.layoutControlItem11.Control = this.txt_fApproveDate;
this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
- this.layoutControlItem11.Location = new System.Drawing.Point(659, 31);
+ this.layoutControlItem11.Location = new System.Drawing.Point(670, 31);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_chkStatus;
- this.layoutControlItem15.Location = new System.Drawing.Point(659, 62);
+ this.layoutControlItem15.Location = new System.Drawing.Point(670, 62);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -1043,32 +1054,32 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt031;
- this.layoutControlItem18.Location = new System.Drawing.Point(989, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt030;
- this.layoutControlItem19.Location = new System.Drawing.Point(989, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1005, 31);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt029;
- this.layoutControlItem20.Location = new System.Drawing.Point(989, 62);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1005, 62);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem20.TextVisible = false;
@@ -1078,11 +1089,11 @@
this.layoutControlItem6.Control = this.txt_fCreatorId;
this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
- this.layoutControlItem6.Location = new System.Drawing.Point(989, 93);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1005, 93);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1091,11 +1102,11 @@
this.layoutControlItem7.Control = this.txt_fCreateDate;
this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.Location = new System.Drawing.Point(989, 124);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1005, 124);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1104,11 +1115,11 @@
this.layoutControlItem17.Control = this.txt_shName;
this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.Location = new System.Drawing.Point(329, 93);
+ this.layoutControlItem17.Location = new System.Drawing.Point(335, 93);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1117,11 +1128,11 @@
this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(659, 93);
+ this.layoutControlItem9.Location = new System.Drawing.Point(670, 93);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem9.Text = "閿�鍞汉鍛�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1133,7 +1144,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1144,7 +1155,7 @@
this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem2.Text = "鐢宠缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1157,21 +1168,10 @@
this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_SaleOrgId;
- this.layoutControlItem22.Location = new System.Drawing.Point(329, 124);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
- this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1536,10 +1536,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1584,9 +1584,9 @@
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1660,6 +1660,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -1679,7 +1680,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 5a0cf14..a071de3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -711,5 +711,7 @@
};
frm.ShowDialog();
}
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index 8418035..b3ede71 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -205,10 +205,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(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -216,11 +216,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -229,9 +228,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -240,7 +238,6 @@
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);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -253,19 +250,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
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);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -275,7 +270,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 = 61;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_status,
this.gv_itemOutNo,
@@ -294,9 +289,8 @@
this.gridColumn1,
this.gridColumn6,
this.gridColumn7});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -307,229 +301,228 @@
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MinWidth = 31;
+ this.gv_status.MinWidth = 25;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 31;
+ this.gv_status.Width = 25;
//
// gv_itemOutNo
//
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
this.gv_itemOutNo.FieldName = "itemOutNo";
- this.gv_itemOutNo.MinWidth = 31;
+ this.gv_itemOutNo.MinWidth = 25;
this.gv_itemOutNo.Name = "gv_itemOutNo";
this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
this.gv_itemOutNo.Tag = "query_a.item_out_no";
this.gv_itemOutNo.Visible = true;
this.gv_itemOutNo.VisibleIndex = 1;
- this.gv_itemOutNo.Width = 187;
+ this.gv_itemOutNo.Width = 150;
//
// gv_workNo
//
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "鐢宠鍗曞彿";
this.gv_workNo.FieldName = "taskNo";
- this.gv_workNo.MinWidth = 31;
+ this.gv_workNo.MinWidth = 25;
this.gv_workNo.Name = "gv_workNo";
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
this.gv_workNo.VisibleIndex = 2;
- this.gv_workNo.Width = 125;
+ this.gv_workNo.Width = 100;
//
// gv_pbillNo
//
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
this.gv_pbillNo.Caption = "閿�鍞崟鍙�";
this.gv_pbillNo.FieldName = "workNo";
- this.gv_pbillNo.MinWidth = 31;
+ this.gv_pbillNo.MinWidth = 25;
this.gv_pbillNo.Name = "gv_pbillNo";
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
this.gv_pbillNo.VisibleIndex = 3;
- this.gv_pbillNo.Width = 117;
+ this.gv_pbillNo.Width = 94;
//
// gv_outDate
//
this.gv_outDate.AppearanceCell.Options.UseFont = true;
this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 31;
+ this.gv_outDate.MinWidth = 25;
this.gv_outDate.Name = "gv_outDate";
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
this.gv_outDate.VisibleIndex = 5;
- this.gv_outDate.Width = 150;
+ this.gv_outDate.Width = 120;
//
// gv_outType
//
this.gv_outType.AppearanceCell.Options.UseFont = true;
this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
this.gv_outType.FieldName = "outType";
- this.gv_outType.MinWidth = 31;
+ this.gv_outType.MinWidth = 25;
this.gv_outType.Name = "gv_outType";
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
this.gv_outType.VisibleIndex = 14;
- this.gv_outType.Width = 117;
+ this.gv_outType.Width = 94;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 31;
+ this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 117;
+ this.gv_checkUser.Width = 94;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 31;
+ this.gv_checkDate.MinWidth = 25;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 150;
+ this.gv_checkDate.Width = 120;
//
// gv_receiver
//
this.gv_receiver.AppearanceCell.Options.UseFont = true;
this.gv_receiver.Caption = "浠撳簱缂栧彿";
this.gv_receiver.FieldName = "ckNo";
- this.gv_receiver.MinWidth = 31;
+ this.gv_receiver.MinWidth = 25;
this.gv_receiver.Name = "gv_receiver";
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
this.gv_receiver.VisibleIndex = 8;
- this.gv_receiver.Width = 117;
+ this.gv_receiver.Width = 94;
//
// gv_outPart
//
this.gv_outPart.AppearanceCell.Options.UseFont = true;
this.gv_outPart.Caption = "浠撳簱鍚嶇О";
this.gv_outPart.FieldName = "ckName";
- this.gv_outPart.MinWidth = 31;
+ this.gv_outPart.MinWidth = 25;
this.gv_outPart.Name = "gv_outPart";
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
this.gv_outPart.VisibleIndex = 9;
- this.gv_outPart.Width = 117;
+ this.gv_outPart.Width = 94;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 31;
+ this.gv_createBy.FieldName = "cjPeople";
+ this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 10;
- this.gv_createBy.Width = 117;
+ this.gv_createBy.Width = 94;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 31;
+ this.gv_createDate.MinWidth = 25;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 11;
- this.gv_createDate.Width = 117;
+ this.gv_createDate.Width = 94;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
this.gv_remark.FieldName = "sqRemark";
- this.gv_remark.MinWidth = 31;
+ this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 12;
- this.gv_remark.Width = 117;
+ this.gv_remark.Width = 94;
//
// gv_reason
//
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "瀹㈡埛鍚嶇О";
this.gv_reason.FieldName = "cusName";
- this.gv_reason.MinWidth = 31;
+ this.gv_reason.MinWidth = 25;
this.gv_reason.Name = "gv_reason";
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.reason";
this.gv_reason.Visible = true;
this.gv_reason.VisibleIndex = 4;
- this.gv_reason.Width = 117;
+ this.gv_reason.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "瀹㈡埛缂栧彿";
this.gridColumn1.FieldName = "cusNo";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 13;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "閿�鍞粍缁�";
this.gridColumn6.FieldName = "xxzz";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 15;
- this.gridColumn6.Width = 117;
+ this.gridColumn6.Width = 94;
//
// gridColumn7
//
this.gridColumn7.Caption = "涓婚敭Guid";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -537,7 +530,6 @@
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);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -550,8 +542,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(1408, 698);
- this.splitMx1.SplitterPosition = 209;
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 171;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -577,179 +569,161 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(764, 426, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1408, 209);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 171);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1050, 188);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(840, 154);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(342, 39);
+ this.lbGuid.Size = new System.Drawing.Size(274, 32);
this.lbGuid.TabIndex = 591;
this.lbGuid.Text = "lbGuid";
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(790, 125);
- this.txt_ckName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_ckName.Location = new System.Drawing.Point(634, 103);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(259, 28);
+ this.txt_ckName.Size = new System.Drawing.Size(203, 24);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 587;
//
// txt_cusNo
//
- this.txt_cusNo.Location = new System.Drawing.Point(443, 87);
- this.txt_cusNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_cusNo.Location = new System.Drawing.Point(357, 72);
this.txt_cusNo.Name = "txt_cusNo";
this.txt_cusNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cusNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_cusNo.Size = new System.Drawing.Size(203, 24);
this.txt_cusNo.StyleController = this.layoutMx1;
this.txt_cusNo.TabIndex = 589;
//
// txt_xxNo
//
- this.txt_xxNo.Location = new System.Drawing.Point(96, 125);
- this.txt_xxNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_xxNo.Location = new System.Drawing.Point(80, 103);
this.txt_xxNo.Name = "txt_xxNo";
this.txt_xxNo.Properties.Appearance.Options.UseFont = true;
- this.txt_xxNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_xxNo.Size = new System.Drawing.Size(203, 24);
this.txt_xxNo.StyleController = this.layoutMx1;
this.txt_xxNo.TabIndex = 585;
//
// txt_ckNo
//
- this.txt_ckNo.Location = new System.Drawing.Point(790, 87);
- this.txt_ckNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_ckNo.Location = new System.Drawing.Point(634, 72);
this.txt_ckNo.Name = "txt_ckNo";
this.txt_ckNo.Properties.Appearance.Options.UseFont = true;
- this.txt_ckNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_ckNo.Size = new System.Drawing.Size(203, 24);
this.txt_ckNo.StyleController = this.layoutMx1;
this.txt_ckNo.TabIndex = 583;
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(96, 12);
- this.txt_itemOutNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(80, 10);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(203, 24);
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 213;
//
// txt_xxzz
//
- this.txt_xxzz.Location = new System.Drawing.Point(443, 12);
- this.txt_xxzz.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_xxzz.Location = new System.Drawing.Point(357, 10);
this.txt_xxzz.Name = "txt_xxzz";
this.txt_xxzz.Properties.Appearance.Options.UseFont = true;
- this.txt_xxzz.Size = new System.Drawing.Size(259, 28);
+ this.txt_xxzz.Size = new System.Drawing.Size(203, 24);
this.txt_xxzz.StyleController = this.layoutMx1;
this.txt_xxzz.TabIndex = 573;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(790, 12);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Location = new System.Drawing.Point(634, 10);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(203, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(443, 125);
- this.txt_abtNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_abtNo.Location = new System.Drawing.Point(357, 103);
this.txt_abtNo.Name = "txt_abtNo";
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_abtNo.Size = new System.Drawing.Size(203, 24);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 387;
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(96, 49);
- this.txt_outType.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_outType.Location = new System.Drawing.Point(80, 41);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Options.UseFont = true;
- this.txt_outType.Size = new System.Drawing.Size(259, 28);
+ this.txt_outType.Size = new System.Drawing.Size(203, 24);
this.txt_outType.StyleController = this.layoutMx1;
this.txt_outType.TabIndex = 577;
//
// txt_cusName
//
- this.txt_cusName.Location = new System.Drawing.Point(443, 49);
- this.txt_cusName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_cusName.Location = new System.Drawing.Point(357, 41);
this.txt_cusName.Name = "txt_cusName";
this.txt_cusName.Properties.Appearance.Options.UseFont = true;
- this.txt_cusName.Size = new System.Drawing.Size(259, 28);
+ this.txt_cusName.Size = new System.Drawing.Size(203, 24);
this.txt_cusName.StyleController = this.layoutMx1;
this.txt_cusName.TabIndex = 450;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1137, 49);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkDate.Location = new System.Drawing.Point(911, 41);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(205, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(790, 49);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createDate.Location = new System.Drawing.Point(634, 41);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(203, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1137, 12);
- this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkUser.Location = new System.Drawing.Point(911, 10);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(205, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
//
// txt_kcOrg
//
- this.txt_kcOrg.Location = new System.Drawing.Point(96, 87);
- this.txt_kcOrg.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_kcOrg.Location = new System.Drawing.Point(80, 72);
this.txt_kcOrg.Name = "txt_kcOrg";
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_kcOrg.Size = new System.Drawing.Size(259, 28);
+ this.txt_kcOrg.Size = new System.Drawing.Size(203, 24);
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 216;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(1053, 87);
- this.txt_status.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_status.Location = new System.Drawing.Point(841, 72);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_status.Size = new System.Drawing.Size(343, 27);
+ this.txt_status.Size = new System.Drawing.Size(275, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 590;
//
// txt_sqRemark
//
- this.txt_sqRemark.Location = new System.Drawing.Point(96, 163);
- this.txt_sqRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_sqRemark.Location = new System.Drawing.Point(80, 134);
this.txt_sqRemark.Name = "txt_sqRemark";
- this.txt_sqRemark.Size = new System.Drawing.Size(606, 28);
+ this.txt_sqRemark.Size = new System.Drawing.Size(480, 24);
this.txt_sqRemark.StyleController = this.layoutMx1;
this.txt_sqRemark.TabIndex = 592;
//
@@ -817,7 +791,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1408, 209);
+ this.Root.Size = new System.Drawing.Size(1126, 171);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -825,166 +799,166 @@
this.layoutControlItem1.Control = this.txt_itemOutNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem1.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_xxzz;
- this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(277, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem2.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem2.Text = "閿�鍞粍缁�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(554, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem3.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_outType;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 37);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem5.Text = "鍑哄簱绫诲埆";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_cusName;
- this.layoutControlItem6.Location = new System.Drawing.Point(347, 37);
+ this.layoutControlItem6.Location = new System.Drawing.Point(277, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem6.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem6.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(694, 37);
+ this.layoutControlItem7.Location = new System.Drawing.Point(554, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_kcOrg;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 75);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem9.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem9.Text = "鍑哄簱缁勭粐";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_cusNo;
- this.layoutControlItem10.Location = new System.Drawing.Point(347, 75);
+ this.layoutControlItem10.Location = new System.Drawing.Point(277, 62);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem10.Text = "瀹㈡埛缂栧彿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_xxNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 113);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem13.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem13.Text = "閿�鍞崟鍙�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_sqRemark;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 151);
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(694, 38);
+ this.layoutControlItem18.Size = new System.Drawing.Size(554, 31);
this.layoutControlItem18.Text = "澶囨敞鍘熷洜";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_ckName;
- this.layoutControlItem15.Location = new System.Drawing.Point(694, 113);
+ this.layoutControlItem15.Location = new System.Drawing.Point(554, 93);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_ckNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(694, 75);
+ this.layoutControlItem14.Location = new System.Drawing.Point(554, 62);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem14.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_abtNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(347, 113);
+ this.layoutControlItem4.Location = new System.Drawing.Point(277, 93);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem4.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_checkUser;
- this.layoutControlItem8.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(831, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(347, 37);
+ this.layoutControlItem8.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_checkDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(1041, 37);
+ this.layoutControlItem12.Location = new System.Drawing.Point(831, 31);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem12.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_status;
- this.layoutControlItem16.Location = new System.Drawing.Point(1041, 75);
+ this.layoutControlItem16.Location = new System.Drawing.Point(831, 62);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem16.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
@@ -993,10 +967,9 @@
//
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);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1408, 474);
+ this.tabMx.Size = new System.Drawing.Size(1126, 387);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1005,20 +978,17 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1406, 436);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1406, 436);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 355);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1038,7 +1008,6 @@
this.gvMx1remark,
this.gridColumn4,
this.gridColumn5});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1050,144 +1019,141 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 62;
+ this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 117;
+ this.gvMx1guid.Width = 94;
//
// gvMx1workNo
//
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "鐢宠鍗曞彿";
this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 62;
+ this.gvMx1workNo.MinWidth = 50;
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.work_no";
this.gvMx1workNo.Visible = true;
this.gvMx1workNo.VisibleIndex = 0;
- this.gvMx1workNo.Width = 117;
+ this.gvMx1workNo.Width = 94;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1itemNo.FieldName = "itemNo";
- this.gvMx1itemNo.MinWidth = 62;
+ this.gvMx1itemNo.MinWidth = 50;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.item_no";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 1;
- this.gvMx1itemNo.Width = 117;
+ this.gvMx1itemNo.Width = 94;
//
// gvMx1itemId
//
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID ";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 62;
+ this.gvMx1itemId.MinWidth = 50;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.item_id";
this.gvMx1itemId.Visible = true;
this.gvMx1itemId.VisibleIndex = 2;
- this.gvMx1itemId.Width = 117;
+ this.gvMx1itemId.Width = 94;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
this.gvMx1createBy.FieldName = "itemName";
- this.gvMx1createBy.MinWidth = 62;
+ this.gvMx1createBy.MinWidth = 50;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.create_by";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 3;
- this.gvMx1createBy.Width = 117;
+ this.gvMx1createBy.Width = 94;
//
// gvMx1createDate
//
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
this.gvMx1createDate.FieldName = "itemModel";
- this.gvMx1createDate.MinWidth = 62;
+ this.gvMx1createDate.MinWidth = 50;
this.gvMx1createDate.Name = "gvMx1createDate";
this.gvMx1createDate.Tag = "query_a.create_date";
this.gvMx1createDate.Visible = true;
this.gvMx1createDate.VisibleIndex = 4;
- this.gvMx1createDate.Width = 117;
+ this.gvMx1createDate.Width = 94;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantitySq";
- this.gvMx1quantity.MinWidth = 62;
+ this.gvMx1quantity.MinWidth = 50;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 5;
- this.gvMx1quantity.Width = 117;
+ this.gvMx1quantity.Width = 94;
//
// gvMx1tlQty
//
this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
this.gvMx1tlQty.FieldName = "tlQty";
- this.gvMx1tlQty.MinWidth = 62;
+ this.gvMx1tlQty.MinWidth = 50;
this.gvMx1tlQty.Name = "gvMx1tlQty";
this.gvMx1tlQty.Tag = "query_a.tl_qty";
this.gvMx1tlQty.Visible = true;
this.gvMx1tlQty.VisibleIndex = 6;
- this.gvMx1tlQty.Width = 117;
+ this.gvMx1tlQty.Width = 94;
//
// gvMx1remark
//
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
this.gvMx1remark.FieldName = "sqRemark";
- this.gvMx1remark.MinWidth = 62;
+ this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 7;
- this.gvMx1remark.Width = 117;
+ this.gvMx1remark.Width = 94;
//
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鑰�";
this.gridColumn4.FieldName = "createBy";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 8;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鏃堕棿";
this.gridColumn5.FieldName = "createDate";
- this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 9;
- this.gridColumn5.Width = 117;
+ this.gridColumn5.Width = 94;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1406, 436);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 358);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1406, 436);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 358);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1206,7 +1172,6 @@
this.gridColumn3,
this.gvMx2remark,
this.gridColumn8});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1218,122 +1183,120 @@
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 62;
+ this.gvMx2itemBarcode.MinWidth = 50;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 0;
- this.gvMx2itemBarcode.Width = 117;
+ this.gvMx2itemBarcode.Width = 94;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 62;
+ this.gvMx2itemNo.MinWidth = 50;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 1;
- this.gvMx2itemNo.Width = 117;
+ this.gvMx2itemNo.Width = 94;
//
// gvMx2lotNo
//
this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
this.gvMx2lotNo.FieldName = "itemName";
- this.gvMx2lotNo.MinWidth = 62;
+ this.gvMx2lotNo.MinWidth = 50;
this.gvMx2lotNo.Name = "gvMx2lotNo";
this.gvMx2lotNo.Tag = "query_a.LOT_NO";
this.gvMx2lotNo.Visible = true;
this.gvMx2lotNo.VisibleIndex = 2;
- this.gvMx2lotNo.Width = 117;
+ this.gvMx2lotNo.Width = 94;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 62;
+ this.gvMx2quantity.MinWidth = 50;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 117;
+ this.gvMx2quantity.Width = 94;
//
// gvMx2depotCode
//
this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
this.gvMx2depotCode.FieldName = "depotCode";
- this.gvMx2depotCode.MinWidth = 62;
+ this.gvMx2depotCode.MinWidth = 50;
this.gvMx2depotCode.Name = "gvMx2depotCode";
this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx2depotCode.Visible = true;
this.gvMx2depotCode.VisibleIndex = 4;
- this.gvMx2depotCode.Width = 117;
+ this.gvMx2depotCode.Width = 94;
//
// gvMx2depotSectionCode
//
this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotSectionCode.Caption = "搴撲綅缂栫爜";
this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx2depotSectionCode.MinWidth = 62;
+ this.gvMx2depotSectionCode.MinWidth = 50;
this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx2depotSectionCode.Visible = true;
this.gvMx2depotSectionCode.VisibleIndex = 5;
- this.gvMx2depotSectionCode.Width = 117;
+ this.gvMx2depotSectionCode.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 6;
- this.gridColumn2.Width = 117;
+ this.gridColumn2.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "寤虹珛鏃堕棿";
this.gridColumn3.FieldName = "createDate";
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 7;
- this.gridColumn3.Width = 117;
+ this.gridColumn3.Width = 94;
//
// gvMx2remark
//
this.gvMx2remark.AppearanceCell.Options.UseFont = true;
this.gvMx2remark.Caption = "澶囨敞 ";
this.gvMx2remark.FieldName = "remark";
- this.gvMx2remark.MinWidth = 62;
+ this.gvMx2remark.MinWidth = 50;
this.gvMx2remark.Name = "gvMx2remark";
this.gvMx2remark.Tag = "query_a.REMARK";
this.gvMx2remark.Visible = true;
this.gvMx2remark.VisibleIndex = 8;
- this.gvMx2remark.Width = 117;
+ this.gvMx2remark.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鍚庣洊鐮�";
this.gridColumn8.FieldName = "hgBarcode";
- this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.MinWidth = 24;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 9;
- this.gridColumn8.Width = 94;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1245, 67);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Location = new System.Drawing.Point(996, 55);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
@@ -1341,13 +1304,12 @@
//
// Frm_SalesDeliverDj
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_SalesDeliverDj";
this.Text = "閿�鍞嚭搴�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 7f14a1b..bb00cac 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -470,7 +470,7 @@
this.gv_billType.OptionsColumn.AllowEdit = false;
this.gv_billType.Tag = "query_a.BILL_TYPE";
this.gv_billType.Visible = true;
- this.gv_billType.VisibleIndex = 16;
+ this.gv_billType.VisibleIndex = 14;
this.gv_billType.Width = 94;
//
// gv_billNo
@@ -496,7 +496,7 @@
this.gv_salesOrg.OptionsColumn.AllowEdit = false;
this.gv_salesOrg.Tag = "query_a.SALES_ORG";
this.gv_salesOrg.Visible = true;
- this.gv_salesOrg.VisibleIndex = 15;
+ this.gv_salesOrg.VisibleIndex = 13;
this.gv_salesOrg.Width = 94;
//
// gv_salesDept
@@ -540,7 +540,7 @@
//
this.gv_createdBy.AppearanceCell.Options.UseFont = true;
this.gv_createdBy.Caption = "鍒涘缓浜� ";
- this.gv_createdBy.FieldName = "createdBy";
+ this.gv_createdBy.FieldName = "cjPeople";
this.gv_createdBy.MinWidth = 50;
this.gv_createdBy.Name = "gv_createdBy";
this.gv_createdBy.OptionsColumn.AllowEdit = false;
@@ -571,8 +571,6 @@
this.gv_modifiedBy.Name = "gv_modifiedBy";
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
- this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 9;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -584,21 +582,19 @@
this.gv_modifiedDate.Name = "gv_modifiedDate";
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
- this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 10;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
//
this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
this.gv_approvedBy.Caption = "瀹℃牳浜� ";
- this.gv_approvedBy.FieldName = "approvedBy";
+ this.gv_approvedBy.FieldName = "shPeople";
this.gv_approvedBy.MinWidth = 50;
this.gv_approvedBy.Name = "gv_approvedBy";
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 11;
+ this.gv_approvedBy.VisibleIndex = 9;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -611,7 +607,7 @@
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 12;
+ this.gv_approvedDate.VisibleIndex = 10;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -650,7 +646,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 13;
+ this.gridColumn25.VisibleIndex = 11;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -660,7 +656,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 14;
+ this.gridColumn26.VisibleIndex = 12;
this.gridColumn26.Width = 94;
//
// gridColumn2
@@ -670,7 +666,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.VisibleIndex = 15;
this.gridColumn2.Width = 94;
//
// pageBar1
@@ -758,7 +754,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 102);
+ this.btnSelect.Location = new System.Drawing.Point(12, 108);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(126, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -768,56 +764,56 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(433, 38);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44);
this.txt_returnCustomer.Name = "txt_returnCustomer";
- this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
+ this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);
this.txt_returnCustomer.TabIndex = 539;
//
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1131, 102);
+ this.txt_salesDept.Location = new System.Drawing.Point(1146, 108);
this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesDept.Size = new System.Drawing.Size(279, 24);
this.txt_salesDept.TabIndex = 538;
//
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 102);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
- this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
//
this.txt_salesOrg.IsReadly = false;
- this.txt_salesOrg.Location = new System.Drawing.Point(84, 38);
+ this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
+ this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);
this.txt_salesOrg.TabIndex = 535;
//
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 100);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106);
this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(273, 32);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
// txt_fstockid
//
this.txt_fstockid.IsReadly = false;
- this.txt_fstockid.Location = new System.Drawing.Point(84, 70);
+ this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
- this.txt_fstockid.Size = new System.Drawing.Size(273, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(278, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -840,10 +836,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1059, 70);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(345, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(351, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -851,23 +847,23 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(433, 6);
+ this.txt_billType.Location = new System.Drawing.Point(438, 12);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_billType.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(273, 24);
+ this.txt_billType.Size = new System.Drawing.Size(278, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1131, 38);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(273, 24);
+ this.txt_approvedDate.Size = new System.Drawing.Size(279, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -884,30 +880,30 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 6);
+ this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(273, 24);
+ this.txt_approvedBy.Size = new System.Drawing.Size(279, 24);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(782, 38);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(792, 44);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(273, 24);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(278, 24);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 6);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(273, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(278, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
@@ -924,20 +920,20 @@
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 6);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(792, 12);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(273, 24);
+ this.txt_modifiedBy.Size = new System.Drawing.Size(278, 24);
this.txt_modifiedBy.StyleController = this.layoutMx1;
this.txt_modifiedBy.TabIndex = 327;
this.txt_modifiedBy.Tag = "readonly";
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(782, 70);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
- this.txt_saleDeptName.Size = new System.Drawing.Size(273, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
@@ -954,10 +950,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(433, 70);
+ this.txt_returnReason.Location = new System.Drawing.Point(438, 76);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(273, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(278, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -974,7 +970,7 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 134);
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(438, 140);
this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -982,14 +978,14 @@
"閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
"閿�鍞鍗�(SAL_SaleOrder)"});
this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(278, 24);
this.txt_fHasLinkSource.StyleController = this.layoutMx1;
this.txt_fHasLinkSource.TabIndex = 544;
//
// txt_xsms
//
this.txt_xsms.EditValue = "-璇烽�夋嫨-";
- this.txt_xsms.Location = new System.Drawing.Point(782, 134);
+ this.txt_xsms.Location = new System.Drawing.Point(792, 140);
this.txt_xsms.Name = "txt_xsms";
this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1000,7 +996,7 @@
"3:OBM",
"4:渚涘簲鍟嗕拱鏂�"});
this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_xsms.Size = new System.Drawing.Size(273, 24);
+ this.txt_xsms.Size = new System.Drawing.Size(278, 24);
this.txt_xsms.StyleController = this.layoutMx1;
this.txt_xsms.TabIndex = 545;
//
@@ -1124,7 +1120,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1416, 180);
+ this.Root.Size = new System.Drawing.Size(1437, 180);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1132,39 +1128,39 @@
this.layoutControlItem4.Control = this.txt_billNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1047, 0);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1047, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(1047, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1175,7 +1171,7 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1185,7 +1181,7 @@
this.layItem1.Location = new System.Drawing.Point(0, 32);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem1.Size = new System.Drawing.Size(349, 32);
+ this.layItem1.Size = new System.Drawing.Size(354, 32);
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1194,44 +1190,44 @@
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem21.Control = this.txt_fHasLinkRad;
- this.layoutControlItem21.Location = new System.Drawing.Point(349, 96);
+ this.layoutControlItem21.Location = new System.Drawing.Point(354, 96);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem21.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(698, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(349, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layItem2
//
this.layItem2.Control = this.txt_returnCustomer;
- this.layItem2.Location = new System.Drawing.Point(349, 32);
+ this.layItem2.Location = new System.Drawing.Point(354, 32);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem2.Size = new System.Drawing.Size(349, 32);
+ this.layItem2.Size = new System.Drawing.Size(354, 32);
this.layItem2.Text = "閫�璐у鎴�";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1240,11 +1236,11 @@
this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem3.Control = this.txt_inventoryOrg;
- this.layItem3.Location = new System.Drawing.Point(698, 96);
+ this.layItem3.Location = new System.Drawing.Point(708, 96);
this.layItem3.Name = "layItem3";
this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem3.Size = new System.Drawing.Size(349, 32);
+ this.layItem3.Size = new System.Drawing.Size(354, 32);
this.layItem3.Text = "搴撳瓨缁勭粐";
this.layItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1253,11 +1249,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_salesDept;
- this.layItem4.Location = new System.Drawing.Point(1047, 96);
+ this.layItem4.Location = new System.Drawing.Point(1062, 96);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem4.Size = new System.Drawing.Size(349, 32);
+ this.layItem4.Size = new System.Drawing.Size(355, 32);
this.layItem4.Text = "閿�鍞儴闂�";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1267,32 +1263,32 @@
this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem100.Control = this.txt_fHasLinkSource;
this.layItem100.CustomizationFormText = "鏁版嵁鏉ユ簮";
- this.layItem100.Location = new System.Drawing.Point(349, 128);
+ this.layItem100.Location = new System.Drawing.Point(354, 128);
this.layItem100.Name = "layItem100";
this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem100.Size = new System.Drawing.Size(349, 32);
+ this.layItem100.Size = new System.Drawing.Size(354, 32);
this.layItem100.Text = "鏁版嵁鏉ユ簮";
this.layItem100.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(708, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem13.Text = "淇敼浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(708, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1300,11 +1296,11 @@
//
this.layoutControlItem9.Control = this.txt_returnReason;
this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(349, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(354, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem9.Text = "鐢宠鍘熷洜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1316,7 +1312,7 @@
this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -1327,11 +1323,11 @@
this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem101.Control = this.txt_xsms;
- this.layItem101.Location = new System.Drawing.Point(698, 128);
+ this.layItem101.Location = new System.Drawing.Point(708, 128);
this.layItem101.Name = "layItem101";
this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem101.Size = new System.Drawing.Size(349, 32);
+ this.layItem101.Size = new System.Drawing.Size(354, 32);
this.layItem101.Text = "閿�鍞ā寮�";
this.layItem101.TextSize = new System.Drawing.Size(60, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index 78807c6..e2193bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -83,6 +83,8 @@
this.txt_ckNo = new DevExpress.XtraEditors.TextEdit();
this.txt_xsNo = new DevExpress.XtraEditors.TextEdit();
this.txt_custName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fHasLinkTxt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fHasLinkSource = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -101,6 +103,8 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -128,10 +132,6 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_fHasLinkTxt = new DevExpress.XtraEditors.TextEdit();
- this.txt_fHasLinkSource = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -167,6 +167,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xsNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -185,6 +187,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -194,10 +198,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -374,7 +374,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -733,6 +733,22 @@
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 615;
//
+ // txt_fHasLinkTxt
+ //
+ this.txt_fHasLinkTxt.Location = new System.Drawing.Point(1077, 105);
+ this.txt_fHasLinkTxt.Name = "txt_fHasLinkTxt";
+ this.txt_fHasLinkTxt.Size = new System.Drawing.Size(257, 24);
+ this.txt_fHasLinkTxt.StyleController = this.layoutMx1;
+ this.txt_fHasLinkTxt.TabIndex = 616;
+ //
+ // txt_fHasLinkSource
+ //
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(1077, 136);
+ this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(257, 24);
+ this.txt_fHasLinkSource.StyleController = this.layoutMx1;
+ this.txt_fHasLinkSource.TabIndex = 617;
+ //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.lbGuid;
@@ -971,6 +987,28 @@
this.layoutControlItem18.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem18.Text = "鏇存柊鏃堕棿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_fHasLinkSource;
+ this.layoutControlItem13.Location = new System.Drawing.Point(993, 124);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem13.Text = "鏁版嵁鏉ユ簮";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fHasLinkTxt;
+ this.layoutControlItem10.Location = new System.Drawing.Point(993, 93);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(333, 31);
+ this.layoutControlItem10.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1273,44 +1311,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_fHasLinkTxt
- //
- this.txt_fHasLinkTxt.Location = new System.Drawing.Point(1077, 105);
- this.txt_fHasLinkTxt.Name = "txt_fHasLinkTxt";
- this.txt_fHasLinkTxt.Size = new System.Drawing.Size(257, 24);
- this.txt_fHasLinkTxt.StyleController = this.layoutMx1;
- this.txt_fHasLinkTxt.TabIndex = 616;
- //
- // txt_fHasLinkSource
- //
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(1077, 136);
- this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
- this.txt_fHasLinkSource.Size = new System.Drawing.Size(257, 24);
- this.txt_fHasLinkSource.StyleController = this.layoutMx1;
- this.txt_fHasLinkSource.TabIndex = 617;
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_fHasLinkSource;
- this.layoutControlItem13.Location = new System.Drawing.Point(993, 124);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(333, 32);
- this.layoutControlItem13.Text = "鏁版嵁鏉ユ簮";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fHasLinkTxt;
- this.layoutControlItem10.Location = new System.Drawing.Point(993, 93);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(333, 31);
- this.layoutControlItem10.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_SalesReturnNoticeDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1356,6 +1356,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xsNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1374,6 +1376,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1383,10 +1387,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 8654281..4c0b1bd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -714,7 +714,6 @@
}
}
}
-
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
index b420495..03bd4bc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
@@ -69,7 +69,6 @@
}
}
-
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gridView1.FocusedRowHandle;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 557c3d7..7fc75c9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -30,15 +30,18 @@
if (EditChanged != null) EditChanged(this, e);
}
- public void getSuppler(string orgId, string _dftVale = "")
+ public void getSuppler(string orgId, string _dftVale = "", string strWhere = "")
{
lookSearchSupplier.EditValue = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(orgId))
_sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
- _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
-
+ if (!string.IsNullOrEmpty(strWhere))
+ {
+ _sbSqlWhere.Append(" and " + strWhere);
+ }
var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3