From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 15 九月 2025 08:29:16 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx | 3
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 51 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 52 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 289 ++++++-----
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 23
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs | 476 +++++++++++++-----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 291 +++++-----
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs | 59 +-
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs | 62 +
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 179 +++++-
12 files changed, 936 insertions(+), 555 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 6b9697e..18c73c6 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,8 +36,8 @@
</runtime>
<appSettings>
- <add key="webapiurl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <!--<add key="webapiurl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 7fea474..1d6bf89 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -485,7 +485,7 @@
// gridColumn13
//
this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
- this.gridColumn13.FieldName = "urgentLagTxt";
+ this.gridColumn13.FieldName = "urgentFlagTxt";
this.gridColumn13.MinWidth = 30;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 6ca57b0..d7709cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,29 +30,29 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -161,9 +161,9 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
+ this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -235,7 +235,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
this.toolBarMenu1.Size = new System.Drawing.Size(1552, 80);
@@ -406,7 +406,7 @@
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.VisibleIndex = 10;
this.gv_createBy.Width = 89;
//
// gv_createDate
@@ -418,7 +418,7 @@
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.VisibleIndex = 11;
this.gv_createDate.Width = 193;
//
// gv_checkUser
@@ -430,7 +430,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 7;
+ this.gv_checkUser.VisibleIndex = 8;
this.gv_checkUser.Width = 100;
//
// gv_checkDate
@@ -442,7 +442,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 8;
+ this.gv_checkDate.VisibleIndex = 9;
this.gv_checkDate.Width = 64;
//
// gv_suppNo
@@ -454,7 +454,7 @@
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.VisibleIndex = 6;
this.gv_suppNo.Width = 69;
//
// gridColumn5
@@ -464,7 +464,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 70;
//
// gv_remark
@@ -476,7 +476,7 @@
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.VisibleIndex = 12;
this.gv_remark.Width = 90;
//
// gridColumn4
@@ -486,7 +486,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.VisibleIndex = 13;
this.gridColumn4.Width = 94;
//
// gridColumn11
@@ -504,57 +504,49 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.VisibleIndex = 14;
this.gridColumn7.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "鍏ュ簱鐘舵��";
- this.gridColumn22.FieldName = "mxStatue";
+ this.gridColumn22.FieldName = "mxStatueColor";
this.gridColumn22.MinWidth = 24;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.VisibleIndex = 5;
this.gridColumn22.Width = 90;
//
// gridColumn23
//
this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
- this.gridColumn23.FieldName = "鍒拌揣鏁伴噺";
+ this.gridColumn23.FieldName = "鍒拌揣鎬婚噺";
this.gridColumn23.MinWidth = 24;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 15;
this.gridColumn23.Width = 90;
//
// gridColumn24
//
this.gridColumn24.Caption = "妫�楠屾暟閲�";
- this.gridColumn24.FieldName = "妫�楠屾暟閲�";
+ this.gridColumn24.FieldName = "妫�楠屾�婚噺";
this.gridColumn24.MinWidth = 24;
this.gridColumn24.Name = "gridColumn24";
- this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 16;
this.gridColumn24.Width = 90;
//
// gridColumn25
//
this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
- this.gridColumn25.FieldName = "鍏ュ簱鏁伴噺";
+ this.gridColumn25.FieldName = "鍏ュ簱鎬婚噺";
this.gridColumn25.MinWidth = 24;
this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 17;
this.gridColumn25.Width = 90;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
- this.gridColumn26.FieldName = "鎵撳嵃鏁伴噺";
+ this.gridColumn26.FieldName = "鎵撳嵃鎬婚噺";
this.gridColumn26.MinWidth = 24;
this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 18;
this.gridColumn26.Width = 90;
//
// pageBar1
@@ -640,7 +632,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(10, 109);
+ this.btnSelect.Location = new System.Drawing.Point(12, 108);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -649,40 +641,40 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(478, 76);
+ this.txt_remark.Location = new System.Drawing.Point(481, 76);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(294, 24);
+ this.txt_remark.Size = new System.Drawing.Size(291, 24);
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(95, 43);
- this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44);
+ this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(294, 24);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(291, 24);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(478, 43);
+ this.txtSupplierCode.Location = new System.Drawing.Point(481, 44);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(294, 24);
+ this.txtSupplierCode.Size = new System.Drawing.Size(291, 24);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(95, 10);
+ this.txt_billNo.Location = new System.Drawing.Point(99, 12);
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(294, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(291, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -690,68 +682,68 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(95, 76);
+ this.txt_suppId.Location = new System.Drawing.Point(99, 76);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(294, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(291, 24);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1159, 76);
+ this.txt_fstatus.Location = new System.Drawing.Point(1158, 76);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(381, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(380, 24);
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(393, 10);
+ this.txt_fType.Location = new System.Drawing.Point(394, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(379, 24);
+ this.txt_fType.Size = new System.Drawing.Size(378, 24);
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(861, 10);
+ this.txt_createBy.Location = new System.Drawing.Point(863, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(294, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(291, 24);
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(861, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(863, 44);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(294, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(291, 24);
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(1244, 10);
+ this.txt_checkUser.Location = new System.Drawing.Point(1245, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(296, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(293, 24);
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(1244, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(1245, 44);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(296, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(293, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
@@ -767,30 +759,31 @@
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(861, 76);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(863, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(294, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(291, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 467;
//
// txt_isSrm
//
- this.txt_isSrm.Location = new System.Drawing.Point(1159, 109);
+ this.txt_isSrm.Location = new System.Drawing.Point(1158, 108);
this.txt_isSrm.Name = "txt_isSrm";
this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
- this.txt_isSrm.Size = new System.Drawing.Size(381, 24);
+ this.txt_isSrm.Size = new System.Drawing.Size(380, 24);
this.txt_isSrm.StyleController = this.layoutMx1;
this.txt_isSrm.TabIndex = 468;
this.txt_isSrm.Tag = "readOnly";
//
// txt_mxStatue
//
- this.txt_mxStatue.Location = new System.Drawing.Point(478, 109);
+ this.txt_mxStatue.Location = new System.Drawing.Point(481, 108);
this.txt_mxStatue.Name = "txt_mxStatue";
this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;
- this.txt_mxStatue.Size = new System.Drawing.Size(294, 24);
+ this.txt_mxStatue.Size = new System.Drawing.Size(291, 24);
this.txt_mxStatue.StyleController = this.layoutMx1;
this.txt_mxStatue.TabIndex = 240;
+ this.txt_mxStatue.Tag = "readOnly";
//
// layoutControlItem18
//
@@ -837,105 +830,105 @@
this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1550, 149);
this.Root.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_receiveOrgId;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_suppId;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(766, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(764, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem11.Text = "寤虹珛浜哄憳";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(766, 33);
+ this.layoutControlItem12.Location = new System.Drawing.Point(764, 32);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_checkUser;
- this.layoutControlItem13.Location = new System.Drawing.Point(1149, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(1146, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(385, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(384, 32);
this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(1149, 33);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1146, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(385, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(384, 32);
this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(1149, 66);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1146, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(385, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(384, 32);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -943,10 +936,10 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fType;
- this.layoutControlItem8.Location = new System.Drawing.Point(383, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(382, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -954,34 +947,34 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(383, 33);
+ this.layoutControlItem5.Location = new System.Drawing.Point(382, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(383, 66);
+ this.layoutControlItem17.Location = new System.Drawing.Point(382, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(383, 34);
+ this.layoutControlItem16.Size = new System.Drawing.Size(382, 33);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -990,22 +983,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(766, 66);
+ this.layoutControlItem4.Location = new System.Drawing.Point(764, 64);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(383, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_isSrm;
- this.layoutControlItem6.Location = new System.Drawing.Point(1149, 99);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1146, 96);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(385, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(384, 33);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -1014,11 +1007,11 @@
this.layoutControlItem10.Control = this.txt_mxStatue;
this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��";
- this.layoutControlItem10.Location = new System.Drawing.Point(383, 99);
+ this.layoutControlItem10.Location = new System.Drawing.Point(382, 96);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(383, 34);
+ this.layoutControlItem10.Size = new System.Drawing.Size(382, 33);
this.layoutControlItem10.Text = "鍏ュ簱鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1027,7 +1020,7 @@
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(383, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(382, 32);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1407,10 +1400,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1428,10 +1421,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1487,10 +1480,10 @@
// rptHistory
//
this.rptHistory.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptHistory.Name = "rptHistory";
this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
@@ -1536,10 +1529,18 @@
//
this.xtraTabPageReport.Controls.Add(this.ucRptCgdhd1);
this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
- this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(2);
this.xtraTabPageReport.Name = "xtraTabPageReport";
this.xtraTabPageReport.Size = new System.Drawing.Size(1550, 570);
this.xtraTabPageReport.Text = "鎶ヨ〃";
+ //
+ // ucRptCgdhd1
+ //
+ this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptCgdhd1.Name = "ucRptCgdhd1";
+ this.ucRptCgdhd1.Size = new System.Drawing.Size(1550, 570);
+ this.ucRptCgdhd1.TabIndex = 0;
//
// picCheckBox
//
@@ -1551,14 +1552,6 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // ucRptCgdhd1
- //
- this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
- this.ucRptCgdhd1.Name = "ucRptCgdhd1";
- this.ucRptCgdhd1.Size = new System.Drawing.Size(1550, 570);
- this.ucRptCgdhd1.TabIndex = 0;
//
// Frm_MesInvItemArn
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 6dab6da..19a3a13 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -46,7 +46,11 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptCgdhd1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆缁勭粐
@@ -147,7 +151,6 @@
};
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -172,13 +175,17 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
-
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ return;
+ }
+ ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
@@ -260,7 +267,7 @@
MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -275,19 +282,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
{
- //_filterList.Clear();
- //if (gridView1.ActiveFilter.Count > 0)
- //{
- // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- // gridView1.ActiveFilter.Clear();
- // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- //}
- //getPageList(1);
getPageList(this.pageBar1.CurrentPage);
+ return;
+ }
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ return;
+ }
+ if (xtraTabControl1.SelectedTabPageIndex == 2)
+ {
+ ucRptCgdhd1.ToolBarMenu1_btnLoadClick(sender, e);
+ return;
}
}
@@ -400,7 +408,7 @@
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
ItemId = int.Parse(row["itemId"].ToString()),
Quantity = decimal.Parse(row["quantity"].ToString()),
- UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":","").Replace("鏅��", "").Replace("鎬ユ枡", "").Replace("涓�鑸�", "")),
+ UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":", "").Replace("鏅��", "").Replace("鎬ユ枡", "").Replace("涓�鑸�", "")),
Remark = row["memo"].ToString(),
});
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
index 4fe83e9..c5ec84e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
@@ -28,8 +28,9 @@
/// </summary>
private void InitializeComponent()
{
- this.gcMain1 = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.components = new System.ComponentModel.Container();
+ this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
+ this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,25 +51,26 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
this.SuspendLayout();
//
- // gcMain1
+ // gcMain1Report
//
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Location = new System.Drawing.Point(0, 0);
- this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1339, 644);
- this.gcMain1.TabIndex = 2;
- this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
+ this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1Report.MainView = this.gridView1Report;
+ this.gcMain1Report.Name = "gcMain1Report";
+ this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
+ this.gcMain1Report.TabIndex = 2;
+ this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1Report});
//
- // gridView1
+ // gridView1Report
//
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridView1Report.Appearance.Row.Options.UseFont = true;
+ this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
this.gv_itemId,
this.gridColumn3,
@@ -88,13 +90,13 @@
this.gridColumn8,
this.gridColumn9,
this.gridColumn10});
- this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowFooter = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
+ this.gridView1Report.GridControl = this.gcMain1Report;
+ this.gridView1Report.IndicatorWidth = 50;
+ this.gridView1Report.Name = "gridView1Report";
+ this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1Report.OptionsView.ShowFooter = true;
+ this.gridView1Report.OptionsView.ShowGroupPanel = false;
//
// gv_guid
//
@@ -343,18 +345,18 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.gcMain1);
+ this.Controls.Add(this.gcMain1Report);
this.Controls.Add(this.pageBar1);
this.Name = "UcRptCgdhd";
this.Size = new System.Drawing.Size(1339, 682);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private DevExpress.XtraGrid.GridControl gcMain1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.GridControl gcMain1Report;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -375,5 +377,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.Utils.ToolTipController tips;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
index 4c9991c..798468a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
@@ -1,14 +1,19 @@
锘縰sing DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
+using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraLayout;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -23,14 +28,25 @@
public UcRptCgdhd()
{
InitializeComponent();
- //this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- //this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- //this.toolBarMenu1.getXmlConfig();
+ }
+ public bool isInitialize = false;
+ /// <summary>
+ /// 杩欏拰鏅�氶〉涓嶄竴鏍�
+ /// </summary>
+ public void Initialize()
+ {
+ if (isInitialize)
+ return;
+ string _formNamespace = this.GetType().FullName;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
+ gvList.Add(gridView1Report);
+ GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
+ UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
Form parentForm = this.FindForm();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, parentForm, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (value) =>
{
- // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
//Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
//{
// getModel(value);
@@ -40,10 +56,13 @@
//}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ this.isInitialize=true;
}
+
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
await Task.Delay(100);
getPageList(1);
}
@@ -64,10 +83,10 @@
/// <param name="e"></param>
public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1Report.ActiveFilter.Clear();
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1Report.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -87,7 +106,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
getPageList(this.pageBar1.CurrentPage);
}
@@ -99,7 +118,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -109,17 +128,17 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain1.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gcMain1Report.BindingContext = new BindingContext();
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain1.DataSource = dt;
- gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gcMain1Report.DataSource = dt;
+ gcMain1Report.ForceInitialize();
+ gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
}
else
- UtilityHelper.SetDefaultTable(gcMain1, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
@@ -134,5 +153,8 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx
index 1af7de1..5160e8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
index bb0c49b..58da719 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -39,9 +39,13 @@
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lb_qtRk = new DevExpress.XtraEditors.LabelControl();
this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
this.lb_sctlbfb = new DevExpress.XtraEditors.LabelControl();
this.lb_cgthsqcgy = new DevExpress.XtraEditors.LabelControl();
@@ -59,12 +63,14 @@
this.txt_cgthsqcgy = new DevExpress.XtraEditors.TextEdit();
this.txt_sctlbfb = new DevExpress.XtraEditors.TextEdit();
this.txt_FSalesManId = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_qtRk = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -74,13 +80,22 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_qtRk = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_qtRk = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_colorFinish = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_colorIng = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_color = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_colorFinish = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_colorIng = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_color = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
this.splitContainerControl1.Panel1.SuspendLayout();
@@ -98,12 +113,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -113,12 +130,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -138,7 +162,7 @@
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitContainerControl1.Size = new System.Drawing.Size(757, 533);
- this.splitContainerControl1.SplitterPosition = 459;
+ this.splitContainerControl1.SplitterPosition = 521;
this.splitContainerControl1.TabIndex = 0;
//
// groupControl1
@@ -146,12 +170,15 @@
this.groupControl1.Controls.Add(this.layoutControl1);
this.groupControl1.Location = new System.Drawing.Point(22, 31);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(553, 359);
+ this.groupControl1.Size = new System.Drawing.Size(553, 478);
this.groupControl1.TabIndex = 0;
this.groupControl1.Text = "鍩虹閰嶇疆";
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.lb_color);
+ this.layoutControl1.Controls.Add(this.lb_colorIng);
+ this.layoutControl1.Controls.Add(this.lb_colorFinish);
this.layoutControl1.Controls.Add(this.lb_qtRk);
this.layoutControl1.Controls.Add(this.lb_FSalesManId);
this.layoutControl1.Controls.Add(this.lb_sctlbfb);
@@ -171,28 +198,43 @@
this.layoutControl1.Controls.Add(this.txt_sctlbfb);
this.layoutControl1.Controls.Add(this.txt_FSalesManId);
this.layoutControl1.Controls.Add(this.txt_qtRk);
+ this.layoutControl1.Controls.Add(this.txt_colorFinish);
+ this.layoutControl1.Controls.Add(this.txt_colorIng);
+ this.layoutControl1.Controls.Add(this.txt_color);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem7,
this.layoutControlItem8,
this.layoutControlItem10,
this.layoutControlItem13,
this.layoutControlItem15,
- this.layoutControlItem17,
this.layoutControlItem9,
this.layoutControlItem11,
- this.layoutControlItem19});
+ this.layoutControlItem19,
+ this.layoutControlItem25,
+ this.layoutControlItem24,
+ this.layoutControlItem17,
+ this.layoutControlItem23,
+ this.layoutControlItem7});
this.layoutControl1.Location = new System.Drawing.Point(2, 28);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 500);
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(549, 329);
+ this.layoutControl1.Size = new System.Drawing.Size(549, 448);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
//
+ // lb_qtRk
+ //
+ this.lb_qtRk.Location = new System.Drawing.Point(12, 259);
+ this.lb_qtRk.Name = "lb_qtRk";
+ this.lb_qtRk.Size = new System.Drawing.Size(30, 18);
+ this.lb_qtRk.StyleController = this.layoutControl1;
+ this.lb_qtRk.TabIndex = 23;
+ this.lb_qtRk.Text = "qtRk";
+ //
// lb_FSalesManId
//
- this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
+ this.lb_FSalesManId.Location = new System.Drawing.Point(440, 242);
this.lb_FSalesManId.Name = "lb_FSalesManId";
this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
this.lb_FSalesManId.StyleController = this.layoutControl1;
@@ -255,7 +297,7 @@
//
// lb_qtrkdysy
//
- this.lb_qtrkdysy.Location = new System.Drawing.Point(433, 12);
+ this.lb_qtrkdysy.Location = new System.Drawing.Point(440, 143);
this.lb_qtrkdysy.Name = "lb_qtrkdysy";
this.lb_qtrkdysy.Size = new System.Drawing.Size(97, 18);
this.lb_qtrkdysy.StyleController = this.layoutControl1;
@@ -264,24 +306,24 @@
//
// txt_qtrkdysy
//
- this.txt_qtrkdysy.Location = new System.Drawing.Point(212, 11);
+ this.txt_qtrkdysy.Location = new System.Drawing.Point(187, 12);
this.txt_qtrkdysy.Name = "txt_qtrkdysy";
- this.txt_qtrkdysy.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtrkdysy.Size = new System.Drawing.Size(350, 24);
this.txt_qtrkdysy.StyleController = this.layoutControl1;
this.txt_qtrkdysy.TabIndex = 4;
//
// txt_qtrkdcgy
//
- this.txt_qtrkdcgy.Location = new System.Drawing.Point(212, 42);
+ this.txt_qtrkdcgy.Location = new System.Drawing.Point(187, 44);
this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
- this.txt_qtrkdcgy.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtrkdcgy.Size = new System.Drawing.Size(350, 24);
this.txt_qtrkdcgy.StyleController = this.layoutControl1;
this.txt_qtrkdcgy.TabIndex = 5;
//
// btnSave
//
this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
- this.btnSave.Location = new System.Drawing.Point(12, 290);
+ this.btnSave.Location = new System.Drawing.Point(12, 407);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(96, 27);
this.btnSave.StyleController = this.layoutControl1;
@@ -290,63 +332,60 @@
//
// txt_qtkg
//
- this.txt_qtkg.Location = new System.Drawing.Point(12, 73);
+ this.txt_qtkg.Location = new System.Drawing.Point(12, 77);
this.txt_qtkg.Name = "txt_qtkg";
this.txt_qtkg.Properties.Caption = "榻愬寮�宸�";
- this.txt_qtkg.Size = new System.Drawing.Size(504, 24);
+ this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
this.txt_qtkg.StyleController = this.layoutControl1;
this.txt_qtkg.TabIndex = 8;
//
// txt_qtckdllr
//
- this.txt_qtckdllr.Location = new System.Drawing.Point(212, 104);
+ this.txt_qtckdllr.Location = new System.Drawing.Point(187, 110);
this.txt_qtckdllr.Name = "txt_qtckdllr";
- this.txt_qtckdllr.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtckdllr.Size = new System.Drawing.Size(350, 24);
this.txt_qtckdllr.StyleController = this.layoutControl1;
this.txt_qtckdllr.TabIndex = 9;
//
// txt_qtckdcgy
//
- this.txt_qtckdcgy.Location = new System.Drawing.Point(212, 135);
+ this.txt_qtckdcgy.Location = new System.Drawing.Point(187, 143);
this.txt_qtckdcgy.Name = "txt_qtckdcgy";
- this.txt_qtckdcgy.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtckdcgy.Size = new System.Drawing.Size(350, 24);
this.txt_qtckdcgy.StyleController = this.layoutControl1;
this.txt_qtckdcgy.TabIndex = 10;
//
// txt_cgthsqcgy
//
- this.txt_cgthsqcgy.Location = new System.Drawing.Point(212, 166);
+ this.txt_cgthsqcgy.Location = new System.Drawing.Point(187, 176);
this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
- this.txt_cgthsqcgy.Size = new System.Drawing.Size(304, 24);
+ this.txt_cgthsqcgy.Size = new System.Drawing.Size(350, 24);
this.txt_cgthsqcgy.StyleController = this.layoutControl1;
this.txt_cgthsqcgy.TabIndex = 16;
//
// txt_sctlbfb
//
- this.txt_sctlbfb.Location = new System.Drawing.Point(212, 197);
+ this.txt_sctlbfb.Location = new System.Drawing.Point(187, 209);
this.txt_sctlbfb.Name = "txt_sctlbfb";
- this.txt_sctlbfb.Size = new System.Drawing.Size(304, 24);
+ this.txt_sctlbfb.Size = new System.Drawing.Size(350, 24);
this.txt_sctlbfb.StyleController = this.layoutControl1;
this.txt_sctlbfb.TabIndex = 18;
//
// txt_FSalesManId
//
- this.txt_FSalesManId.Location = new System.Drawing.Point(212, 228);
+ this.txt_FSalesManId.Location = new System.Drawing.Point(187, 242);
this.txt_FSalesManId.Name = "txt_FSalesManId";
- this.txt_FSalesManId.Size = new System.Drawing.Size(304, 24);
+ this.txt_FSalesManId.Size = new System.Drawing.Size(350, 24);
this.txt_FSalesManId.StyleController = this.layoutControl1;
this.txt_FSalesManId.TabIndex = 20;
//
- // layoutControlItem7
+ // txt_qtRk
//
- this.layoutControlItem7.Control = this.lb_qtrkdysy;
- this.layoutControlItem7.Location = new System.Drawing.Point(421, 0);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(108, 37);
- this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem7.TextVisible = false;
+ this.txt_qtRk.Location = new System.Drawing.Point(187, 275);
+ this.txt_qtRk.Name = "txt_qtRk";
+ this.txt_qtRk.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtRk.StyleController = this.layoutControl1;
+ this.txt_qtRk.TabIndex = 22;
//
// layoutControlItem8
//
@@ -396,18 +435,38 @@
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
- // layoutControlItem17
+ // layoutControlItem9
//
- this.layoutControlItem17.Control = this.lb_FSalesManId;
- this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
- this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
- this.layoutControlItem17.Text = "閿�鍞憳";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem9.Control = this.lb_qtkg;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem9.Text = "榻愬寮�宸abel";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.lb_qtckdcgy;
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem11.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem11.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳label";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.lb_qtRk;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 248);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem19.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem19.Text = "榻愬鍏ュ簱label";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem19.TextVisible = false;
//
// Root
//
@@ -422,8 +481,11 @@
this.layoutControlItem12,
this.layoutControlItem14,
this.layoutControlItem16,
+ this.layoutControlItem18,
this.layoutControlItem4,
- this.layoutControlItem18});
+ this.layoutControlItem20,
+ this.layoutControlItem21,
+ this.layoutControlItem22});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -450,6 +512,12 @@
rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition10.Height = 100D;
rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -460,8 +528,11 @@
rowDefinition7,
rowDefinition8,
rowDefinition9,
- rowDefinition10});
- this.Root.Size = new System.Drawing.Size(528, 330);
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13});
+ this.Root.Size = new System.Drawing.Size(549, 448);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -469,27 +540,27 @@
this.layoutControlItem1.Control = this.txt_qtrkdysy;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(529, 32);
this.layoutControlItem1.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qtrkdcgy;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem2.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qtkg;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 65);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem3.Text = "榻愬寮�宸�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -497,126 +568,218 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qtckdllr;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 98);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem5.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qtckdcgy;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 131);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem6.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem6.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_cgthsqcgy;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 164);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem12.Text = "閲囪喘閫�璐х敵璇烽噰璐憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_sctlbfb;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 186);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 197);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem14.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_FSalesManId;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 217);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 230);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem16.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem16.Text = "閿�鍞憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(163, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_qtRk;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 263);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem18.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem18.Text = "榻愬鍏ュ簱(1:寮�鍚�,0:鍏抽棴)";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(163, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.btnSave;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 279);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 395);
this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 9;
- this.layoutControlItem4.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 12;
+ this.layoutControlItem4.Size = new System.Drawing.Size(529, 33);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Text = "纭畾淇濆瓨";
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem4.TextVisible = false;
//
- // txt_qtRk
+ // txt_colorFinish
//
- this.txt_qtRk.Location = new System.Drawing.Point(212, 259);
- this.txt_qtRk.Name = "txt_qtRk";
- this.txt_qtRk.Size = new System.Drawing.Size(304, 24);
- this.txt_qtRk.StyleController = this.layoutControl1;
- this.txt_qtRk.TabIndex = 22;
+ this.txt_colorFinish.Location = new System.Drawing.Point(187, 308);
+ this.txt_colorFinish.Name = "txt_colorFinish";
+ this.txt_colorFinish.Size = new System.Drawing.Size(350, 24);
+ this.txt_colorFinish.StyleController = this.layoutControl1;
+ this.txt_colorFinish.TabIndex = 24;
//
- // layoutControlItem18
+ // layoutControlItem20
//
- this.layoutControlItem18.Control = this.txt_qtRk;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 248);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem18.Size = new System.Drawing.Size(508, 31);
- this.layoutControlItem18.Text = "榻愬鍏ュ簱(1:寮�鍚� 锛�0锛氬叧闂�)";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(188, 18);
+ this.layoutControlItem20.Control = this.txt_colorFinish;
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 296);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem20.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem20.Text = "瀹岀粨瀹屾垚琛岄鑹�";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(163, 18);
//
- // layoutControlItem9
+ // txt_colorIng
//
- this.layoutControlItem9.Control = this.lb_qtkg;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(508, 31);
- this.layoutControlItem9.Text = "榻愬寮�宸abel";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
+ this.txt_colorIng.Location = new System.Drawing.Point(187, 341);
+ this.txt_colorIng.Name = "txt_colorIng";
+ this.txt_colorIng.Size = new System.Drawing.Size(350, 24);
+ this.txt_colorIng.StyleController = this.layoutControl1;
+ this.txt_colorIng.TabIndex = 25;
//
- // layoutControlItem11
+ // layoutControlItem21
//
- this.layoutControlItem11.Control = this.lb_qtckdcgy;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(508, 31);
- this.layoutControlItem11.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳label";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
+ this.layoutControlItem21.Control = this.txt_colorIng;
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 329);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 10;
+ this.layoutControlItem21.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem21.Text = "杩涜涓棰滆壊";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(163, 18);
//
- // lb_qtRk
+ // txt_color
//
- this.lb_qtRk.Location = new System.Drawing.Point(12, 259);
- this.lb_qtRk.Name = "lb_qtRk";
- this.lb_qtRk.Size = new System.Drawing.Size(30, 18);
- this.lb_qtRk.StyleController = this.layoutControl1;
- this.lb_qtRk.TabIndex = 23;
- this.lb_qtRk.Text = "qtRk";
+ this.txt_color.Location = new System.Drawing.Point(187, 374);
+ this.txt_color.Name = "txt_color";
+ this.txt_color.Size = new System.Drawing.Size(350, 24);
+ this.txt_color.StyleController = this.layoutControl1;
+ this.txt_color.TabIndex = 26;
//
- // layoutControlItem19
+ // layoutControlItem22
//
- this.layoutControlItem19.Control = this.lb_qtRk;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 248);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem19.Size = new System.Drawing.Size(508, 31);
- this.layoutControlItem19.Text = "榻愬鍏ュ簱label";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem19.TextVisible = false;
+ this.layoutControlItem22.Control = this.txt_color;
+ this.layoutControlItem22.Location = new System.Drawing.Point(0, 362);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 11;
+ this.layoutControlItem22.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem22.Text = "榛樿琛岄鑹�";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(163, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lb_FSalesManId;
+ this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
+ this.layoutControlItem17.Location = new System.Drawing.Point(428, 230);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem17.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem17.Text = "閿�鍞憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.lb_qtrkdysy;
+ this.layoutControlItem7.Location = new System.Drawing.Point(428, 131);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem7.TextVisible = false;
+ //
+ // lb_colorFinish
+ //
+ this.lb_colorFinish.Location = new System.Drawing.Point(440, 308);
+ this.lb_colorFinish.Name = "lb_colorFinish";
+ this.lb_colorFinish.Size = new System.Drawing.Size(65, 18);
+ this.lb_colorFinish.StyleController = this.layoutControl1;
+ this.lb_colorFinish.TabIndex = 27;
+ this.lb_colorFinish.Text = "colorFinish";
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.lb_colorFinish;
+ this.layoutControlItem23.Location = new System.Drawing.Point(428, 296);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem23.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem23.Text = "瀹岀粨瀹屾垚琛岄鑹瞝abel";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem23.TextVisible = false;
+ //
+ // lb_colorIng
+ //
+ this.lb_colorIng.Location = new System.Drawing.Point(440, 341);
+ this.lb_colorIng.Name = "lb_colorIng";
+ this.lb_colorIng.Size = new System.Drawing.Size(52, 18);
+ this.lb_colorIng.StyleController = this.layoutControl1;
+ this.lb_colorIng.TabIndex = 28;
+ this.lb_colorIng.Text = "colorIng";
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lb_colorIng;
+ this.layoutControlItem24.Location = new System.Drawing.Point(428, 329);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 10;
+ this.layoutControlItem24.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem24.Text = "杩涜涓棰滆壊label";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // lb_color
+ //
+ this.lb_color.Location = new System.Drawing.Point(440, 374);
+ this.lb_color.Name = "lb_color";
+ this.lb_color.Size = new System.Drawing.Size(30, 18);
+ this.lb_color.StyleController = this.layoutControl1;
+ this.lb_color.TabIndex = 29;
+ this.lb_color.Text = "color";
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.lb_color;
+ this.layoutControlItem25.Location = new System.Drawing.Point(428, 362);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 11;
+ this.layoutControlItem25.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem25.Text = "榛樿琛岄鑹瞝abel";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
//
// Frm_Config
//
@@ -643,12 +806,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -658,12 +823,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
this.ResumeLayout(false);
}
@@ -697,20 +869,32 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraEditors.LabelControl lb_sctlbfb;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_FSalesManId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.LabelControl lb_FSalesManId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.LabelControl lb_qtRk;
private DevExpress.XtraEditors.TextEdit txt_qtRk;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraEditors.TextEdit txt_colorFinish;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraEditors.LabelControl lb_color;
+ private DevExpress.XtraEditors.LabelControl lb_colorIng;
+ private DevExpress.XtraEditors.LabelControl lb_colorFinish;
+ private DevExpress.XtraEditors.TextEdit txt_colorIng;
+ private DevExpress.XtraEditors.TextEdit txt_color;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index 4a55b0b..3ea9ac0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -54,6 +54,13 @@
//榻愬鍏ュ簱
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_qtRk.Text.Trim() + "','" + txt_qtRk.Text.Trim() + "','" + layoutControlItem18.Text.Trim() + "')");
+ //棰滆壊
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_colorFinish.Text.Trim() + "','" + txt_colorFinish.Text.Trim() + "','" + layoutControlItem20.Text.Trim() + "')");
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_colorIng.Text.Trim() + "','" + txt_colorIng.Text.Trim() + "','" + layoutControlItem21.Text.Trim() + "')");
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_color.Text.Trim() + "','" + txt_color.Text.Trim() + "','" + layoutControlItem22.Text.Trim() + "')");
var _obj = new
{
sql = sb.ToString(),
@@ -139,6 +146,22 @@
txt_qtRk.Text = row["parameterValue"].ToString();
continue;
}
+
+ if (row["remark"].ToString() == layoutControlItem20.Text)
+ {
+ txt_colorFinish.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem21.Text)
+ {
+ txt_colorIng.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem22.Text)
+ {
+ txt_color.Text = row["parameterValue"].ToString();
+ continue;
+ }
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index a503c6b..aa6470b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,23 +30,23 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -67,6 +67,7 @@
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -339,7 +340,8 @@
this.gv_remark,
this.gv_fstatus,
this.gridColumn11,
- this.gv_checkDate});
+ this.gv_checkDate,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -412,7 +414,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "鏉＄爜鎵撳嵃姣旂巼";
- this.gridColumn1.FieldName = "barRatio";
+ this.gridColumn1.FieldName = "barRatioTxtColor";
this.gridColumn1.MaxWidth = 80;
this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
@@ -516,6 +518,14 @@
this.gv_checkDate.VisibleIndex = 12;
this.gv_checkDate.Width = 180;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍒拌揣鍗旼uid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -593,25 +603,25 @@
this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(219, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 68);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
@@ -620,25 +630,25 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(219, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(445, 40);
+ this.txt_gysName.Location = new System.Drawing.Point(439, 40);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(220, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(776, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(765, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(220, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
@@ -647,34 +657,34 @@
this.txt_remark.Location = new System.Drawing.Point(114, 68);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(556, 24);
+ this.txt_remark.Size = new System.Drawing.Size(545, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(765, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(220, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(1005, 12);
+ this.txt_fType.Location = new System.Drawing.Point(989, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(327, 24);
+ this.txt_fType.Size = new System.Drawing.Size(322, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 469;
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 40);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
- this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+ this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
this.txt_urgentFlag.StyleController = this.layoutMx1;
this.txt_urgentFlag.TabIndex = 470;
//
@@ -707,30 +717,30 @@
this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1344, 104);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(1323, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -738,27 +748,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -766,21 +776,21 @@
//
this.layoutControlItem8.Control = this.txt_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(662, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fType;
- this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -788,11 +798,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(993, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -800,22 +810,22 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(662, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(331, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(325, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -825,7 +835,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -836,7 +846,7 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
@@ -908,10 +918,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 89);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 75);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 35);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -946,19 +956,19 @@
this.layoutControlItem27});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4});
+ rowDefinition11});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 35);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -966,7 +976,7 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(168, 35);
+ this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -976,7 +986,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(168, 35);
+ this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -994,16 +1004,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 41);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(340, 39);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1030, 10);
+ this.radOut.Location = new System.Drawing.Point(1030, 9);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1012,13 +1022,13 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(340, 38);
+ this.radOut.Size = new System.Drawing.Size(340, 32);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 50);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 43);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1030,7 +1040,7 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(114, 11);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
@@ -1040,7 +1050,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 50);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 43);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1050,7 +1060,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 89);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 75);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1060,7 +1070,7 @@
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(794, 11);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1072,7 +1082,7 @@
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(454, 11);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
@@ -1082,7 +1092,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 50);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 43);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1119,30 +1129,30 @@
this.layoutControlItem25});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1150,28 +1160,28 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(680, 39);
+ this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1181,18 +1191,18 @@
this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(340, 38);
+ this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1202,18 +1212,18 @@
this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 38);
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1224,7 +1234,7 @@
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1232,12 +1242,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 38);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1245,11 +1255,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(680, 77);
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1320,7 +1330,7 @@
//
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
- this.gvMx1urgentFlag.FieldName = "urgentFlag";
+ this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
this.gvMx1urgentFlag.MinWidth = 10;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
@@ -1888,5 +1898,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 1daefa8..872ac86 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1238,6 +1238,10 @@
{
tabControl.TabPages[0].PageEnabled = true;
tabControl.TabPages[1].PageEnabled = true;
+ if (tabControl.TabPages.Count > 2)
+ {
+ tabControl.TabPages[2].PageEnabled = true;
+ }
tabControl.SelectedTabPageIndex = 0;
return;
}
@@ -1252,6 +1256,10 @@
{
tabControl.TabPages[0].PageEnabled = false;
tabControl.TabPages[1].PageEnabled = true;
+ if (tabControl.TabPages.Count > 2)
+ {
+ tabControl.TabPages[2].PageEnabled = false;
+ }
tabControl.SelectedTabPageIndex = 1;
return;
}
@@ -1259,6 +1267,10 @@
{
tabControl.TabPages[0].PageEnabled = false;
tabControl.TabPages[1].PageEnabled = true;
+ if (tabControl.TabPages.Count >2)
+ {
+ tabControl.TabPages[2].PageEnabled = false;
+ }
tabControl.SelectedTabPageIndex = 1;
return;
}
@@ -1274,7 +1286,10 @@
{
tabControl.TabPages[0].PageEnabled = true;
tabControl.TabPages[1].PageEnabled = true;
-
+ if (tabControl.TabPages.Count > 2)
+ {
+ tabControl.TabPages[2].PageEnabled = true;
+ }
return;
}
}
@@ -1710,7 +1725,7 @@
}
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
-
+ public delegate void DelegateGetUserControlList();
/// <summary>
///
/// </summary>
@@ -1845,6 +1860,26 @@
action2(_guid);
};
}
+ gridView1.RowCellStyle += (s, e) =>
+ {
+ GridView view = s as GridView;
+ if (view != null && e.Column != null && e.CellValue != null)
+ {
+ if (e.Column.FieldName.EndsWith("Color"))
+ {
+ int rowHandle = e.RowHandle;
+ DataRow row = gridView1.GetDataRow(e.RowHandle);
+ string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
+ if (!string.IsNullOrEmpty(_bgColor))
+ {
+ Color bgColor = ColorTranslator.FromHtml(_bgColor);
+ e.Appearance.BackColor = bgColor;
+ // e.Appearance.BackColor2 = Color.LightSkyBlue;
+ //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
+ }
+ }
+ }
+ };
gridView1.RowStyle += (s, e) =>
{
//榛樿閫変腑琛屼笉鍙樿壊
@@ -1854,40 +1889,12 @@
if (e.RowHandle >= 0)
{
DataRow row = gridView1.GetDataRow(e.RowHandle);
- if (row == null)
- return;
- //杩欐槸danger鑹�
- bool columnExists = row.Table.Columns.Contains("isRed");
- if (columnExists == true)
- {
- string _isRed = row["isRed"].ToString();
- if (_isRed == "1")
- {
- e.Appearance.ForeColor = Color.Tomato;
- }
- }
- //杩欐槸success鑹�
- columnExists = row.Table.Columns.Contains("isSuccess");
- if (columnExists == true)
- {
- string _isRed = row["isSuccess"].ToString();
- if (_isRed == "1")
- {
- e.Appearance.ForeColor = Color.FromArgb(128, 255, 128);
- }
- }
// 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹�
if (gridView1.GetRow(e.RowHandle) == gridView1.GetFocusedRow())
{
e.Appearance.BackColor = Color.Azure;
e.Appearance.BackColor2 = Color.LightSkyBlue;
}
- //else if (gridView1.IsRowHotTracked(e.RowHandle))
- //{
- // // 璁剧疆榧犳爣鎮仠琛岀殑鑳屾櫙鑹�
- // e.Appearance.BackColor = Color.LightBlue;
- // e.Appearance.BackColor2 = Color.LightBlue;
- //}
}
};
if (tips != null)
@@ -1937,7 +1944,7 @@
edit.SelectAll();
}
- public static void SetGridLayout(GridView gridView1,int maxWidth=500)
+ public static void SetGridLayout(GridView gridView1, int maxWidth = 500)
{
foreach (GridColumn column in gridView1.Columns)
{
@@ -1945,19 +1952,36 @@
column.Width = maxWidth;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
/// <param name="gridView1"></param>
/// <param name="xtraTabControl1"></param>
/// <param name="pageBar1"></param>
- /// <param name="action"></param>
- /// <param name="page"></param>
- public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
+ /// <param name="action">璇诲彇瀹炰綋</param>
+ /// <param name="page">璇诲彇鍒楄〃</param>
+ /// <param name="lbGuid"></param>
+ /// <param name="barMenu"></param>
+ /// <param name="ucLst">璇诲彇鎶ヨ〃</param>
+ public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null, UcToolBarMenu barMenu = null, DelegateGetUserControlList ucLst = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
{
+ if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ if (barMenu != null)
+ barMenu.SetAllButton(0);
+
+ page(pageBar1.CurrentPage);
+ int rowHandle = 0;
+ rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
+ if (rowHandle < 0)
+ rowHandle = 0;
+ gridView1.FocusedRowHandle = rowHandle;
+ return;
+ }
+
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
int _handle = gridView1.FocusedRowHandle;
@@ -1985,18 +2009,18 @@
return;
}
action(_guid);
+ return;
}
- if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+
+ if (barMenu != null && xtraTabControl1.SelectedTabPageIndex == 2)
{
- page(pageBar1.CurrentPage);
- int rowHandle = 0;
- rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
- if (rowHandle < 0)
- rowHandle = 0;
- gridView1.FocusedRowHandle = rowHandle;
+ barMenu.SetAllButton(2);
+ ucLst();
+ return;
}
};
}
+
/// <summary>
/// 璁剧疆鏄庣粏grid鏍峰紡
@@ -2129,6 +2153,77 @@
sb.Append(" (select aboutGuid as fid from SYS_USER_BIND where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and ftype='缁勭粐')");
return sb.ToString();
}
+
+ /// <summary>
+ /// 鐢ㄦ埛鎺т欢璇诲彇xml閰嶇疆
+ /// </summary>
+ /// <param name="_formNamespace"></param>
+ /// <param name="gvList"></param>
+ /// <param name="gcMain"></param>
+ public static void GetUcXmlConfig(string _formNamespace, List<DevExpress.XtraGrid.Views.Grid.GridView> gvList, GridControl gcMain)
+ {
+ JArray array = new JArray();
+ var _obj = new
+ {
+ formPath = _formNamespace,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "Fm/GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ JObject _job = JObject.Parse(strJson);
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ foreach (GridView gv in gvList)
+ {
+ JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
+ if (john != null)
+ {
+ string controlId = john["controlId"].ToString();
+ string controlXml = john["controlXml"].ToString();
+ byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
+ using (var stream = new MemoryStream(byteArray))
+ {
+ gv.RestoreLayoutFromStream(stream);
+ }
+ }
+ }
+
+ //璁剧疆鏌ヨ鏉′欢beg
+ if (gcMain != null)
+ {
+ GridView gv1 = gcMain.MainView as GridView;
+ if (gv1 != null)
+ {
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ string _gvColName = a["gvColName"].ToString();
+ string _sqlField = a["sqlField"].ToString();
+ string _sqlFieldType = a["sqlFieldType"].ToString();
+ var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
+ .FirstOrDefault(c => c.Name == _gvColName);
+ if (column != null)
+ {
+ column.Tag = _sqlField;
+ column.UnboundExpression = _sqlFieldType;
+ }
+ }
+ }
+ }
+ //璁剧疆鏌ヨ鏉′欢end
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
#endregion
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b6bd2cc..2de362f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,7 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Model;
using DevExpress.XtraWaitForm;
using Gs.DevApp.DevFrm;
using Gs.DevApp.DevFrm.QC;
@@ -67,7 +68,6 @@
btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
-
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -76,7 +76,7 @@
actions = lst;
}
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -770,7 +770,6 @@
// continue;
// }
//}
-
//鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓�
var exists = dt.AsEnumerable().Any(row =>
row.Field<string>("name") == item.Caption);
@@ -784,7 +783,6 @@
_enabledList.Add(_btnName);
}
}
-
//榛樿鍚敤鐨勬寜閽�
_enabledList.Add(btnLoad.Name);
_enabledList.Add(btnHelp.Name);
@@ -1049,7 +1047,7 @@
/// 鍙嶅搧璐�
/// </summary>
public event EventHandler btnFPingZhiClick;
-
+
#endregion
#region 鍏叡灞炴��
@@ -1095,6 +1093,47 @@
#endregion
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inType"></param>
+ public void SetAllButton(int inType)
+ {
+ var lstBtn = new List<string>();
+ if (inType == 0)
+ {
+ lstBtn.Add(btnSave.Name);
+ lstBtn.Add(btnEsc.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (!lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ if (inType == 2)
+ {
+ lstBtn.Add(btnHelp.Name);
+ lstBtn.Add(btnLoad.Name);
+ lstBtn.Add(btnQuery.Name);
+ lstBtn.Add(btnLayout.Name);
+ lstBtn.Add(btnFont.Name);
+ lstBtn.Add(btnAdd.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+
+ }
/// <summary>
/// 鏌ユ壘gridView
@@ -1303,6 +1342,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3