From 41e4e091da1149150501f5c07244c44053c0309a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 23 六月 2025 16:15:10 +0800
Subject: [PATCH] 重检方案
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.resx | 120 ++++++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx | 3
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs | 103 +++++
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | 540 +++++++++++---------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs | 171 --------
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs | 193 +++++++++
8 files changed, 670 insertions(+), 473 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3d80851..f77fd81 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<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="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
index 391a2fa..6dd267a 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -29,26 +29,25 @@
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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,7 +59,6 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
- this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_fabm = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -82,29 +80,19 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.splitContainerControl2 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.btnOut = new DevExpress.XtraEditors.SimpleButton();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.frm_CqfaItems1 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
+ this.frm_CqfaItems2 = new Gs.DevApp.DevFrm.RkQC.Frm_CqfaItems();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -145,15 +133,23 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ this.splitContainerControl1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.Panel2.SuspendLayout();
+ this.splitContainerControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).BeginInit();
+ this.splitContainerControl2.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).BeginInit();
+ this.splitContainerControl2.Panel2.SuspendLayout();
+ this.splitContainerControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -168,7 +164,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1203, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -179,7 +175,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1203, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -189,7 +185,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1201, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -210,7 +206,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1201, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -220,7 +216,7 @@
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(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1201, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -250,6 +246,36 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "淇濆�兼湡闄�";
+ this.gridColumn9.FieldName = "bzqx";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 4;
+ this.gridColumn9.Width = 115;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "棰勮鏃ユ湡";
+ this.gridColumn8.FieldName = "yjrq";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 5;
+ this.gridColumn8.Width = 115;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "澶嶆闄愬��";
+ this.gridColumn10.FieldName = "fjxz";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 6;
+ this.gridColumn10.Width = 115;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
@@ -273,6 +299,16 @@
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 1;
this.gv_status.Width = 50;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鏂规鍚嶇О";
+ this.gridColumn11.FieldName = "famc";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.Width = 115;
//
// gv_billNo
//
@@ -338,7 +374,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1201, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -346,7 +382,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1201, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -366,7 +402,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.Size = new System.Drawing.Size(1201, 570);
this.splitMx1.SplitterPosition = 111;
this.splitMx1.TabIndex = 0;
//
@@ -374,7 +410,6 @@
//
this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
- this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_fabm);
this.layoutMx1.Controls.Add(this.txt_checkDate);
@@ -393,37 +428,27 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 111);
+ this.layoutMx1.Size = new System.Drawing.Size(1201, 111);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_fSubsidiary
//
this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(663, 12);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(701, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(173, 24);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(192, 24);
this.txt_fSubsidiary.TabIndex = 538;
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(840, 74);
+ this.txt_checkStatus.Location = new System.Drawing.Point(897, 72);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_checkStatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_checkStatus.Size = new System.Drawing.Size(292, 24);
this.txt_checkStatus.StyleController = this.layoutMx1;
this.txt_checkStatus.TabIndex = 537;
this.txt_checkStatus.Tag = "readonly";
- //
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 74);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(116, 27);
- this.btnSelect.StyleController = this.layoutMx1;
- this.btnSelect.TabIndex = 525;
- this.btnSelect.Text = "閫夋嫨鐗╂枡鏄庣粏";
//
// lbGuid
//
@@ -439,36 +464,36 @@
this.txt_fabm.Location = new System.Drawing.Point(111, 12);
this.txt_fabm.Name = "txt_fabm";
this.txt_fabm.Properties.Appearance.Options.UseFont = true;
- this.txt_fabm.Size = new System.Drawing.Size(173, 24);
+ this.txt_fabm.Size = new System.Drawing.Size(192, 24);
this.txt_fabm.StyleController = this.layoutMx1;
this.txt_fabm.TabIndex = 211;
this.txt_fabm.Tag = "";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(939, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(996, 42);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(175, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_bz
//
- this.txt_bz.Location = new System.Drawing.Point(387, 74);
+ this.txt_bz.Location = new System.Drawing.Point(111, 72);
this.txt_bz.Name = "txt_bz";
this.txt_bz.Properties.Appearance.Options.UseFont = true;
- this.txt_bz.Size = new System.Drawing.Size(449, 24);
+ this.txt_bz.Size = new System.Drawing.Size(487, 24);
this.txt_bz.StyleController = this.layoutMx1;
this.txt_bz.TabIndex = 252;
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(939, 12);
+ this.txt_checkBy.Location = new System.Drawing.Point(996, 12);
this.txt_checkBy.Name = "txt_checkBy";
this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_checkBy.Size = new System.Drawing.Size(175, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(193, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 222;
this.txt_checkBy.Tag = "readonly";
@@ -483,33 +508,33 @@
//
// txt_famc
//
- this.txt_famc.Location = new System.Drawing.Point(387, 12);
+ this.txt_famc.Location = new System.Drawing.Point(406, 12);
this.txt_famc.Name = "txt_famc";
- this.txt_famc.Size = new System.Drawing.Size(173, 24);
+ this.txt_famc.Size = new System.Drawing.Size(192, 24);
this.txt_famc.StyleController = this.layoutMx1;
this.txt_famc.TabIndex = 533;
//
// txt_bzqx
//
- this.txt_bzqx.Location = new System.Drawing.Point(387, 43);
+ this.txt_bzqx.Location = new System.Drawing.Point(406, 42);
this.txt_bzqx.Name = "txt_bzqx";
- this.txt_bzqx.Size = new System.Drawing.Size(173, 24);
+ this.txt_bzqx.Size = new System.Drawing.Size(192, 24);
this.txt_bzqx.StyleController = this.layoutMx1;
this.txt_bzqx.TabIndex = 534;
//
// txt_fjxz
//
- this.txt_fjxz.Location = new System.Drawing.Point(663, 43);
+ this.txt_fjxz.Location = new System.Drawing.Point(701, 42);
this.txt_fjxz.Name = "txt_fjxz";
- this.txt_fjxz.Size = new System.Drawing.Size(173, 24);
+ this.txt_fjxz.Size = new System.Drawing.Size(192, 24);
this.txt_fjxz.StyleController = this.layoutMx1;
this.txt_fjxz.TabIndex = 535;
//
// txt_yjrq
//
- this.txt_yjrq.Location = new System.Drawing.Point(111, 43);
+ this.txt_yjrq.Location = new System.Drawing.Point(111, 42);
this.txt_yjrq.Name = "txt_yjrq";
- this.txt_yjrq.Size = new System.Drawing.Size(173, 24);
+ this.txt_yjrq.Size = new System.Drawing.Size(192, 24);
this.txt_yjrq.StyleController = this.layoutMx1;
this.txt_yjrq.TabIndex = 536;
//
@@ -549,67 +574,66 @@
this.layoutControlItem5,
this.layoutControlItem2,
this.layoutControlItem4,
- this.layoutControlItem16,
- this.layoutControlItem7,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem7});
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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 113);
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.Root.Size = new System.Drawing.Size(1201, 111);
this.Root.TextVisible = false;
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_checkBy;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(885, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(296, 30);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(885, 30);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(296, 30);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_checkStatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(885, 60);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(296, 31);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -618,87 +642,72 @@
this.layoutControlItem1.Control = this.txt_fabm;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem1.Text = "鏂规缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_famc;
- this.layoutControlItem3.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(295, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem3.Text = "鏂规鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_yjrq;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem5.Text = "棰勮鏃ユ湡(澶�)";
this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_bzqx;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(295, 30);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem2.Text = "璐ㄤ繚鏈熼檺(澶�)";
this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fjxz;
- this.layoutControlItem4.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(590, 30);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem4.Text = "澶嶆闄愬��(娆�)";
this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
- 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 = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem16.Text = "閫�璐ф槑缁�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_bz;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 62);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
- this.layoutControlItem7.Text = "鏂规澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fSubsidiary;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(590, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(295, 30);
this.layoutControlItem8.Text = "浣跨敤缁勭粐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_bz;
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(590, 31);
+ this.layoutControlItem7.Text = "鏂规澶囨敞";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// tabMx
//
@@ -706,138 +715,78 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 447);
+ this.tabMx.Size = new System.Drawing.Size(1201, 447);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 415);
- this.tabMxPage1.Text = "鐢宠鏄庣粏";
+ this.tabMxPage1.Size = new System.Drawing.Size(1199, 415);
+ this.tabMxPage1.Text = "鏂规鏄庣粏";
//
- // gcMx1
+ // splitContainerControl1
//
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 415);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
+ this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Name = "splitContainerControl1";
//
- // gvMx1
+ // splitContainerControl1.Panel1
//
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1id,
- this.gvMx1mid,
- this.gridColumn6,
- this.gvMx1itemId,
- this.gridColumn2,
- this.gridColumn4,
- this.gridColumn5,
- this.gvMxDel});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
+ this.splitContainerControl1.Panel1.Controls.Add(this.frm_CqfaItems1);
+ this.splitContainerControl1.Panel1.Text = "Panel1";
//
- // gvMx1id
+ // splitContainerControl1.Panel2
//
- this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "鏄庣粏GUID";
- this.gvMx1id.FieldName = "id";
- this.gvMx1id.MinWidth = 50;
- this.gvMx1id.Name = "gvMx1id";
- this.gvMx1id.Tag = "query_a.ID";
- this.gvMx1id.Width = 94;
+ this.splitContainerControl1.Panel2.Controls.Add(this.splitContainerControl2);
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1199, 415);
+ this.splitContainerControl1.SplitterPosition = 628;
+ this.splitContainerControl1.TabIndex = 0;
//
- // gvMx1mid
+ // splitContainerControl2
//
- this.gvMx1mid.AppearanceCell.Options.UseFont = true;
- this.gvMx1mid.Caption = "涓昏〃GUID";
- this.gvMx1mid.FieldName = "mid";
- this.gvMx1mid.MinWidth = 50;
- this.gvMx1mid.Name = "gvMx1mid";
- this.gvMx1mid.Tag = "query_a.MID";
- this.gvMx1mid.Width = 94;
+ this.splitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl2.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl2.Name = "splitContainerControl2";
//
- // gridColumn6
+ // splitContainerControl2.Panel1
//
- this.gridColumn6.Caption = "浣跨敤缁勭粐";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 0;
- this.gridColumn6.Width = 94;
+ this.splitContainerControl2.Panel1.Controls.Add(this.btnOut);
+ this.splitContainerControl2.Panel1.Controls.Add(this.btnIn);
+ this.splitContainerControl2.Panel1.Text = "Panel1";
//
- // gvMx1itemId
+ // splitContainerControl2.Panel2
//
- this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemId.Caption = "鐗╂枡ID";
- this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
- this.gvMx1itemId.Name = "gvMx1itemId";
- this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 1;
- this.gvMx1itemId.Width = 94;
+ this.splitContainerControl2.Panel2.Controls.Add(this.frm_CqfaItems2);
+ this.splitContainerControl2.Panel2.Text = "Panel2";
+ this.splitContainerControl2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False;
+ this.splitContainerControl2.Size = new System.Drawing.Size(559, 415);
+ this.splitContainerControl2.SplitterPosition = 71;
+ this.splitContainerControl2.TabIndex = 0;
//
- // gridColumn2
+ // btnOut
//
- this.gridColumn2.Caption = "鐗╂枡缂栫爜";
- this.gridColumn2.FieldName = "wlbm";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
+ this.btnOut.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.btnOut.Appearance.Options.UseForeColor = true;
+ this.btnOut.Location = new System.Drawing.Point(17, 235);
+ this.btnOut.Name = "btnOut";
+ this.btnOut.Size = new System.Drawing.Size(39, 29);
+ this.btnOut.TabIndex = 2;
+ this.btnOut.Text = "<<";
//
- // gridColumn4
+ // btnIn
//
- this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn5.FieldName = "wlmc";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 94;
- //
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 5;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- 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, 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);
+ this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.btnIn.Appearance.Options.UseForeColor = true;
+ this.btnIn.Location = new System.Drawing.Point(17, 191);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(39, 29);
+ this.btnIn.TabIndex = 1;
+ this.btnIn.Text = ">>";
//
// picCheckBox
//
@@ -858,51 +807,27 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
//
- // gridColumn8
+ // frm_CqfaItems1
//
- this.gridColumn8.Caption = "棰勮鏃ユ湡";
- this.gridColumn8.FieldName = "yjrq";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 115;
+ this.frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.frm_CqfaItems1.Location = new System.Drawing.Point(0, 0);
+ this.frm_CqfaItems1.Name = "frm_CqfaItems1";
+ this.frm_CqfaItems1.Size = new System.Drawing.Size(628, 415);
+ this.frm_CqfaItems1.TabIndex = 0;
//
- // gridColumn9
+ // frm_CqfaItems2
//
- this.gridColumn9.Caption = "淇濆�兼湡闄�";
- this.gridColumn9.FieldName = "bzqx";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 115;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "澶嶆闄愬��";
- this.gridColumn10.FieldName = "fjxz";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 6;
- this.gridColumn10.Width = 115;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "鏂规鍚嶇О";
- this.gridColumn11.FieldName = "famc";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 115;
+ this.frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.frm_CqfaItems2.Location = new System.Drawing.Point(0, 0);
+ this.frm_CqfaItems2.Name = "frm_CqfaItems2";
+ this.frm_CqfaItems2.Size = new System.Drawing.Size(476, 415);
+ this.frm_CqfaItems2.TabIndex = 0;
//
// Frm_Cqfa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1203, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -948,15 +873,23 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ this.splitContainerControl1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ this.splitContainerControl1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel1)).EndInit();
+ this.splitContainerControl2.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2.Panel2)).EndInit();
+ this.splitContainerControl2.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl2)).EndInit();
+ this.splitContainerControl2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -980,7 +913,6 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.SimpleButton btnSelect;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_bz;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
@@ -991,15 +923,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.Utils.ToolTipController tips;
@@ -1015,16 +938,19 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private UserControl.UcLookOrg txt_fSubsidiary;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl2;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraEditors.SimpleButton btnOut;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private Frm_CqfaItems frm_CqfaItems1;
+ private Frm_CqfaItems frm_CqfaItems2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
index 4aa4936..f72c7d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -15,7 +14,6 @@
{
string _webServiceName = "RkqcfaManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
- string _ucGys = "";//渚涘簲鍟�
public Frm_Cqfa()
{
InitializeComponent();
@@ -29,7 +27,6 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -43,47 +40,6 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //閫夋嫨闇�瑕佺殑鏄庣粏
- btnSelect.Click += (s, e) =>
- {
- //if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紒");
- // return;
- //}
- //var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
- ////璧嬪�肩粰鏄庣粏琛�
- //frm.UpdateParent += (ss, ee) =>
- //{
- // try
- // {
- // var lst = new List<string>();
- // lst = ee.StringList;
- // var _obj = lst;
- // var strReturn = UtilityHelper.HttpPost("",
- // _webServiceName + "SelectFormTo",
- // JsonConvert.SerializeObject(_obj));
- // var dt = UtilityHelper.ReturnToList(strReturn);
- // DataTable _newTable = dt.rtnData;
- // DataTable _oldTable = (DataTable)gcMx1.DataSource;
- // DataRow[] sourceRows = _newTable.Select();
- // for (int i = 0; i < sourceRows.Length; i++)
- // {
- // _oldTable.ImportRow(sourceRows[i]);
- // }
- // gcMx1.BindingContext = new BindingContext();
- // gcMx1.DataSource = _oldTable;
- // gcMx1.ForceInitialize();
- // gvMx1.BestFitColumns();
- // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- // }
- // catch (Exception ex)
- // {
- // MessageBox.Show(ex.Message);
- // }
- //};
- //frm.ShowDialog();
- };
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -244,12 +200,7 @@
txt_fabm.ReadOnly = true;
txt_fSubsidiary.Enabled = false;
}
- else
- {
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
- }
+
}
/// <summary>
/// 鏂板浜嬩欢
@@ -260,10 +211,6 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_fSubsidiary);
}
@@ -328,39 +275,7 @@
fabm = _fabm.Trim(),
bz = _bz.Trim(),
fSubsidiary = _fSubsidiary.Trim(),
- list = new List<dynamic>(),
};
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- {
- Guid _guid = UtilityHelper.ToGuid(row["id"].ToString());
- string _msl = row["sqNum"].ToString();
- if (string.IsNullOrEmpty(_msl))
- {
- MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
- return;
- }
- string _depotId = row["depotId"].ToString();
- if (string.IsNullOrEmpty(_depotId))
- {
- MsgHelper.ShowError("浠撳簱涓嶈兘涓虹┖锛�");
- return;
- }
- _obj.list.Add(new
- {
- Guid = _guid,
- AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
- Quantity = decimal.Parse(row["sqNum"].ToString()),
- Bz = row["remark"].ToString(),
- DepotId = row["depotId"].ToString(),
- });
- }
- }
try
{
var strJson = UtilityHelper.HttpPost("",
@@ -374,9 +289,7 @@
lbGuid.Text = _rtn.rtnData.outGuid;
txt_fabm.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
@@ -456,31 +369,8 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- _ucGys = dy.suppId;
lbGuid.Text = strGuid;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
- _ucGys = "";
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- }
- else
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -531,9 +421,11 @@
{
MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
else
@@ -544,54 +436,5 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
- /// <summary>
- /// 鍒犻櫎鏄庣粏
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- var rowhandle = gvMx1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx1.GetDataRow(rowhandle);
- var mxGuid = dr["id"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvMx1.DeleteRow(rowhandle);
- return;
- }
- var _obj = new
- {
- guid = lbGuid.Text.Trim(),
- mxGuid = mxGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelOrMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx
index 5160e8b..e7132ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
new file mode 100644
index 0000000..9aef4c6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
@@ -0,0 +1,193 @@
+锘縩amespace Gs.DevApp.DevFrm.RkQC
+{
+ partial class Frm_CqfaItems
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gvMain;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(877, 665);
+ this.gcMain.TabIndex = 9;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMain});
+ //
+ // gvMain
+ //
+ this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMain.Appearance.Row.Options.UseFont = true;
+ this.gvMain.ColumnPanelRowHeight = 50;
+ this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gv_guid,
+ this.gridColumn2,
+ this.gv2,
+ this.gv_salesOrderId,
+ this.gv_orderLineId,
+ this.gv_itemId});
+ this.gvMain.GridControl = this.gcMain;
+ this.gvMain.IndicatorWidth = 50;
+ this.gvMain.Name = "gvMain";
+ this.gvMain.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMain.OptionsView.ShowAutoFilterRow = true;
+ this.gvMain.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "浣跨敤缁勭粐";
+ this.gridColumn2.FieldName = "fSubsidiary";
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "org.FNumber";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 50;
+ //
+ // gv2
+ //
+ this.gv2.AppearanceCell.Options.UseFont = true;
+ this.gv2.Caption = "鐗╂枡ID";
+ this.gv2.FieldName = "id";
+ this.gv2.Name = "gv2";
+ this.gv2.OptionsColumn.AllowEdit = false;
+ this.gv2.Tag = "a.id";
+ this.gv2.Visible = true;
+ this.gv2.VisibleIndex = 1;
+ this.gv2.Width = 50;
+ //
+ // gv_salesOrderId
+ //
+ this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
+ this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜";
+ this.gv_salesOrderId.FieldName = "itemNo";
+ this.gv_salesOrderId.Name = "gv_salesOrderId";
+ this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
+ this.gv_salesOrderId.Tag = "a.item_no";
+ this.gv_salesOrderId.Visible = true;
+ this.gv_salesOrderId.VisibleIndex = 2;
+ this.gv_salesOrderId.Width = 50;
+ //
+ // gv_orderLineId
+ //
+ this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
+ this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
+ this.gv_orderLineId.FieldName = "itemName";
+ this.gv_orderLineId.Name = "gv_orderLineId";
+ this.gv_orderLineId.OptionsColumn.AllowEdit = false;
+ this.gv_orderLineId.Tag = "a.item_name";
+ this.gv_orderLineId.Visible = true;
+ this.gv_orderLineId.VisibleIndex = 3;
+ this.gv_orderLineId.Width = 50;
+ //
+ // gv_itemId
+ //
+ this.gv_itemId.AppearanceCell.Options.UseFont = true;
+ this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
+ this.gv_itemId.FieldName = "itemModel";
+ this.gv_itemId.Name = "gv_itemId";
+ this.gv_itemId.OptionsColumn.AllowEdit = false;
+ this.gv_itemId.Tag = "a.item_model";
+ this.gv_itemId.Width = 50;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 617);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(877, 48);
+ this.pageBar1.TabIndex = 10;
+ this.pageBar1.TotalPages = 0;
+ //
+ // Frm_CqfaItems
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pageBar1);
+ this.Controls.Add(this.gcMain);
+ this.Name = "Frm_CqfaItems";
+ this.Size = new System.Drawing.Size(877, 665);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMain;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+ private UserControls.Data.UcPageBar pageBar1;
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
new file mode 100644
index 0000000..d95335a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
@@ -0,0 +1,103 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.RkQC
+{
+ public partial class Frm_CqfaItems : DevExpress.XtraEditors.XtraUserControl
+ {
+ string strType = "iqc";
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ private readonly string _webServiceName = "MesQmCheckitemManager/";
+ public Frm_CqfaItems()
+ {
+ InitializeComponent();
+ pageBar1.setBar(false);
+ this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+ this.pageBar1.setBar(false);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
+ }
+
+ #region 婧愮墿鏂欐暟鎹粦瀹�
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gvMain.Columns, gvMain);
+ Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain.DataSource = null;
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ //_sbSqlWhere += " and q.guid is null";
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gvMain.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gvMain.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gvMain);
+ gvMain.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 8636031..63c3ef8 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -578,6 +578,12 @@
<Compile Include="DevFrm\RkQC\Frm_Cqfa.Designer.cs">
<DependentUpon>Frm_Cqfa.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqfaItems.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\RkQC\Frm_CqfaItems.Designer.cs">
+ <DependentUpon>Frm_CqfaItems.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\RkQC\Frm_Cqsq.cs">
<SubType>Form</SubType>
</Compile>
@@ -1528,6 +1534,9 @@
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
<DependentUpon>Frm_Cqfa.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_CqfaItems.resx">
+ <DependentUpon>Frm_CqfaItems.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
<DependentUpon>Frm_Cqsq.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3