From 6beb321d3a6e9909d14a6e94d8e34195211201c5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 09:35:46 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.resx | 120 +++++++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.Designer.cs | 286 ++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 80 +++-
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs | 99 +++++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 327 ++++--------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 97 ++--
7 files changed, 690 insertions(+), 328 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 1c7e66e..0aa1f95 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -69,15 +69,14 @@
this.gv_wcUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_aboutGuid = new Gs.DevApp.UserControl.UcLookDaa();
- this.txt_bl010 = new Gs.DevApp.UserControl.UcLookCk();
this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_bl017 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl007 = new DevExpress.XtraEditors.TextEdit();
@@ -96,13 +95,10 @@
this.txt_bl005 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -114,26 +110,15 @@
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = 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.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
- this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -187,13 +172,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
@@ -205,13 +187,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).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.repositoryItemSearchLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
@@ -312,7 +295,6 @@
this.gv_wcUser,
this.gv_wcTime,
this.gridColumn9,
- this.gridColumn11,
this.gridColumn12});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
@@ -590,16 +572,6 @@
this.gridColumn9.VisibleIndex = 17;
this.gridColumn9.Width = 94;
//
- // gridColumn11
- //
- this.gridColumn11.Caption = "鍙戞枡浠撳簱鍚嶇О";
- this.gridColumn11.FieldName = "bl010Txt";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 18;
- this.gridColumn11.Width = 94;
- //
// gridColumn12
//
this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
@@ -607,7 +579,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 19;
+ this.gridColumn12.VisibleIndex = 18;
this.gridColumn12.Width = 94;
//
// pageBar1
@@ -652,9 +624,9 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_aboutGuid);
- this.layoutMx1.Controls.Add(this.txt_bl010);
this.layoutMx1.Controls.Add(this.txt_orgId);
this.layoutMx1.Controls.Add(this.txt_bl017);
this.layoutMx1.Controls.Add(this.txt_bl007);
@@ -682,6 +654,16 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(12, 111);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.StyleController = this.layoutMx1;
+ this.btnSelect.TabIndex = 444;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
+ //
// lbGuid
//
this.lbGuid.Location = new System.Drawing.Point(554, 108);
@@ -699,15 +681,6 @@
this.txt_aboutGuid.Name = "txt_aboutGuid";
this.txt_aboutGuid.Size = new System.Drawing.Size(195, 24);
this.txt_aboutGuid.TabIndex = 283;
- //
- // txt_bl010
- //
- this.txt_bl010.IsReadly = false;
- this.txt_bl010.Location = new System.Drawing.Point(89, 111);
- this.txt_bl010.Margin = new System.Windows.Forms.Padding(0);
- this.txt_bl010.Name = "txt_bl010";
- this.txt_bl010.Size = new System.Drawing.Size(195, 24);
- this.txt_bl010.TabIndex = 281;
//
// txt_orgId
//
@@ -730,7 +703,7 @@
//
// txt_bl007
//
- this.txt_bl007.Location = new System.Drawing.Point(89, 144);
+ this.txt_bl007.Location = new System.Drawing.Point(365, 144);
this.txt_bl007.Name = "txt_bl007";
this.txt_bl007.Properties.Appearance.Options.UseFont = true;
this.txt_bl007.Size = new System.Drawing.Size(471, 24);
@@ -881,13 +854,10 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem5,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem13,
- this.layoutControlItem14,
this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem17,
@@ -898,7 +868,10 @@
this.layoutControlItem3,
this.layoutControlItem19,
this.layoutControlItem15,
- this.layoutControlItem4});
+ this.layoutControlItem4,
+ this.layoutControlItem14,
+ this.layoutControlItem13,
+ this.layoutControlItem1});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -932,15 +905,6 @@
rowDefinition5});
this.Root.Size = new System.Drawing.Size(1126, 187);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_blNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem2
//
@@ -982,27 +946,6 @@
this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem10.Text = "琛ユ枡杞﹂棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_bl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 99);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 33);
- this.layoutControlItem13.Text = "鍙戞枡浠撳簱";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_bl007;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 132);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(552, 35);
- this.layoutControlItem14.Text = "鐢宠鍘熷洜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem11
//
@@ -1125,6 +1068,41 @@
this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
//
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_bl007;
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 132);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem14.Size = new System.Drawing.Size(552, 35);
+ this.layoutControlItem14.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.btnSelect;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem13.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_blNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1150,7 +1128,6 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1});
this.gcMx1.Size = new System.Drawing.Size(1124, 339);
this.gcMx1.TabIndex = 0;
@@ -1162,7 +1139,6 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
this.gvMx1mid,
- this.gvMx1bld012,
this.gvMx1bld002,
this.gvMx1bld003,
this.gvMx1bld004,
@@ -1206,140 +1182,6 @@
this.gvMx1mid.Tag = "query_a.mid";
this.gvMx1mid.Width = 94;
//
- // gvMx1bld012
- //
- this.gvMx1bld012.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1bld012.AppearanceCell.Options.UseFont = true;
- this.gvMx1bld012.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1bld012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1bld012.Caption = "閫夋嫨鐗╂枡";
- this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gvMx1bld012.MinWidth = 50;
- this.gvMx1bld012.Name = "gvMx1bld012";
- this.gvMx1bld012.Tag = "edit";
- this.gvMx1bld012.Visible = true;
- this.gvMx1bld012.VisibleIndex = 0;
- this.gvMx1bld012.Width = 94;
- //
- // repositoryItemSearchLookUpEdit1
- //
- this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
- this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemSearchLookUpEdit1.DisplayMember = "itemId";
- this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
- this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
- this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
- this.repositoryItemSearchLookUpEdit1.ValueMember = "itemId";
- this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
- //
- // gridView2
- //
- this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
- this.gridColumn8,
- this.gridColumn2,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn14,
- this.gridColumn15,
- this.gridColumn6,
- this.gridColumn16,
- this.gridColumn7});
- this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
- this.gridView2.Name = "gridView2";
- this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
- this.gridView2.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "椤规";
- this.gridColumn1.FieldName = "dab002";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鐗╂枡ID";
- this.gridColumn8.FieldName = "itemId";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鐗╂枡缂栫爜";
- this.gridColumn2.FieldName = "itemNo";
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn3.FieldName = "itemName";
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MaxWidth = 200;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鍗曚綅";
- this.gridColumn5.FieldName = "dwName";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- //
- // gridColumn14
- //
- this.gridColumn14.Caption = "闇�棰嗙敤閲�";
- this.gridColumn14.FieldName = "dab006";
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 6;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "宸查鐢ㄩ噺";
- this.gridColumn15.FieldName = "ylQty";
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 7;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "琛ユ枡鏁伴噺";
- this.gridColumn6.FieldName = "blQty";
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 8;
- //
- // gridColumn16
- //
- this.gridColumn16.Caption = "瓒呴鏁伴噺";
- this.gridColumn16.FieldName = "clQty";
- this.gridColumn16.Name = "gridColumn16";
- this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 9;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "琛孖D";
- this.gridColumn7.FieldName = "dabGuid";
- this.gridColumn7.Name = "gridColumn7";
- //
// gvMx1bld002
//
this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
@@ -1350,7 +1192,7 @@
this.gvMx1bld002.OptionsColumn.ReadOnly = true;
this.gvMx1bld002.Tag = "query_a.bld002";
this.gvMx1bld002.Visible = true;
- this.gvMx1bld002.VisibleIndex = 1;
+ this.gvMx1bld002.VisibleIndex = 0;
this.gvMx1bld002.Width = 100;
//
// gvMx1bld003
@@ -1363,7 +1205,7 @@
this.gvMx1bld003.OptionsColumn.ReadOnly = true;
this.gvMx1bld003.Tag = "query_a.bld003";
this.gvMx1bld003.Visible = true;
- this.gvMx1bld003.VisibleIndex = 2;
+ this.gvMx1bld003.VisibleIndex = 1;
this.gvMx1bld003.Width = 120;
//
// gvMx1bld004
@@ -1376,7 +1218,7 @@
this.gvMx1bld004.OptionsColumn.ReadOnly = true;
this.gvMx1bld004.Tag = "query_a.bld004";
this.gvMx1bld004.Visible = true;
- this.gvMx1bld004.VisibleIndex = 3;
+ this.gvMx1bld004.VisibleIndex = 2;
this.gvMx1bld004.Width = 120;
//
// gvMx1bld006
@@ -1404,7 +1246,7 @@
this.gvMx1bld007.Name = "gvMx1bld007";
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
- this.gvMx1bld007.VisibleIndex = 4;
+ this.gvMx1bld007.VisibleIndex = 3;
this.gvMx1bld007.Width = 94;
//
// gvMx1bld008
@@ -1417,7 +1259,7 @@
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
- this.gvMx1bld008.VisibleIndex = 5;
+ this.gvMx1bld008.VisibleIndex = 4;
this.gvMx1bld008.Width = 94;
//
// gvMx1bld009
@@ -1430,7 +1272,7 @@
this.gvMx1bld009.OptionsColumn.ReadOnly = true;
this.gvMx1bld009.Tag = "query_a.bld009";
this.gvMx1bld009.Visible = true;
- this.gvMx1bld009.VisibleIndex = 6;
+ this.gvMx1bld009.VisibleIndex = 5;
this.gvMx1bld009.Width = 94;
//
// gvMx1bld010
@@ -1446,7 +1288,7 @@
this.gvMx1bld010.Name = "gvMx1bld010";
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
- this.gvMx1bld010.VisibleIndex = 7;
+ this.gvMx1bld010.VisibleIndex = 6;
this.gvMx1bld010.Width = 150;
//
// gvMx1bld014
@@ -1477,7 +1319,7 @@
this.gvMx1bld001.OptionsColumn.ReadOnly = true;
this.gvMx1bld001.Tag = "query_a.bld001";
this.gvMx1bld001.Visible = true;
- this.gvMx1bld001.VisibleIndex = 8;
+ this.gvMx1bld001.VisibleIndex = 7;
this.gvMx1bld001.Width = 94;
//
// gvMxDel
@@ -1487,7 +1329,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 10;
+ this.gvMxDel.VisibleIndex = 9;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1516,7 +1358,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 9;
+ this.gridColumn13.VisibleIndex = 8;
this.gridColumn13.Width = 94;
//
// picCheckBox
@@ -1575,13 +1417,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
@@ -1593,13 +1432,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).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.repositoryItemSearchLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1640,7 +1480,6 @@
private UserControl.UcLookOrg txt_orgId;
private DevExpress.XtraEditors.TextEdit txt_bl017;
private UserControl.UcLookDaa txt_aboutGuid;
- private UserControl.UcLookCk txt_bl010;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_bl016;
private DevExpress.XtraEditors.TextEdit txt_bl015;
@@ -1654,12 +1493,10 @@
private DevExpress.XtraEditors.TextEdit txt_blNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraEditors.CheckEdit txt_bl018;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1668,17 +1505,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld012;
- private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld002;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld004;
@@ -1693,11 +1519,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraEditors.TextEdit txt_tldh;
private DevExpress.XtraEditors.TextEdit txt_bl004;
private DevExpress.XtraEditors.TextEdit txt_bl005;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
@@ -1712,8 +1536,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 01fde4a..9e449e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -14,7 +14,6 @@
{
public partial class UcBlcl : DevExpress.XtraEditors.XtraUserControl
{
- string _ucCk = "";//浠撳簱
string _ucGd = "";//宸ュ崟
string _webServiceName = "MesItemBlManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
@@ -61,13 +60,7 @@
{
string orgdId = txt_orgId.GetId();
if (string.IsNullOrEmpty(orgdId)) return;
- txt_bl010.getSuppler(orgdId, _ucCk);
txt_aboutGuid.getSuppler(orgdId, _ucGd, "and ( daa018<>'S:鏆傚仠') and ( daa018<>'W:瀹屽伐')");
- };
- //璁剧疆浠撳簱閫夋嫨
- this.txt_bl010.EditChanged += (s, e) =>
- {
-
};
//璁剧疆宸ュ崟
this.txt_aboutGuid.EditChanged += (s, e) =>
@@ -103,6 +96,58 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ };
+
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_orgId.GetId()))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鐢熶骇缁勭粐锛�");
+ txt_orgId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(this.txt_aboutGuid.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢熶骇宸ュ崟锛�");
+ return;
+ }
+ var frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ int idx = 1;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["bld001"] = dym.gdh;//宸ュ崟鍙�
+ _row["bld002"] = dym.itemNo;//鐗╂枡缂栧彿
+ _row["bld003"] = dym.itemName;//鐗╂枡鍚嶇О
+ _row["bld004"] = dym.itemModel;//瑙勬牸鍨嬪彿
+ _row["dwName"] = dym.dwName;
+ _row["dabGuid"] = dym.dabGuid;
+ _row["bld013"] = idx.ToString();//椤规
+ _Table.Rows.Add(_row);
+ idx++;
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -298,7 +343,6 @@
toolBarMenu1.isSetBtn = false;
string inOrgId = txt_orgId.GetId();//宸ュ崟鍙�
string inGdId = txt_aboutGuid.GetId();//宸ュ崟鍙�
- string inCkId = txt_bl010.GetId();//鍙戞枡浠�
if (string.IsNullOrEmpty(inGdId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ュ崟锛�");
@@ -309,12 +353,6 @@
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ュ崟锛�");
txt_aboutGuid.Focus();
- return;
- }
- if (string.IsNullOrEmpty(inCkId))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_bl010.Focus();
return;
}
if (string.IsNullOrEmpty(txt_bl017.Text.Trim()))
@@ -328,7 +366,6 @@
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
inOrgId = inOrgId,//宸ュ崟鍙�
inGdId = inGdId,//宸ュ崟鍙�
- inCkId = inCkId,//浠撳簱
inYy = txt_bl007.Text.Trim(),//鍘熷洜
inType = txt_bl017.Text.Trim(),
list = new List<dynamic>(),
@@ -456,13 +493,11 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- _ucCk = dy.bl010;
_ucGd = dy.aboutGuid;
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);
- _ucCk = "";
_ucGd = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -569,17 +604,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- }
- private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
- {
- SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
- DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
- gvMx1.SetFocusedRowCellValue("bld001", SelectedDataRow["gdh"]);
- gvMx1.SetFocusedRowCellValue("bld002", SelectedDataRow["itemNo"]);
- gvMx1.SetFocusedRowCellValue("bld003", SelectedDataRow["itemName"]);
- gvMx1.SetFocusedRowCellValue("bld004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("dwName", SelectedDataRow["dwName"]);
- gvMx1.SetFocusedRowCellValue("dabGuid", SelectedDataRow["dabGuid"]);
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.Designer.cs
new file mode 100644
index 0000000..eff4be4
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.Designer.cs
@@ -0,0 +1,286 @@
+锘縩amespace Gs.DevApp.DevFrm.Ck
+{
+ partial class UcBlclSelect
+ {
+ /// <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 Windows Form 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.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = 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.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.panelControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1128, 682);
+ this.panelControl2.TabIndex = 4;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(2, 2);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1124, 635);
+ this.gcMain.TabIndex = 2;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn10,
+ this.gridColumn11});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 60;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "椤规";
+ this.gridColumn1.FieldName = "dab002";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡ID";
+ this.gridColumn2.FieldName = "itemId";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ 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 = "itemModel";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍗曚綅";
+ this.gridColumn6.FieldName = "dwName";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "闇�棰嗙敤閲�";
+ this.gridColumn7.FieldName = "dab006";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "宸查鐢ㄩ噺";
+ this.gridColumn8.FieldName = "ylQty";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 8;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "琛ユ枡鏁伴噺";
+ this.gridColumn9.FieldName = "blQty";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 9;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "瓒呴鏁伴噺";
+ this.gridColumn10.FieldName = "clQty";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 10;
+ this.gridColumn10.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "dabGuid";
+ this.gridColumn11.FieldName = "dabGuid";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn11.Width = 94;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(2, 637);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1124, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnIn.Location = new System.Drawing.Point(1028, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // UcBlclSelect
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "UcBlclSelect";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈敹鏁伴噺澶т簬0鐨�";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private DevExpress.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
new file mode 100644
index 0000000..db7972e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
@@ -0,0 +1,99 @@
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Ck
+{
+ public partial class UcBlclSelect : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly string _webServiceName = "WomdaaManager/";
+ private string daaId = "";
+ private string orgId = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_daaGuid">daaGuid</param>
+ /// <param name="_orgId">鐢熶骇缁勭粐</param>
+ public UcBlclSelect(string _daaGuid, string _orgId)
+ {
+ InitializeComponent();
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ 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.daaId = _daaGuid;
+ this.orgId = _orgId;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ var list = new List<dynamic>();
+ DataTable dt = this.gcMain.DataSource as DataTable;
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["dabGuid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(new
+ {
+ dabGuid = _guid,
+ dwName = dr["dwName"].ToString(),
+ itemModel = dr["itemModel"].ToString(),
+ itemName = dr["itemName"].ToString(),
+ itemNo = dr["itemNo"].ToString(),
+ gdh = dr["gdh"].ToString(),
+ });
+ }
+ }
+ }
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _obj = new
+ {
+ currentPage = 1,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ daaGuid = daaId
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListSelectDab", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.resx b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.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/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index ffc5015..b2d984f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -104,6 +104,9 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -146,9 +149,6 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -192,6 +192,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -201,9 +204,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -521,7 +521,7 @@
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1007, 106, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1231, 149);
this.layoutMx1.TabIndex = 0;
@@ -551,7 +551,7 @@
this.txt_remark.Location = new System.Drawing.Point(401, 76);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(515, 24);
+ this.txt_remark.Size = new System.Drawing.Size(212, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
@@ -656,7 +656,7 @@
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(401, 108);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(704, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
@@ -848,6 +848,42 @@
this.layoutControlItem5.Size = new System.Drawing.Size(303, 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(302, 64);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(303, 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, 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(302, 33);
+ this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // lab_paperBillNo
+ //
+ this.lab_paperBillNo.Control = this.txt_paperBillNo;
+ this.lab_paperBillNo.Location = new System.Drawing.Point(605, 64);
+ this.lab_paperBillNo.Name = "lab_paperBillNo";
+ this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
+ this.lab_paperBillNo.Size = new System.Drawing.Size(303, 32);
+ this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
+ this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -1345,43 +1381,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(302, 64);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(606, 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, 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(302, 33);
- this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // lab_paperBillNo
- //
- this.lab_paperBillNo.Control = this.txt_paperBillNo;
- this.lab_paperBillNo.Location = new System.Drawing.Point(302, 96);
- this.lab_paperBillNo.Name = "lab_paperBillNo";
- this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 1;
- this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 3;
- this.lab_paperBillNo.Size = new System.Drawing.Size(303, 33);
- this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
- this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
- //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1435,6 +1434,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1444,9 +1446,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 70698c3..585e874 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -311,6 +311,12 @@
<Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs">
<DependentUpon>UcBlclDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Ck\UcBlclSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Ck\UcBlclSelect.Designer.cs">
+ <DependentUpon>UcBlclSelect.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\FQC\Frm_Fqc.cs">
<SubType>Form</SubType>
</Compile>
@@ -1341,6 +1347,9 @@
<EmbeddedResource Include="DevFrm\Ck\UcBlclDj.resx">
<DependentUpon>UcBlclDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Ck\UcBlclSelect.resx">
+ <DependentUpon>UcBlclSelect.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\FQC\Frm_Fqc.resx">
<DependentUpon>Frm_Fqc.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3