From 2fb710372202d0ef4e64a308892169551d3b5110 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 09:52:10 +0800
Subject: [PATCH] 合并领料
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs | 250 +++++------
DevApp/Gs.DevApp/DevFrm/WW/SelectWwgd.Designer.cs | 14
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 406 ++++++++++--------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.cs | 12
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 437 +++++++++-----------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 82 ++-
8 files changed, 611 insertions(+), 600 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index c2f2011..8478d2f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -228,10 +228,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, 3, 4, 3);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1969, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1357, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
@@ -239,11 +239,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, 62);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1969, 734);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1357, 467);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -252,9 +251,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(1967, 696);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1355, 441);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -263,7 +261,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
@@ -276,21 +273,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1967, 696);
+ this.split1.Size = new System.Drawing.Size(1355, 441);
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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit1});
- this.gcMain1.Size = new System.Drawing.Size(1967, 633);
+ this.gcMain1.Size = new System.Drawing.Size(1355, 400);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -300,7 +295,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 40;
+ this.gridView1.ColumnPanelRowHeight = 25;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.bandedGridColumn1,
this.gv_fType,
@@ -319,9 +314,9 @@
this.gridColumn7,
this.gv_isCompleted,
this.gridColumn21});
- this.gridView1.DetailHeight = 428;
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 43;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
@@ -332,14 +327,14 @@
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 62;
+ this.bandedGridColumn1.MinWidth = 43;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
this.bandedGridColumn1.OptionsColumn.ReadOnly = true;
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 0;
- this.bandedGridColumn1.Width = 76;
+ this.bandedGridColumn1.Width = 53;
//
// gv_fType
//
@@ -348,185 +343,185 @@
this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gv_fType.Caption = "濮斿鏍囪瘑";
this.gv_fType.FieldName = "fType";
- this.gv_fType.MinWidth = 24;
+ this.gv_fType.MinWidth = 17;
this.gv_fType.Name = "gv_fType";
this.gv_fType.OptionsColumn.AllowEdit = false;
this.gv_fType.Tag = "query_a.f_type";
this.gv_fType.UnboundDataType = typeof(bool);
this.gv_fType.Visible = true;
this.gv_fType.VisibleIndex = 1;
- this.gv_fType.Width = 84;
+ this.gv_fType.Width = 59;
//
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gv_urgentFlag.FieldName = "urgentFlagTxt";
- this.gv_urgentFlag.MinWidth = 24;
+ this.gv_urgentFlag.MinWidth = 17;
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.UnboundDataType = typeof(bool);
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.VisibleIndex = 2;
- this.gv_urgentFlag.Width = 84;
+ this.gv_urgentFlag.Width = 59;
//
// gv_fstatus
//
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MinWidth = 24;
+ this.gv_fstatus.MinWidth = 17;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.UnboundDataType = typeof(bool);
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 3;
- this.gv_fstatus.Width = 84;
+ this.gv_fstatus.Width = 59;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 24;
+ this.gv_billNo.MinWidth = 17;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 4;
- this.gv_billNo.Width = 84;
+ this.gv_billNo.Width = 59;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 24;
+ this.gv_createBy.MinWidth = 17;
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 = 5;
- this.gv_createBy.Width = 111;
+ this.gv_createBy.Width = 78;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 24;
+ this.gv_createDate.MinWidth = 17;
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 = 6;
- this.gv_createDate.Width = 241;
+ this.gv_createDate.Width = 169;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉";
this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 24;
+ this.gv_checkUser.MinWidth = 17;
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 = 7;
- this.gv_checkUser.Width = 124;
+ this.gv_checkUser.Width = 87;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "鎻愪氦妫�楠屾棩鏈�";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 24;
+ this.gv_checkDate.MinWidth = 17;
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 = 8;
- this.gv_checkDate.Width = 80;
+ this.gv_checkDate.Width = 56;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 24;
+ this.gv_suppNo.MinWidth = 17;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 9;
- this.gv_suppNo.Width = 86;
+ this.gv_suppNo.Width = 60;
//
// gridColumn5
//
this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn5.FieldName = "suppName";
- this.gridColumn5.MinWidth = 24;
+ this.gridColumn5.MinWidth = 17;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 87;
+ this.gridColumn5.Width = 61;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 24;
+ this.gv_remark.MinWidth = 17;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 11;
- this.gv_remark.Width = 112;
+ this.gv_remark.Width = 78;
//
// gridColumn4
//
this.gridColumn4.Caption = "SRM鏍囪瘑";
this.gridColumn4.FieldName = "isSrmChk";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 22;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 12;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 82;
//
// gridColumn11
//
this.gridColumn11.Caption = "涓婚敭GUID";
this.gridColumn11.FieldName = "guid";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 82;
//
// gridColumn7
//
this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿";
this.gridColumn7.FieldName = "paperBillNo";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 13;
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 82;
//
// gv_isCompleted
//
this.gv_isCompleted.Caption = "鏄惁鍏ュ簱";
this.gv_isCompleted.ColumnEdit = this.repositoryItemCheckEdit1;
this.gv_isCompleted.FieldName = "isCompleted";
- this.gv_isCompleted.MinWidth = 31;
+ this.gv_isCompleted.MinWidth = 22;
this.gv_isCompleted.Name = "gv_isCompleted";
this.gv_isCompleted.OptionsColumn.AllowEdit = false;
this.gv_isCompleted.OptionsColumn.ReadOnly = true;
this.gv_isCompleted.Visible = true;
this.gv_isCompleted.VisibleIndex = 14;
- this.gv_isCompleted.Width = 100;
+ this.gv_isCompleted.Width = 70;
//
// repositoryItemCheckEdit1
//
@@ -539,32 +534,31 @@
//
this.gridColumn21.Caption = "閫�璐ф爣璇�";
this.gridColumn21.FieldName = "th";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.MinWidth = 22;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.AllowEdit = false;
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 15;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 633);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 400);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1967, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1355, 31);
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(1967, 696);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1355, 441);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -572,7 +566,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
@@ -585,8 +578,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(1967, 696);
- this.splitMx1.SplitterPosition = 182;
+ this.splitMx1.Size = new System.Drawing.Size(1355, 441);
+ this.splitMx1.SplitterPosition = 116;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -612,20 +605,18 @@
this.layoutControlItem18,
this.layoutControlItem9});
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(758, 132, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1967, 182);
+ this.layoutMx1.Size = new System.Drawing.Size(1355, 116);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1129, 132);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(790, 84);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(369, 34);
+ this.lbGuid.Size = new System.Drawing.Size(258, 22);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -633,53 +624,49 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 132);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSelect.Location = new System.Drawing.Point(8, 85);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(146, 34);
+ this.btnSelect.Size = new System.Drawing.Size(103, 22);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 443;
this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(600, 92);
- this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_remark.Location = new System.Drawing.Point(411, 59);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(381, 28);
+ this.txt_remark.Size = new System.Drawing.Size(265, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_receiveOrgId
//
this.txt_receiveOrgId.IsReadly = false;
- this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 52);
- this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(5);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(76, 33);
+ this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(380, 28);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(265, 20);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(600, 52);
- this.txtSupplierCode.Margin = new System.Windows.Forms.Padding(4);
+ this.txtSupplierCode.Location = new System.Drawing.Point(411, 33);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(381, 28);
+ this.txtSupplierCode.Size = new System.Drawing.Size(265, 20);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
- this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_billNo.Location = new System.Drawing.Point(76, 7);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(380, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(265, 20);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -687,104 +674,95 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(114, 92);
+ this.txt_suppId.Location = new System.Drawing.Point(76, 59);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(380, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(265, 20);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1472, 92);
- this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fstatus.Location = new System.Drawing.Point(1013, 59);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(483, 27);
+ this.txt_fstatus.Size = new System.Drawing.Size(334, 20);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 458;
this.txt_fstatus.Tag = "readOnly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(498, 12);
- this.txt_fType.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fType.Location = new System.Drawing.Point(343, 7);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(483, 27);
+ this.txt_fType.Size = new System.Drawing.Size(333, 20);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 459;
this.txt_fType.Tag = "readOnly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1087, 12);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Location = new System.Drawing.Point(746, 7);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(381, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(265, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1087, 52);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createDate.Location = new System.Drawing.Point(746, 33);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(381, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(265, 20);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1574, 12);
- this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkUser.Location = new System.Drawing.Point(1081, 7);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(381, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(266, 20);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1574, 52);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkDate.Location = new System.Drawing.Point(1081, 33);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(381, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(266, 20);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(514, 171);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_guid.Location = new System.Drawing.Point(360, 109);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(239, 28);
+ this.txt_guid.Size = new System.Drawing.Size(167, 20);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 466;
this.txt_guid.Tag = "readOnly";
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(1087, 92);
- this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(746, 59);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(381, 28);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(265, 20);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 467;
//
// txt_isSrm
//
- this.txt_isSrm.Location = new System.Drawing.Point(1472, 132);
- this.txt_isSrm.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_isSrm.Location = new System.Drawing.Point(1013, 85);
this.txt_isSrm.Name = "txt_isSrm";
this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
- this.txt_isSrm.Size = new System.Drawing.Size(483, 27);
+ this.txt_isSrm.Size = new System.Drawing.Size(334, 20);
this.txt_isSrm.StyleController = this.layoutMx1;
this.txt_isSrm.TabIndex = 468;
this.txt_isSrm.Tag = "readOnly";
@@ -810,7 +788,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem9.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem9.Text = "涓婚敭GUID";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(112, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(78, 14);
//
// Root
//
@@ -859,88 +837,88 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1967, 182);
+ this.Root.Size = new System.Drawing.Size(1355, 116);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_receiveOrgId;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 40);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem2.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_suppId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 80);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 52);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(486, 40);
+ this.layoutControlItem3.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(973, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(670, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem11.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem11.Text = "寤虹珛浜哄憳";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(973, 40);
+ this.layoutControlItem12.Location = new System.Drawing.Point(670, 26);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem12.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_checkUser;
- this.layoutControlItem13.Location = new System.Drawing.Point(1460, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(1005, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 26);
this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(1460, 40);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1005, 26);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem14.Size = new System.Drawing.Size(336, 26);
this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(1460, 80);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1005, 52);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 26);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -948,10 +926,10 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fType;
- this.layoutControlItem8.Location = new System.Drawing.Point(486, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem8.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -959,34 +937,34 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(486, 40);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 26);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem5.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(486, 80);
+ this.layoutControlItem17.Location = new System.Drawing.Point(335, 52);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem17.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 120);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(24, 38);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 78);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(105, 24);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(17, 24);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(486, 42);
+ this.layoutControlItem16.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -995,22 +973,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(973, 80);
+ this.layoutControlItem4.Location = new System.Drawing.Point(670, 52);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(487, 40);
+ this.layoutControlItem4.Size = new System.Drawing.Size(335, 26);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_isSrm;
- this.layoutControlItem6.Location = new System.Drawing.Point(1460, 120);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1005, 78);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(487, 42);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 26);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -1018,10 +996,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(1967, 499);
+ this.tabMx.Size = new System.Drawing.Size(1355, 315);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1029,24 +1006,21 @@
// 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(1965, 461);
+ this.tabMxPage1.Size = new System.Drawing.Size(1353, 289);
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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.rptHistory});
- this.gcMx1.Size = new System.Drawing.Size(1965, 461);
+ this.gcMx1.Size = new System.Drawing.Size(1353, 289);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1090,7 +1064,7 @@
this.gridColumn20,
this.gv_iqcsub,
this.gridColumn22});
- this.gvMx1.DetailHeight = 428;
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1102,55 +1076,55 @@
//
this.gvAbtGuid.Caption = "閲囪喘鏄庣粏GUID";
this.gvAbtGuid.FieldName = "aboutGuid";
- this.gvAbtGuid.MinWidth = 62;
+ this.gvAbtGuid.MinWidth = 43;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
- this.gvAbtGuid.Width = 117;
+ this.gvAbtGuid.Width = 82;
//
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 87;
+ this.gvMx1guid.MinWidth = 61;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 124;
+ this.gvMx1guid.Width = 87;
//
// gvMx1ebelnLine
//
this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnLine.Caption = "Erp琛孖d";
this.gvMx1ebelnLine.FieldName = "lineK3id";
- this.gvMx1ebelnLine.MinWidth = 112;
+ this.gvMx1ebelnLine.MinWidth = 78;
this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
- this.gvMx1ebelnLine.Width = 124;
+ this.gvMx1ebelnLine.Width = 87;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 124;
+ this.gridColumn1.MinWidth = 87;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 124;
+ this.gridColumn1.Width = 87;
//
// gvMx1returnFlag
//
this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1returnFlag.Caption = "閫�璐�";
this.gvMx1returnFlag.FieldName = "returnFlag";
- this.gvMx1returnFlag.MinWidth = 31;
+ this.gvMx1returnFlag.MinWidth = 22;
this.gvMx1returnFlag.Name = "gvMx1returnFlag";
this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.UnboundDataType = typeof(bool);
this.gvMx1returnFlag.Visible = true;
this.gvMx1returnFlag.VisibleIndex = 0;
- this.gvMx1returnFlag.Width = 79;
+ this.gvMx1returnFlag.Width = 55;
//
// gvMx1urgentFlag
//
@@ -1161,113 +1135,113 @@
this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡";
this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
- this.gvMx1urgentFlag.MinWidth = 31;
+ this.gvMx1urgentFlag.MinWidth = 22;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "";
this.gvMx1urgentFlag.UnboundDataType = typeof(string);
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 1;
- this.gvMx1urgentFlag.Width = 42;
+ this.gvMx1urgentFlag.Width = 29;
//
// gvMx1isdepsIn
//
this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
this.gvMx1isdepsIn.Caption = "瀹岀粨鏍囪瘑";
this.gvMx1isdepsIn.FieldName = "isdepsIn";
- this.gvMx1isdepsIn.MinWidth = 31;
+ this.gvMx1isdepsIn.MinWidth = 22;
this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
- this.gvMx1isdepsIn.Width = 62;
+ this.gvMx1isdepsIn.Width = 43;
//
// gvMx1checkStates
//
this.gvMx1checkStates.AppearanceCell.Options.UseFont = true;
this.gvMx1checkStates.Caption = "妫�楠岀姸鎬�";
this.gvMx1checkStates.FieldName = "checkStates";
- this.gvMx1checkStates.MinWidth = 31;
+ this.gvMx1checkStates.MinWidth = 22;
this.gvMx1checkStates.Name = "gvMx1checkStates";
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
this.gvMx1checkStates.VisibleIndex = 3;
- this.gvMx1checkStates.Width = 82;
+ this.gvMx1checkStates.Width = 57;
//
// gvMx1checkRes
//
this.gvMx1checkRes.AppearanceCell.Options.UseFont = true;
this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�";
this.gvMx1checkRes.FieldName = "checkRes";
- this.gvMx1checkRes.MinWidth = 31;
+ this.gvMx1checkRes.MinWidth = 22;
this.gvMx1checkRes.Name = "gvMx1checkRes";
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
this.gvMx1checkRes.VisibleIndex = 4;
- this.gvMx1checkRes.Width = 82;
+ this.gvMx1checkRes.Width = 57;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
- this.gvMx1ebeln.MinWidth = 150;
+ this.gvMx1ebeln.MinWidth = 105;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 5;
- this.gvMx1ebeln.Width = 161;
+ this.gvMx1ebeln.Width = 113;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栧彿";
this.gridColumn8.FieldName = "itemNo";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 6;
- this.gridColumn8.Width = 66;
+ this.gridColumn8.Width = 46;
//
// gvMx1boardStyle
//
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gvMx1boardStyle.FieldName = "itemName";
- this.gvMx1boardStyle.MinWidth = 31;
+ this.gvMx1boardStyle.MinWidth = 22;
this.gvMx1boardStyle.Name = "gvMx1boardStyle";
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 7;
- this.gvMx1boardStyle.Width = 91;
+ this.gvMx1boardStyle.Width = 64;
//
// gvMx1ebelnQty
//
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnQty.Caption = "閲囪喘鏁伴噺";
this.gvMx1ebelnQty.FieldName = "cgsl";
- this.gvMx1ebelnQty.MinWidth = 31;
+ this.gvMx1ebelnQty.MinWidth = 22;
this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 8;
- this.gvMx1ebelnQty.Width = 80;
+ this.gvMx1ebelnQty.Width = 56;
//
// gvMx1subQty
//
this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
this.gvMx1subQty.Caption = "绱鏈敹閲�";
this.gvMx1subQty.FieldName = "wssl";
- this.gvMx1subQty.MinWidth = 31;
+ this.gvMx1subQty.MinWidth = 22;
this.gvMx1subQty.Name = "gvMx1subQty";
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
this.gvMx1subQty.VisibleIndex = 9;
- this.gvMx1subQty.Width = 80;
+ this.gvMx1subQty.Width = 56;
//
// gvMx1quantity
//
@@ -1278,12 +1252,12 @@
this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1quantity.Caption = "鏈鏀堕噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 31;
+ this.gvMx1quantity.MinWidth = 22;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "yz_quantity_0_edit";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 10;
- this.gvMx1quantity.Width = 80;
+ this.gvMx1quantity.Width = 56;
//
// gvMx1memo
//
@@ -1294,104 +1268,104 @@
this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 62;
+ this.gvMx1memo.MinWidth = 43;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
this.gvMx1memo.VisibleIndex = 11;
- this.gvMx1memo.Width = 137;
+ this.gvMx1memo.Width = 96;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
this.gvMx1okRkqty.Caption = "绱瀹炴敹";
this.gvMx1okRkqty.FieldName = "yssl";
- this.gvMx1okRkqty.MinWidth = 31;
+ this.gvMx1okRkqty.MinWidth = 22;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 12;
- this.gvMx1okRkqty.Width = 80;
+ this.gvMx1okRkqty.Width = 56;
//
// gvMx1checkDate
//
this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
this.gvMx1checkDate.FieldName = "checkDate";
- this.gvMx1checkDate.MinWidth = 31;
+ this.gvMx1checkDate.MinWidth = 22;
this.gvMx1checkDate.Name = "gvMx1checkDate";
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
- this.gvMx1checkDate.Width = 224;
+ this.gvMx1checkDate.Width = 157;
//
// gridColumn3
//
this.gridColumn3.Caption = "閲囪喘鏃堕棿";
this.gridColumn3.FieldName = "purchaseDate";
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Width = 224;
+ this.gridColumn3.Width = 157;
//
// gridColumn9
//
this.gridColumn9.Caption = "閲囪喘鍗曚綅";
this.gridColumn9.FieldName = "cgUnit";
- this.gridColumn9.MinWidth = 31;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 15;
- this.gridColumn9.Width = 50;
+ this.gridColumn9.Width = 35;
//
// gridColumn6
//
this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 16;
- this.gridColumn6.Width = 149;
+ this.gridColumn6.Width = 104;
//
// gridColumn10
//
this.gridColumn10.Caption = "娆″簭";
this.gridColumn10.FieldName = "workLine";
- this.gridColumn10.MinWidth = 31;
+ this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 20;
- this.gridColumn10.Width = 54;
+ this.gridColumn10.Width = 38;
//
// gridColumn12
//
this.gridColumn12.Caption = "閫�鏂欐椂闂�";
this.gridColumn12.FieldName = "returnDate";
- this.gridColumn12.MinWidth = 31;
+ this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 31;
+ this.gridColumn12.Width = 22;
//
// gridColumn13
//
this.gridColumn13.Caption = "閫�鏂欎汉";
this.gridColumn13.FieldName = "returnBy";
- this.gridColumn13.MinWidth = 31;
+ this.gridColumn13.MinWidth = 22;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 31;
+ this.gridColumn13.Width = 22;
//
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "閫�鏂�";
this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gvBtnAlawys.MinWidth = 100;
+ this.gvBtnAlawys.MinWidth = 70;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
this.gvBtnAlawys.VisibleIndex = 22;
- this.gvBtnAlawys.Width = 100;
+ this.gvBtnAlawys.Width = 70;
//
// repositoryItemButtonEdit2
//
@@ -1408,11 +1382,11 @@
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 100;
+ this.gvMxDel.MinWidth = 70;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 23;
- this.gvMxDel.Width = 129;
+ this.gvMxDel.Width = 90;
//
// repositoryItemButtonEdit1
//
@@ -1429,49 +1403,49 @@
//
this.gridColumn14.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn14.FieldName = "freceQty";
- this.gridColumn14.MinWidth = 31;
+ this.gridColumn14.MinWidth = 22;
this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Width = 117;
+ this.gridColumn14.Width = 82;
//
// gridColumn15
//
this.gridColumn15.Caption = "澶勭悊鎰忚";
this.gridColumn15.FieldName = "clyj";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 17;
- this.gridColumn15.Width = 171;
+ this.gridColumn15.Width = 120;
//
// gridColumn16
//
this.gridColumn16.Caption = "鎸戦�夋暟閲�";
this.gridColumn16.FieldName = "txsl";
- this.gridColumn16.MinWidth = 31;
+ this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 18;
- this.gridColumn16.Width = 142;
+ this.gridColumn16.Width = 99;
//
// gridColumn2
//
this.gridColumn2.Caption = "閫夊埆绫诲埆";
this.gridColumn2.FieldName = "xblb";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 19;
- this.gridColumn2.Width = 142;
+ this.gridColumn2.Width = 99;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍒拌揣璁板綍";
this.gridColumn17.ColumnEdit = this.rptHistory;
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 22;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 21;
- this.gridColumn17.Width = 154;
+ this.gridColumn17.Width = 108;
//
// rptHistory
//
@@ -1488,57 +1462,55 @@
//
this.gridColumn18.Caption = "ErpId";
this.gridColumn18.FieldName = "ebelnK3id";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.MinWidth = 22;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 82;
//
// gridColumn19
//
this.gridColumn19.Caption = "绱楠岄��";
this.gridColumn19.FieldName = "ljyt";
- this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.MinWidth = 22;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 13;
- this.gridColumn19.Width = 117;
+ this.gridColumn19.Width = 82;
//
// gridColumn20
//
this.gridColumn20.Caption = "绱浠撻��";
this.gridColumn20.FieldName = "ljct";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 22;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 14;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 82;
//
// gv_iqcsub
//
this.gv_iqcsub.Caption = "妫�楠屾彁浜�";
this.gv_iqcsub.FieldName = "iqcsub";
- this.gv_iqcsub.MinWidth = 29;
this.gv_iqcsub.Name = "gv_iqcsub";
this.gv_iqcsub.Visible = true;
this.gv_iqcsub.VisibleIndex = 2;
- this.gv_iqcsub.Width = 94;
+ this.gv_iqcsub.Width = 66;
//
// gridColumn22
//
this.gridColumn22.Caption = "闇�姹傝窡韪彿";
this.gridColumn22.FieldName = "xqgz";
- this.gridColumn22.MinWidth = 30;
+ this.gridColumn22.MinWidth = 21;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 24;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 66;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1154, 67);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Location = new System.Drawing.Point(808, 43);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(126, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -1546,13 +1518,12 @@
//
// Frm_MesInvItemArn
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1969, 832);
+ this.ClientSize = new System.Drawing.Size(1357, 529);
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_MesInvItemArn";
this.Text = "閲囪喘鍒拌揣鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 02ce5dd..a3a5cf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -412,6 +412,7 @@
dataTable.Rows.Add("TB(鎵樻澘鐮�)");
dataTable.Rows.Add("JYSQ(妫�楠岀敵璇�)");
dataTable.Rows.Add("JYFA(妫�楠屾柟妗�)");
+ dataTable.Rows.Add("HBDH(鍚堝苟鍗曞彿)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index a45f682..da56e35 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -65,6 +65,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -124,7 +125,7 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -188,9 +189,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(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -198,10 +200,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -210,8 +213,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -220,6 +224,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -232,17 +237,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(985, 442);
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(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(985, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -252,7 +259,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 = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn13,
this.gv_daa001,
@@ -275,9 +282,12 @@
this.gridColumn10,
this.gridColumn11,
this.gridColumn12,
- this.gridColumn20});
+ this.gridColumn20,
+ this.gridColumn21});
+ this.gridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1164, 232, 264, 432);
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -287,249 +297,260 @@
//
this.gridColumn13.Caption = "涓婚敭Guid";
this.gridColumn13.FieldName = "guid";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 22;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 82;
//
// gv_daa001
//
this.gv_daa001.AppearanceCell.Options.UseFont = true;
this.gv_daa001.Caption = "濮斿宸ュ崟鍙� ";
this.gv_daa001.FieldName = "daa001";
- this.gv_daa001.MinWidth = 50;
+ this.gv_daa001.MinWidth = 44;
this.gv_daa001.Name = "gv_daa001";
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
this.gv_daa001.VisibleIndex = 0;
- this.gv_daa001.Width = 100;
+ this.gv_daa001.Width = 87;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "wlbm";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 44;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 4;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "wlmc";
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MinWidth = 44;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 150;
+ this.gridColumn2.Width = 131;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
this.gridColumn1.FieldName = "wlgg";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 44;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 6;
- this.gridColumn1.Width = 150;
+ this.gridColumn1.Width = 131;
//
// gv_daa008
//
this.gv_daa008.AppearanceCell.Options.UseFont = true;
this.gv_daa008.Caption = "宸ュ崟鏁伴噺 ";
this.gv_daa008.FieldName = "daa008";
- this.gv_daa008.MinWidth = 25;
+ this.gv_daa008.MinWidth = 22;
this.gv_daa008.Name = "gv_daa008";
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
this.gv_daa008.VisibleIndex = 7;
- this.gv_daa008.Width = 50;
+ this.gv_daa008.Width = 44;
//
// gv_unit
//
this.gv_unit.AppearanceCell.Options.UseFont = true;
this.gv_unit.Caption = "鍗曚綅";
this.gv_unit.FieldName = "dwName";
- this.gv_unit.MinWidth = 25;
+ this.gv_unit.MinWidth = 22;
this.gv_unit.Name = "gv_unit";
this.gv_unit.OptionsColumn.AllowEdit = false;
this.gv_unit.Tag = "query_a.unit";
this.gv_unit.Visible = true;
this.gv_unit.VisibleIndex = 8;
- this.gv_unit.Width = 50;
+ this.gv_unit.Width = 44;
//
// gv_daa014
//
this.gv_daa014.AppearanceCell.Options.UseFont = true;
this.gv_daa014.Caption = "鎶曟枡鍗曞彿 ";
this.gv_daa014.FieldName = "daa014";
- this.gv_daa014.MinWidth = 50;
+ this.gv_daa014.MinWidth = 44;
this.gv_daa014.Name = "gv_daa014";
this.gv_daa014.OptionsColumn.AllowEdit = false;
this.gv_daa014.Tag = "query_a.daa014";
this.gv_daa014.Visible = true;
this.gv_daa014.VisibleIndex = 3;
- this.gv_daa014.Width = 50;
+ this.gv_daa014.Width = 44;
//
// gv_daa011
//
this.gv_daa011.AppearanceCell.Options.UseFont = true;
this.gv_daa011.Caption = "鐢熶骇鏁� ";
this.gv_daa011.FieldName = "daa011";
- this.gv_daa011.MinWidth = 25;
+ this.gv_daa011.MinWidth = 22;
this.gv_daa011.Name = "gv_daa011";
this.gv_daa011.OptionsColumn.AllowEdit = false;
this.gv_daa011.Tag = "query_a.daa011";
- this.gv_daa011.Width = 50;
+ this.gv_daa011.Width = 44;
//
// gv_blState
//
this.gv_blState.AppearanceCell.Options.UseFont = true;
this.gv_blState.Caption = "澶囨枡鐘舵�� ";
this.gv_blState.FieldName = "blStateTxt";
- this.gv_blState.MinWidth = 50;
+ this.gv_blState.MinWidth = 44;
this.gv_blState.Name = "gv_blState";
this.gv_blState.OptionsColumn.AllowEdit = false;
this.gv_blState.Tag = "query_a.bl_state";
- this.gv_blState.Width = 50;
+ this.gv_blState.Width = 44;
//
// gv_blTime
//
this.gv_blTime.AppearanceCell.Options.UseFont = true;
this.gv_blTime.Caption = "澶囨枡鏃堕棿 ";
this.gv_blTime.FieldName = "blTime";
- this.gv_blTime.MinWidth = 50;
+ this.gv_blTime.MinWidth = 44;
this.gv_blTime.Name = "gv_blTime";
this.gv_blTime.OptionsColumn.AllowEdit = false;
this.gv_blTime.Tag = "query_a.bl_time";
- this.gv_blTime.Width = 180;
+ this.gv_blTime.Width = 157;
//
// gv_blUser
//
this.gv_blUser.AppearanceCell.Options.UseFont = true;
this.gv_blUser.Caption = "澶囨枡浜� ";
this.gv_blUser.FieldName = "blUser";
- this.gv_blUser.MinWidth = 50;
+ this.gv_blUser.MinWidth = 44;
this.gv_blUser.Name = "gv_blUser";
this.gv_blUser.OptionsColumn.AllowEdit = false;
this.gv_blUser.Tag = "query_a.bl_user";
- this.gv_blUser.Width = 94;
+ this.gv_blUser.Width = 82;
//
// gv_daa018
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵�� ";
this.gv_daa018.FieldName = "daa018";
- this.gv_daa018.MinWidth = 50;
+ this.gv_daa018.MinWidth = 44;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
this.gv_daa018.VisibleIndex = 1;
- this.gv_daa018.Width = 94;
+ this.gv_daa018.Width = 82;
//
// gv_wgTime
//
this.gv_wgTime.AppearanceCell.Options.UseFont = true;
this.gv_wgTime.Caption = "瀹屽伐鏃堕棿 ";
this.gv_wgTime.FieldName = "wgTime";
- this.gv_wgTime.MinWidth = 50;
+ this.gv_wgTime.MinWidth = 44;
this.gv_wgTime.Name = "gv_wgTime";
this.gv_wgTime.OptionsColumn.AllowEdit = false;
this.gv_wgTime.Tag = "query_a.wg_time";
- this.gv_wgTime.Width = 180;
+ this.gv_wgTime.Width = 157;
//
// gv_wgUser
//
this.gv_wgUser.AppearanceCell.Options.UseFont = true;
this.gv_wgUser.Caption = "瀹屽伐浜� ";
this.gv_wgUser.FieldName = "wgUser";
- this.gv_wgUser.MinWidth = 50;
+ this.gv_wgUser.MinWidth = 44;
this.gv_wgUser.Name = "gv_wgUser";
this.gv_wgUser.OptionsColumn.AllowEdit = false;
this.gv_wgUser.Tag = "query_a.wg_user";
- this.gv_wgUser.Width = 94;
+ this.gv_wgUser.Width = 82;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 44;
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 = 9;
- this.gv_remark.Width = 94;
+ this.gv_remark.Width = 82;
//
// gridColumn8
//
this.gridColumn8.Caption = "閲囪喘璁㈠崟";
this.gridColumn8.FieldName = "cgd";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 10;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 82;
//
// gridColumn9
//
this.gridColumn9.Caption = "閲囪喘璁㈠崟琛屽彿";
this.gridColumn9.FieldName = "cgdxh";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 82;
//
// gridColumn10
//
this.gridColumn10.Caption = "浠诲姟鍗曞彿";
this.gridColumn10.FieldName = "erpProductionOrderNo";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 82;
//
// gridColumn11
//
this.gridColumn11.Caption = "閫氱煡澶囨枡";
this.gridColumn11.FieldName = "tzbs";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 11;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 82;
//
// gridColumn12
//
this.gridColumn12.Caption = "澶囨枡鎯呭喌";
this.gridColumn12.FieldName = "daa022Remark";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 12;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 82;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鍏ュ簱璐т富";
+ this.gridColumn20.FieldName = "stockownerName";
+ this.gridColumn20.MinWidth = 22;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 13;
+ this.gridColumn20.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(985, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -537,6 +558,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -549,8 +571,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(1126, 570);
- this.splitMx1.SplitterPosition = 135;
+ this.splitMx1.Size = new System.Drawing.Size(985, 442);
+ this.splitMx1.SplitterPosition = 105;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -573,143 +595,157 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 135);
+ this.layoutMx1.Size = new System.Drawing.Size(985, 105);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(722, 84);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(234, 22);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(116, 98);
+ this.txt_remark.Location = new System.Drawing.Point(94, 82);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ReadOnly = true;
- this.txt_remark.Size = new System.Drawing.Size(444, 24);
+ this.txt_remark.Size = new System.Drawing.Size(387, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(116, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(94, 10);
+ this.txt_daa001.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Properties.ReadOnly = true;
- this.txt_daa001.Size = new System.Drawing.Size(168, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(150, 20);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(944, 69);
+ this.txt_wgTime.Location = new System.Drawing.Point(805, 58);
+ this.txt_wgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_wgTime.Name = "txt_wgTime";
this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
this.txt_wgTime.Properties.ReadOnly = true;
- this.txt_wgTime.Size = new System.Drawing.Size(170, 24);
+ this.txt_wgTime.Size = new System.Drawing.Size(152, 20);
this.txt_wgTime.StyleController = this.layoutMx1;
this.txt_wgTime.TabIndex = 258;
//
// txt_kgTime
//
- this.txt_kgTime.Location = new System.Drawing.Point(944, 40);
+ this.txt_kgTime.Location = new System.Drawing.Point(805, 34);
+ this.txt_kgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_kgTime.Name = "txt_kgTime";
this.txt_kgTime.Properties.Appearance.Options.UseFont = true;
this.txt_kgTime.Properties.ReadOnly = true;
- this.txt_kgTime.Size = new System.Drawing.Size(170, 24);
+ this.txt_kgTime.Size = new System.Drawing.Size(152, 20);
this.txt_kgTime.StyleController = this.layoutMx1;
this.txt_kgTime.TabIndex = 262;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(668, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(568, 10);
+ this.txt_daa014.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Properties.ReadOnly = true;
- this.txt_daa014.Size = new System.Drawing.Size(168, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(150, 20);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 226;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(944, 12);
+ this.txt_daa018.Location = new System.Drawing.Point(805, 10);
+ this.txt_daa018.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_daa018.Name = "txt_daa018";
this.txt_daa018.Properties.Appearance.Options.UseFont = true;
this.txt_daa018.Properties.ReadOnly = true;
- this.txt_daa018.Size = new System.Drawing.Size(170, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(152, 20);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 252;
//
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(668, 69);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(568, 58);
+ this.txt_blStateTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_blStateTxt.Name = "txt_blStateTxt";
this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
this.txt_blStateTxt.Properties.ReadOnly = true;
- this.txt_blStateTxt.Size = new System.Drawing.Size(168, 24);
+ this.txt_blStateTxt.Size = new System.Drawing.Size(150, 20);
this.txt_blStateTxt.StyleController = this.layoutMx1;
this.txt_blStateTxt.TabIndex = 240;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(116, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(94, 34);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(168, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(150, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(392, 40);
+ this.txt_daa008.Location = new System.Drawing.Point(331, 34);
+ this.txt_daa008.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Properties.ReadOnly = true;
- this.txt_daa008.Size = new System.Drawing.Size(168, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(150, 20);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 219;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(668, 40);
+ this.txt_dwName.Location = new System.Drawing.Point(568, 34);
+ this.txt_dwName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Properties.ReadOnly = true;
- this.txt_dwName.Size = new System.Drawing.Size(168, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(150, 20);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 222;
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(116, 69);
+ this.txt_cgd.Location = new System.Drawing.Point(94, 58);
+ this.txt_cgd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cgd.Name = "txt_cgd";
- this.txt_cgd.Size = new System.Drawing.Size(168, 24);
+ this.txt_cgd.Size = new System.Drawing.Size(150, 20);
this.txt_cgd.StyleController = this.layoutMx1;
this.txt_cgd.TabIndex = 313;
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(392, 69);
+ this.txt_cgdxh.Location = new System.Drawing.Point(331, 58);
+ this.txt_cgdxh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
+ this.txt_cgdxh.Size = new System.Drawing.Size(150, 20);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(392, 12);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(331, 10);
+ this.txt_erpProductionOrderNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(150, 20);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
//
@@ -771,7 +807,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 135);
+ this.Root.Size = new System.Drawing.Size(968, 112);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -780,145 +816,146 @@
this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem5.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa008;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem6.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_cgd;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 57);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem17.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa018;
- this.layoutControlItem3.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_kgTime;
this.layoutControlItem7.CustomizationFormText = "Mes寮�宸ユ椂闂�";
- this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(711, 24);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem7.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem7.Text = "Mes寮�宸ユ椂闂�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wgTime;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 57);
+ this.layoutControlItem11.Location = new System.Drawing.Point(711, 48);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem11.Text = "Mes瀹屽伐鏃堕棿 ";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_cgdxh;
- this.layoutControlItem18.Location = new System.Drawing.Point(276, 57);
+ this.layoutControlItem18.Location = new System.Drawing.Point(237, 48);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem18.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 86);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
+ this.layoutControlItem13.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem13.Text = "澶囨敞澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(474, 24);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem10.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem10.Text = "鍗曚綅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_blStateTxt;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 57);
+ this.layoutControlItem12.Location = new System.Drawing.Point(474, 48);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem12.Text = "閫氱煡澶囨枡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem19.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(73, 14);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(92, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(73, 14);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 423);
+ this.tabMx.Size = new System.Drawing.Size(985, 327);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -926,17 +963,20 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 391);
+ this.tabMxPage1.Size = new System.Drawing.Size(983, 301);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 391);
+ this.gcMx1.Size = new System.Drawing.Size(983, 301);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -946,7 +986,7 @@
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx1.Appearance.Row.Options.UseFont = true;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 39;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
this.gvMx1pid,
@@ -969,6 +1009,7 @@
this.gridColumn17,
this.gridColumn18,
this.gridColumn19});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -980,240 +1021,240 @@
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "鏄庣粏涓婚敭";
this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
+ this.gvMx1id.MinWidth = 44;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Width = 94;
+ this.gvMx1id.Width = 82;
//
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
this.gvMx1pid.Caption = "涓昏〃涓婚敭";
this.gvMx1pid.FieldName = "pid";
- this.gvMx1pid.MinWidth = 50;
+ this.gvMx1pid.MinWidth = 44;
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Width = 94;
+ this.gvMx1pid.Width = 82;
//
// gvMx1erpid
//
this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
this.gvMx1erpid.Caption = "erpId";
this.gvMx1erpid.FieldName = "erpid";
- this.gvMx1erpid.MinWidth = 50;
+ this.gvMx1erpid.MinWidth = 44;
this.gvMx1erpid.Name = "gvMx1erpid";
this.gvMx1erpid.Tag = "query_a.erpid";
- this.gvMx1erpid.Width = 94;
+ this.gvMx1erpid.Width = 82;
//
// gvMx1eid
//
this.gvMx1eid.AppearanceCell.Options.UseFont = true;
this.gvMx1eid.Caption = "eId";
this.gvMx1eid.FieldName = "eid";
- this.gvMx1eid.MinWidth = 50;
+ this.gvMx1eid.MinWidth = 44;
this.gvMx1eid.Name = "gvMx1eid";
this.gvMx1eid.Tag = "query_a.eid";
- this.gvMx1eid.Width = 94;
+ this.gvMx1eid.Width = 82;
//
// gridColumn6
//
this.gridColumn6.Caption = "鐗╂枡缂栧彿";
this.gridColumn6.FieldName = "itemNo";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 1;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 82;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 22;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 82;
//
// gvMx1dab006
//
this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
this.gvMx1dab006.Caption = "闇�棰嗙敤閲�";
this.gvMx1dab006.FieldName = "dab006";
- this.gvMx1dab006.MinWidth = 25;
+ this.gvMx1dab006.MinWidth = 22;
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
this.gvMx1dab006.VisibleIndex = 5;
- this.gvMx1dab006.Width = 50;
+ this.gvMx1dab006.Width = 44;
//
// gvMx1dab007
//
this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
this.gvMx1dab007.FieldName = "ylQty";
- this.gvMx1dab007.MinWidth = 25;
+ this.gvMx1dab007.MinWidth = 22;
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
this.gvMx1dab007.VisibleIndex = 6;
- this.gvMx1dab007.Width = 50;
+ this.gvMx1dab007.Width = 44;
//
// gvMx1dab021
//
this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
this.gvMx1dab021.Caption = "鍓╀綑鍙";
this.gvMx1dab021.FieldName = "klQty";
- this.gvMx1dab021.MinWidth = 25;
+ this.gvMx1dab021.MinWidth = 22;
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
this.gvMx1dab021.VisibleIndex = 7;
- this.gvMx1dab021.Width = 50;
+ this.gvMx1dab021.Width = 44;
//
// gvMx1dab009
//
this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
this.gvMx1dab009.Caption = "鍗曚綅 ";
this.gvMx1dab009.FieldName = "dwName";
- this.gvMx1dab009.MinWidth = 25;
+ this.gvMx1dab009.MinWidth = 22;
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
this.gvMx1dab009.VisibleIndex = 8;
- this.gvMx1dab009.Width = 50;
+ this.gvMx1dab009.Width = 44;
//
// gvMx1dab001
//
this.gvMx1dab001.AppearanceCell.Options.UseFont = true;
this.gvMx1dab001.Caption = "宸ュ崟鍙� ";
this.gvMx1dab001.FieldName = "dab001";
- this.gvMx1dab001.MinWidth = 50;
+ this.gvMx1dab001.MinWidth = 44;
this.gvMx1dab001.Name = "gvMx1dab001";
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 9;
- this.gvMx1dab001.Width = 94;
+ this.gvMx1dab001.Width = 82;
//
// gvMx1dab012
//
this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
this.gvMx1dab012.Caption = "缁勬垚鐢ㄩ噺 ";
this.gvMx1dab012.FieldName = "dab012";
- this.gvMx1dab012.MinWidth = 25;
+ this.gvMx1dab012.MinWidth = 22;
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
this.gvMx1dab012.VisibleIndex = 10;
- this.gvMx1dab012.Width = 50;
+ this.gvMx1dab012.Width = 44;
//
// gvMx1dab002
//
this.gvMx1dab002.AppearanceCell.Options.UseFont = true;
this.gvMx1dab002.Caption = "搴忓彿 ";
this.gvMx1dab002.FieldName = "dab002";
- this.gvMx1dab002.MinWidth = 25;
+ this.gvMx1dab002.MinWidth = 22;
this.gvMx1dab002.Name = "gvMx1dab002";
this.gvMx1dab002.Tag = "query_a.dab002";
this.gvMx1dab002.Visible = true;
this.gvMx1dab002.VisibleIndex = 0;
- this.gvMx1dab002.Width = 50;
+ this.gvMx1dab002.Width = 44;
//
// gridColumn7
//
this.gridColumn7.Caption = "琛ユ枡鏁伴噺";
this.gridColumn7.FieldName = "blQty";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 11;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 82;
//
// gridColumn14
//
this.gridColumn14.Caption = "瓒呴鏁伴噺";
this.gridColumn14.FieldName = "clQty";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 22;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 12;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 82;
//
// gridColumn15
//
this.gridColumn15.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
this.gridColumn15.FieldName = "llBl";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 13;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 82;
//
// gridColumn16
//
this.gridColumn16.Caption = "鑹搧閫�鏂�";
this.gridColumn16.FieldName = "lpTl";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 14;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 82;
//
// gridColumn17
//
this.gridColumn17.Caption = "浣滀笟涓嶈壇閫�鏂�";
this.gridColumn17.FieldName = "zyBl";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 22;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 15;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 82;
//
// gridColumn18
//
this.gridColumn18.Caption = "閫�鏂欐�绘暟";
this.gridColumn18.FieldName = "ztsl";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 22;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 82;
//
// gridColumn19
//
this.gridColumn19.Caption = "棰嗘枡杩涘害";
this.gridColumn19.FieldName = "barbl";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 22;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 4;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 82;
//
- // gridColumn20
+ // gridColumn21
//
- this.gridColumn20.Caption = "鍏ュ簱璐т富";
- this.gridColumn20.FieldName = "stockownerName";
- this.gridColumn20.MinWidth = 25;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 13;
- this.gridColumn20.Width = 94;
+ this.gridColumn21.Caption = "闇�姹傚崟鎹彿";
+ this.gridColumn21.FieldName = "xqdj";
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 14;
+ this.gridColumn21.Width = 66;
//
// Frm_WwGd
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(987, 530);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_WwGd";
this.Text = "濮斿宸ュ崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1359,5 +1400,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
index d624385..657d19b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
@@ -70,6 +70,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_Ck = new Gs.DevApp.UserControl.UcLookCk();
+ this.txt_Supplier = new Gs.DevApp.UserControl.UcLookSupplier();
this.lbGuid = new System.Windows.Forms.Label();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_erpId = new Gs.DevApp.UserControl.UcLookOrg();
@@ -81,16 +83,18 @@
this.txt_gds = new DevExpress.XtraEditors.TextEdit();
this.txt_hbsl = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -109,8 +113,7 @@
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
- this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.none = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -148,10 +151,7 @@
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_Supplier = new Gs.DevApp.UserControl.UcLookSupplier();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_Ck = new Gs.DevApp.UserControl.UcLookCk();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -181,16 +181,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -200,7 +202,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.none)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -208,8 +210,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -557,7 +557,8 @@
this.layoutMx1.Controls.Add(this.txt_hbsl);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9});
+ this.layoutControlItem9,
+ this.layoutControlItem11});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
@@ -566,6 +567,24 @@
this.layoutMx1.Size = new System.Drawing.Size(985, 176);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_Ck
+ //
+ this.txt_Ck.IsReadly = false;
+ this.txt_Ck.Location = new System.Drawing.Point(317, 64);
+ this.txt_Ck.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_Ck.Name = "txt_Ck";
+ this.txt_Ck.Size = new System.Drawing.Size(173, 20);
+ this.txt_Ck.TabIndex = 466;
+ //
+ // txt_Supplier
+ //
+ this.txt_Supplier.IsReadly = false;
+ this.txt_Supplier.Location = new System.Drawing.Point(76, 64);
+ this.txt_Supplier.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_Supplier.Name = "txt_Supplier";
+ this.txt_Supplier.Size = new System.Drawing.Size(173, 20);
+ this.txt_Supplier.TabIndex = 465;
//
// lbGuid
//
@@ -621,18 +640,18 @@
//
// txt_cjr
//
- this.txt_cjr.Location = new System.Drawing.Point(799, 64);
+ this.txt_cjr.Location = new System.Drawing.Point(558, 64);
this.txt_cjr.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cjr.Name = "txt_cjr";
this.txt_cjr.Properties.Appearance.Options.UseFont = true;
- this.txt_cjr.Size = new System.Drawing.Size(174, 20);
+ this.txt_cjr.Size = new System.Drawing.Size(173, 20);
this.txt_cjr.StyleController = this.layoutMx1;
this.txt_cjr.TabIndex = 273;
this.txt_cjr.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(558, 64);
+ this.txt_createDate.Location = new System.Drawing.Point(317, 64);
this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -643,7 +662,7 @@
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(735, 116);
+ this.txt_fstatus.Location = new System.Drawing.Point(735, 64);
this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
@@ -680,6 +699,17 @@
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_Ck;
+ this.layoutControlItem11.Location = new System.Drawing.Point(241, 52);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(241, 52);
+ this.layoutControlItem11.Text = "浠撳簱";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -689,13 +719,12 @@
this.layoutControlItem7,
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem5,
this.layoutControlItem10,
- this.layoutControlItem6,
this.layoutControlItem12,
this.layoutControlItem4,
- this.layoutControlItem11});
+ this.layoutControlItem3,
+ this.layoutControlItem5,
+ this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -770,28 +799,6 @@
this.layoutControlItem2.Text = "鍚堝苟鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(52, 14);
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(482, 52);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(241, 52);
- this.layoutControlItem3.Text = "鍒涘缓鏃ユ湡 ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_cjr;
- this.layoutControlItem5.Location = new System.Drawing.Point(723, 52);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(242, 52);
- this.layoutControlItem5.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);
- //
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_gds;
@@ -802,18 +809,6 @@
this.layoutControlItem10.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem10.TextSize = new System.Drawing.Size(52, 14);
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fstatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(723, 104);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(242, 52);
- this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_hbsl;
@@ -823,6 +818,50 @@
this.layoutControlItem12.Size = new System.Drawing.Size(242, 52);
this.layoutControlItem12.Text = "鍚堝苟鏁伴噺";
this.layoutControlItem12.TextSize = new System.Drawing.Size(52, 14);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_Supplier;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 52);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(241, 52);
+ this.layoutControlItem4.Text = "渚涘簲鍟�";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_createDate;
+ this.layoutControlItem3.Location = new System.Drawing.Point(241, 52);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(241, 52);
+ this.layoutControlItem3.Text = "鍒涘缓鏃ユ湡 ";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_cjr;
+ this.layoutControlItem5.Location = new System.Drawing.Point(482, 52);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(241, 52);
+ this.layoutControlItem5.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fstatus;
+ this.layoutControlItem6.Location = new System.Drawing.Point(723, 52);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(242, 52);
+ this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
//
// tabMx
//
@@ -857,7 +896,7 @@
this.repositoryItemDateEdit1,
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
- this.rptJYBZ,
+ this.none,
this.repositoryItemDateEdit3});
this.gcMx1.Size = new System.Drawing.Size(983, 230);
this.gcMx1.TabIndex = 0;
@@ -882,7 +921,7 @@
this.gvMx1daa006,
this.gvMx1daa016,
this.gvMx1daa018,
- this.gvMx1daa012,
+ this.gridColumn16,
this.gvMx1daa002,
this.gvMx1daa007,
this.gvMx1daa009,
@@ -1088,33 +1127,15 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
//
- // gvMx1daa012
+ // none
//
- this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Black;
- this.gvMx1daa012.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
- this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1daa012.Caption = "渚涘簲鍟�";
- this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
- this.gvMx1daa012.FieldName = "gys";
- this.gvMx1daa012.MinWidth = 131;
- this.gvMx1daa012.Name = "gvMx1daa012";
- this.gvMx1daa012.OptionsColumn.ReadOnly = true;
- this.gvMx1daa012.Tag = "";
- this.gvMx1daa012.Visible = true;
- this.gvMx1daa012.VisibleIndex = 12;
- this.gvMx1daa012.Width = 134;
- //
- // rptJYBZ
- //
- this.rptJYBZ.AutoHeight = false;
- this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.none.AutoHeight = false;
+ this.none.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.rptJYBZ.Name = "rptJYBZ";
- this.rptJYBZ.NullText = "-璇烽�夋嫨-";
- this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
+ this.none.Name = "none";
+ this.none.NullText = "-璇烽�夋嫨-";
+ this.none.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.none.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
//
// gvMx1daa002
//
@@ -1551,44 +1572,13 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_Supplier
+ // gridColumn16
//
- this.txt_Supplier.IsReadly = false;
- this.txt_Supplier.Location = new System.Drawing.Point(76, 64);
- this.txt_Supplier.Margin = new System.Windows.Forms.Padding(0);
- this.txt_Supplier.Name = "txt_Supplier";
- this.txt_Supplier.Size = new System.Drawing.Size(173, 20);
- this.txt_Supplier.TabIndex = 465;
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_Supplier;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 52);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(241, 52);
- this.layoutControlItem4.Text = "渚涘簲鍟�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);
- //
- // txt_Ck
- //
- this.txt_Ck.IsReadly = false;
- this.txt_Ck.Location = new System.Drawing.Point(317, 64);
- this.txt_Ck.Margin = new System.Windows.Forms.Padding(0);
- this.txt_Ck.Name = "txt_Ck";
- this.txt_Ck.Size = new System.Drawing.Size(173, 20);
- this.txt_Ck.TabIndex = 466;
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_Ck;
- this.layoutControlItem11.Location = new System.Drawing.Point(241, 52);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(241, 52);
- this.layoutControlItem11.Text = "浠撳簱";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);
+ this.gridColumn16.Caption = "渚涘簲鍟�";
+ this.gridColumn16.FieldName = "gys";
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 12;
//
// Frm_Wwgdhb
//
@@ -1630,16 +1620,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1649,7 +1641,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.none)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
@@ -1657,8 +1649,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
@@ -1714,8 +1704,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa007;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa009;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox none;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa019;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
@@ -1744,11 +1733,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_hbsl;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
@@ -1772,5 +1758,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private UserControl.UcLookCk txt_Ck;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.cs
index f20dca3..7b0543e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.cs
@@ -16,7 +16,7 @@
{
public partial class Frm_Wwgdhb : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "WomdaahbManager/";
+ string _webServiceName = "WwgdhbManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
string _gysBm = "";//杞﹂棿
string _ckBm = "";//杞﹂棿
@@ -61,7 +61,7 @@
txt_Supplier.EditChanged += (s, e) =>
{
string workGuid = this.txt_Supplier.GetId();
- txt_Supplier.getSuppler(workGuid, "");
+ //txtSupplierCode.Text = this.txt_suppId.GetCode();
};
// 閫夋嫨杞﹂棿锛堝彉鏄庣粏涓骇绾匡級
txt_Ck.EditChanged += (s, e) =>
@@ -351,7 +351,7 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- string _LineId = row["daa015"].ToString();
+ string _LineId = row["gys"].ToString();
string _Yjkgsj = row["mesStartProd"].ToString();
_obj.list.Add(new
{
@@ -364,7 +364,7 @@
Cpmc = row["daa003"].ToString(),
Cpgg = row["daa004"].ToString(),
Gdsl = row["daa008"].ToString(),//宸ュ崟鏁伴噺
- LineId = row["daa015"].ToString(),//浜х嚎id
+ LineId = row["gys"].ToString(),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
Bz = row["daa009"].ToString(),//澶囨敞
Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
@@ -559,7 +559,7 @@
/// <param name="workGuid"></param>
private void _getListJybz(string workGuid)
{
- rptJYBZ.Items.Clear();
+ none.Items.Clear();
if (string.IsNullOrEmpty(workGuid))
return;
var _sbSqlWhere = " and 1=1 and dpt_id=" + workGuid;
@@ -572,7 +572,7 @@
DataTable dt = dd.rtnData.list;
foreach (DataRow dr in dt.Rows)
{
- rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
+ none.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwgd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwgd.Designer.cs
index 191c701..25aa8a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwgd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwgd.Designer.cs
@@ -135,7 +135,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.VisibleIndex = 11;
this.gridColumn3.Width = 109;
//
// gridColumn10
@@ -263,8 +263,6 @@
this.gv_scxb.OptionsColumn.AllowEdit = false;
this.gv_scxb.OptionsColumn.ReadOnly = true;
this.gv_scxb.Tag = "query_wl.name";
- this.gv_scxb.Visible = true;
- this.gv_scxb.VisibleIndex = 11;
this.gv_scxb.Width = 44;
//
// gridColumn4
@@ -285,14 +283,12 @@
this.gridColumn9.MinWidth = 44;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 14;
this.gridColumn9.Width = 87;
//
// gv_purchaseUnit
//
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseUnit.Caption = "杞﹂棿";
+ this.gv_purchaseUnit.Caption = "渚涘簲鍟�";
this.gv_purchaseUnit.FieldName = "dptName";
this.gv_purchaseUnit.MinWidth = 44;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
@@ -300,7 +296,7 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 13;
+ this.gv_purchaseUnit.VisibleIndex = 12;
this.gv_purchaseUnit.Width = 87;
//
// gv_inventoryUnit
@@ -355,7 +351,7 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // SelectWomdaa
+ // SelectWwgd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -366,7 +362,7 @@
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectWomdaa";
+ this.Name = "SelectWwgd";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨鐢熶骇宸ュ崟锛屽彧鏄剧ず鏈悎骞�+璇ヨ溅闂寸殑宸ュ崟";
this.TopMost = true;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index eb01bc6..1ee7ba2 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1376,6 +1376,12 @@
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcCheckFlow.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -2318,6 +2324,9 @@
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcCheckFlow.resx">
<DependentUpon>UcCheckFlow.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 1daefa8..b9f493e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1725,25 +1725,26 @@
/// <param name="action2">濮旀墭2</param>
public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true, DelegateGetModel action2 = null)
{
- gridView1.PopupMenuShowing += (s, e) =>
- {
- if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
- {
- GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
- if (menu != null)
- {
- string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
- for (int i = menu.Items.Count - 1; i >= 0; i--)
- {
- string _caption = menu.Items[i].Caption;
- if (!ary.Contains(_caption))
- {
- menu.Items.Remove(menu.Items[i]);
- }
- }
- }
- }
- };
+ //2025-11-06 cnf 寮曞叆涓枃鎻掍欢娉�
+ /* gridView1.PopupMenuShowing += (s, e) =>
+ {
+ if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
+ {
+ GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
+ if (menu != null)
+ {
+ string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
+ for (int i = menu.Items.Count - 1; i >= 0; i--)
+ {
+ string _caption = menu.Items[i].Caption;
+ if (!ary.Contains(_caption))
+ {
+ menu.Items.Remove(menu.Items[i]);
+ }
+ }
+ }
+ }
+ };*/
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
if (isPostSearch == true)
{
@@ -2008,27 +2009,28 @@
/// <param name="icoName"></param>
public static void SetGridViewParameterMx(GridView gridView1, DevExpress.Utils.ToolTipController tips = null)
{
- gridView1.PopupMenuShowing += (s, e) =>
- {
- if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
- {
- GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
- if (menu != null)
- {
- string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
- for (int i = menu.Items.Count - 1; i >= 0; i--)
- {
- string _caption = menu.Items[i].Caption;
- if (!ary.Contains(_caption))
- {
- menu.Items.Remove(menu.Items[i]);
- }
- }
- }
- }
- };
- gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.OptionsCustomization.AllowGroup = false;
+ //2025-11-06 cnf 娉�
+ /* gridView1.PopupMenuShowing += (s, e) =>
+ {
+ if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
+ {
+ GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
+ if (menu != null)
+ {
+ string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
+ for (int i = menu.Items.Count - 1; i >= 0; i--)
+ {
+ string _caption = menu.Items[i].Caption;
+ if (!ary.Contains(_caption))
+ {
+ menu.Items.Remove(menu.Items[i]);
+ }
+ }
+ }
+ }
+ };
+ gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.OptionsCustomization.AllowGroup = false;*/
// gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
foreach (GridColumn column in gridView1.Columns)
--
Gitblit v1.9.3