From aaea9659e60f676bebc47b153aa227ebd730265c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 10:49:22 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 577 +++++++++++++++++++++--------------
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 3
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 14
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 51 ++-
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 14
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 16
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 35 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 41 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 36 ++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 113 +++++++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 19
13 files changed, 639 insertions(+), 292 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3168274..7074e85 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<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:8081/" />
+ <!--<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/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 0607b40..10d55fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -1332,9 +1332,8 @@
//
this.gridColumn8.Caption = "鐗╂枡ID";
this.gridColumn8.FieldName = "id";
- this.gridColumn8.MinWidth = 80;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 80;
+ this.gridColumn8.Width = 20;
//
// gridColumn9
//
@@ -1363,9 +1362,11 @@
this.gridColumn19.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn19.Caption = "Mes/Erp搴撳瓨";
this.gridColumn19.FieldName = "kcQty";
+ this.gridColumn19.MinWidth = 150;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 2;
+ this.gridColumn19.Width = 150;
//
// gridColumn10
//
@@ -1381,22 +1382,21 @@
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MaxWidth = 350;
- this.gridColumn11.MinWidth = 10;
+ this.gridColumn11.MinWidth = 120;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 10;
+ this.gridColumn11.Width = 120;
//
// gridColumn7
//
this.gridColumn7.Caption = "浣跨敤缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 5;
- this.gridColumn7.Width = 200;
+ this.gridColumn7.Width = 50;
//
// gvMx1qd002
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 8328e66..2cc91db 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -74,7 +74,8 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
}
catch (Exception ex)
{
@@ -407,7 +408,7 @@
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
- qtlx=qtlx,
+ qtlx = qtlx,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -767,7 +768,7 @@
gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
-
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
@@ -830,20 +831,28 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
+
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ if (string.IsNullOrEmpty(strItemId))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ return;
+ }
var strOrgGuid = txt_qt023.GetId();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨搴撳瓨缁勭粐锛�");
return;
}
- ;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index fb39544..9e06e3d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -1835,11 +1835,11 @@
// gridView2
//
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn7});
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1861,8 +1861,6 @@
this.gridColumn8.FieldName = "id";
this.gridColumn8.MinWidth = 80;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
this.gridColumn8.Width = 80;
//
// gridColumn9
@@ -1872,7 +1870,7 @@
this.gridColumn9.MinWidth = 100;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 2;
+ this.gridColumn9.VisibleIndex = 1;
this.gridColumn9.Width = 100;
//
// gridColumn10
@@ -1882,7 +1880,7 @@
this.gridColumn10.MinWidth = 120;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 3;
+ this.gridColumn10.VisibleIndex = 2;
this.gridColumn10.Width = 120;
//
// gridColumn11
@@ -1892,7 +1890,7 @@
this.gridColumn11.MinWidth = 120;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
+ this.gridColumn11.VisibleIndex = 3;
this.gridColumn11.Width = 120;
//
// gvMx1qd002
@@ -2079,7 +2077,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1330, 323);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1330, 319);
this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2088,7 +2086,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1330, 323);
+ this.gcMx2.Size = new System.Drawing.Size(1330, 319);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 1e0403b..1ed4291 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -704,6 +704,9 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+
}
/// <summary>
/// 绉诲嚭鏄庣粏
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index a5c0d4c..6820a70 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -39,16 +39,17 @@
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -109,29 +110,37 @@
this.txt_tbl026 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl025 = new DevExpress.XtraEditors.TextEdit();
this.txt_chkOut = new DevExpress.XtraEditors.CheckEdit();
+ this.checkEdit1 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl028 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tbl029 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tbl027 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -242,29 +251,37 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -665,7 +682,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1258, 592);
- this.splitMx1.SplitterPosition = 170;
+ this.splitMx1.SplitterPosition = 205;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -692,6 +709,10 @@
this.layoutMx1.Controls.Add(this.txt_tbl026);
this.layoutMx1.Controls.Add(this.txt_tbl025);
this.layoutMx1.Controls.Add(this.txt_chkOut);
+ this.layoutMx1.Controls.Add(this.checkEdit1);
+ this.layoutMx1.Controls.Add(this.txt_tbl028);
+ this.layoutMx1.Controls.Add(this.txt_tbl029);
+ this.layoutMx1.Controls.Add(this.txt_tbl027);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem7,
@@ -701,7 +722,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(55, 282, 812, 616);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1258, 170);
+ this.layoutMx1.Size = new System.Drawing.Size(1258, 205);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -717,7 +738,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(12, 167);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -727,15 +748,15 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 43);
+ this.txt_tbl023.Location = new System.Drawing.Point(114, 43);
this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl023.Size = new System.Drawing.Size(198, 24);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 105);
+ this.txt_tbl005.Location = new System.Drawing.Point(114, 105);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -745,16 +766,16 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(198, 24);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(393, 105);
+ this.txt_tbl006.Location = new System.Drawing.Point(114, 136);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(198, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
@@ -762,96 +783,96 @@
//
this.txt_tbl002.category = null;
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 74);
+ this.txt_tbl002.Location = new System.Drawing.Point(114, 74);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(198, 24);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(393, 43);
+ this.txt_workName.Location = new System.Drawing.Point(418, 43);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(233, 24);
+ this.txt_workName.Size = new System.Drawing.Size(198, 24);
this.txt_workName.StyleController = this.layoutMx1;
this.txt_workName.TabIndex = 298;
this.txt_workName.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(1011, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(722, 136);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(235, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(198, 24);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(233, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(198, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(393, 12);
+ this.txt_rwd.Location = new System.Drawing.Point(418, 12);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(233, 24);
+ this.txt_rwd.Size = new System.Drawing.Size(198, 24);
this.txt_rwd.StyleController = this.layoutMx1;
this.txt_rwd.TabIndex = 217;
this.txt_rwd.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(1011, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(722, 105);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(235, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(198, 24);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(393, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(418, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(233, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(198, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "readonly";
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(939, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(620, 167);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.txt_tbl013.Size = new System.Drawing.Size(307, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(300, 24);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 463;
this.txt_tbl013.Tag = "readonly";
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(702, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(722, 12);
this.txt_tbl009.Name = "txt_tbl009";
- this.txt_tbl009.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl009.Size = new System.Drawing.Size(198, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
this.txt_tbl009.TabIndex = 464;
this.txt_tbl009.Tag = "readonly";
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(702, 43);
+ this.txt_tbl010.Location = new System.Drawing.Point(722, 43);
this.txt_tbl010.Name = "txt_tbl010";
- this.txt_tbl010.Size = new System.Drawing.Size(233, 24);
+ this.txt_tbl010.Size = new System.Drawing.Size(198, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
this.txt_tbl010.TabIndex = 465;
this.txt_tbl010.Tag = "readonly";
@@ -868,9 +889,9 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(702, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(722, 74);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(233, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(198, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 467;
this.txt_itemNo.Tag = "readonly";
@@ -886,41 +907,79 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(702, 136);
+ this.txt_daa014.Location = new System.Drawing.Point(418, 105);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(233, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(198, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 469;
this.txt_daa014.Tag = "readonly";
//
// txt_tbl026
//
- this.txt_tbl026.Location = new System.Drawing.Point(1011, 105);
+ this.txt_tbl026.Location = new System.Drawing.Point(1026, 105);
this.txt_tbl026.Name = "txt_tbl026";
- this.txt_tbl026.Size = new System.Drawing.Size(235, 24);
+ this.txt_tbl026.Size = new System.Drawing.Size(199, 24);
this.txt_tbl026.StyleController = this.layoutMx1;
this.txt_tbl026.TabIndex = 470;
this.txt_tbl026.Tag = "readonly";
//
// txt_tbl025
//
- this.txt_tbl025.Location = new System.Drawing.Point(1011, 136);
+ this.txt_tbl025.Location = new System.Drawing.Point(1026, 136);
this.txt_tbl025.Name = "txt_tbl025";
- this.txt_tbl025.Size = new System.Drawing.Size(235, 24);
+ this.txt_tbl025.Size = new System.Drawing.Size(199, 24);
this.txt_tbl025.StyleController = this.layoutMx1;
this.txt_tbl025.TabIndex = 471;
this.txt_tbl025.Tag = "readonly";
//
// txt_chkOut
//
- this.txt_chkOut.Location = new System.Drawing.Point(630, 105);
+ this.txt_chkOut.Location = new System.Drawing.Point(316, 136);
this.txt_chkOut.Name = "txt_chkOut";
this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
- this.txt_chkOut.Size = new System.Drawing.Size(305, 24);
+ this.txt_chkOut.Size = new System.Drawing.Size(300, 24);
this.txt_chkOut.StyleController = this.layoutMx1;
this.txt_chkOut.TabIndex = 472;
+ //
+ // checkEdit1
+ //
+ this.checkEdit1.Location = new System.Drawing.Point(924, 167);
+ this.checkEdit1.Name = "checkEdit1";
+ this.checkEdit1.Properties.Caption = "鎵瑰噯鐘舵��";
+ this.checkEdit1.Size = new System.Drawing.Size(301, 24);
+ this.checkEdit1.StyleController = this.layoutMx1;
+ this.checkEdit1.TabIndex = 473;
+ this.checkEdit1.Tag = "readonly";
+ //
+ // txt_tbl028
+ //
+ this.txt_tbl028.Location = new System.Drawing.Point(1026, 43);
+ this.txt_tbl028.Name = "txt_tbl028";
+ this.txt_tbl028.Size = new System.Drawing.Size(199, 24);
+ this.txt_tbl028.StyleController = this.layoutMx1;
+ this.txt_tbl028.TabIndex = 475;
+ this.txt_tbl028.Tag = "readonly";
+ //
+ // txt_tbl029
+ //
+ this.txt_tbl029.Location = new System.Drawing.Point(1026, 12);
+ this.txt_tbl029.Name = "txt_tbl029";
+ this.txt_tbl029.Size = new System.Drawing.Size(199, 24);
+ this.txt_tbl029.StyleController = this.layoutMx1;
+ this.txt_tbl029.TabIndex = 476;
+ this.txt_tbl029.Tag = "readonly";
+ //
+ // txt_tbl027
+ //
+ this.txt_tbl027.Location = new System.Drawing.Point(924, 74);
+ this.txt_tbl027.Name = "txt_tbl027";
+ this.txt_tbl027.Properties.Caption = "鍝佽川瀹℃牳鐘舵��";
+ this.txt_tbl027.Size = new System.Drawing.Size(301, 24);
+ this.txt_tbl027.StyleController = this.layoutMx1;
+ this.txt_tbl027.TabIndex = 477;
+ this.txt_tbl027.Tag = "readonly";
//
// layoutControlItem7
//
@@ -962,25 +1021,29 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9,
- this.layoutControlItem10,
- this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem16,
this.layoutControlItem5,
this.layoutControlItem4,
this.layoutControlItem3,
- this.layoutControlItem15,
this.layoutControlItem18,
this.layoutControlItem1,
this.layoutControlItem8,
this.layoutControlItem6,
this.layoutControlItem2,
- this.layoutControlItem19,
+ this.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem16,
+ this.layoutControlItem36,
+ this.layoutControlItem37,
+ this.layoutControlItem38,
+ this.layoutControlItem35,
this.layoutControlItem20,
+ this.layoutControlItem19,
this.lab_daa014,
- this.layoutControlItem34});
+ this.layoutControlItem34,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1006,82 +1069,38 @@
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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1258, 175);
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1237, 206);
this.Root.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(927, 0);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(311, 31);
- this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(927, 31);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(311, 31);
- this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(927, 62);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(311, 31);
- this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_tbl009;
- this.layoutControlItem12.Location = new System.Drawing.Point(618, 0);
+ this.layoutControlItem12.Location = new System.Drawing.Point(608, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(309, 31);
- this.layoutControlItem12.Text = "鐢宠浜哄憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem12.Text = "鍒跺崟浜哄憳";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_tbl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(618, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(608, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(309, 31);
- this.layoutControlItem13.Text = "鐢宠鏃堕棿";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(100, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(309, 31);
- this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
+ this.layoutControlItem13.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem13.Text = "鍒跺崟鏃堕棿";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
@@ -1089,9 +1108,9 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
@@ -1099,9 +1118,9 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
@@ -1109,116 +1128,206 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_tbl006;
- this.layoutControlItem15.Location = new System.Drawing.Point(309, 93);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(309, 31);
- this.layoutControlItem15.Text = "澶囨敞璇存槑";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_itemNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(618, 62);
+ this.layoutControlItem18.Location = new System.Drawing.Point(608, 62);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem18.Text = "浜у搧缂栧彿";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(309, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(304, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem8.Text = "浜у搧鍚嶇О";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_workName;
- this.layoutControlItem6.Location = new System.Drawing.Point(309, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(304, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(309, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(304, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem19
+ // layoutControlItem9
//
- this.layoutControlItem19.Control = this.txt_tbl026;
- this.layoutControlItem19.Location = new System.Drawing.Point(927, 93);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(311, 31);
- this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.Control = this.txt_tbl011;
+ this.layoutControlItem9.Location = new System.Drawing.Point(608, 93);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜哄憳";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_tbl012;
+ this.layoutControlItem10.Location = new System.Drawing.Point(608, 124);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem10.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏃堕棿";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_tbl013;
+ this.layoutControlItem11.Location = new System.Drawing.Point(608, 155);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem11.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.btnSelect;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(100, 31);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem16.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txt_tbl029;
+ this.layoutControlItem36.Location = new System.Drawing.Point(912, 0);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem36.Size = new System.Drawing.Size(305, 31);
+ this.layoutControlItem36.Text = "鍝佽川瀹℃牳浜哄憳";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txt_tbl028;
+ this.layoutControlItem37.Location = new System.Drawing.Point(912, 31);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem37.Size = new System.Drawing.Size(305, 31);
+ this.layoutControlItem37.Text = "鍝佽川瀹℃牳鏃堕棿";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem38
+ //
+ this.layoutControlItem38.Control = this.txt_tbl027;
+ this.layoutControlItem38.Location = new System.Drawing.Point(912, 62);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem38.Size = new System.Drawing.Size(305, 31);
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem38.TextVisible = false;
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.checkEdit1;
+ this.layoutControlItem35.Location = new System.Drawing.Point(912, 155);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem35.Size = new System.Drawing.Size(305, 31);
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem35.TextVisible = false;
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_tbl025;
- this.layoutControlItem20.Location = new System.Drawing.Point(927, 124);
+ this.layoutControlItem20.Location = new System.Drawing.Point(912, 124);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(305, 31);
this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_tbl026;
+ this.layoutControlItem19.Location = new System.Drawing.Point(912, 93);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem19.Size = new System.Drawing.Size(305, 31);
+ this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// lab_daa014
//
this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(618, 124);
+ this.lab_daa014.Location = new System.Drawing.Point(304, 93);
this.lab_daa014.Name = "lab_daa014";
- this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(309, 31);
+ this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_daa014.Size = new System.Drawing.Size(304, 31);
this.lab_daa014.Text = "鎶曟枡鍗曞彿";
- this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
+ this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_chkOut;
- this.layoutControlItem34.Location = new System.Drawing.Point(618, 93);
+ this.layoutControlItem34.Location = new System.Drawing.Point(304, 124);
this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem34.Size = new System.Drawing.Size(304, 31);
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_tbl006;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem15.Size = new System.Drawing.Size(304, 31);
+ this.layoutControlItem15.Text = "澶囨敞璇存槑";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1226,7 +1335,7 @@
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(1258, 410);
+ this.tabMx.Size = new System.Drawing.Size(1258, 375);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1236,7 +1345,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1256, 378);
+ this.tabMxPage1.Size = new System.Drawing.Size(1256, 343);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// split99
@@ -1256,7 +1365,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1256, 378);
+ this.split99.Size = new System.Drawing.Size(1256, 343);
this.split99.SplitterPosition = 138;
this.split99.TabIndex = 1;
//
@@ -1297,11 +1406,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 51);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 35);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
this.ucBtnPrint1.TabIndex = 478;
//
// radOut
@@ -1315,7 +1424,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 35);
+ this.radOut.Size = new System.Drawing.Size(336, 32);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 477;
//
@@ -1323,11 +1432,11 @@
//
this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
- this.dataLayoutControl1.Location = new System.Drawing.Point(692, 90);
+ this.dataLayoutControl1.Location = new System.Drawing.Point(692, 84);
this.dataLayoutControl1.Name = "dataLayoutControl1";
this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
this.dataLayoutControl1.Root = this.layoutControlGroup2;
- this.dataLayoutControl1.Size = new System.Drawing.Size(336, 36);
+ this.dataLayoutControl1.Size = new System.Drawing.Size(336, 32);
this.dataLayoutControl1.TabIndex = 227;
this.dataLayoutControl1.Text = "dataLayoutControl1";
//
@@ -1366,12 +1475,12 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6});
+ rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 36);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -1382,7 +1491,7 @@
this.layoutControlItem30.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(168, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem30.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1393,7 +1502,7 @@
this.layoutControlItem29.CustomizationFormText = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.Size = new System.Drawing.Size(168, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem29.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1431,7 +1540,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 51);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 48);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1441,7 +1550,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 51);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 48);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1451,7 +1560,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 51);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1460,7 +1569,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 90);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 84);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1510,17 +1619,17 @@
columnDefinition8,
columnDefinition9,
columnDefinition10});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition8.Height = 100D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition9.Height = 100D;
rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
rowDefinition8,
- rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 138);
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1531,7 +1640,7 @@
this.layoutControlItem22.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem22.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1543,7 +1652,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem23.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1552,11 +1661,11 @@
this.layoutControlItem27.Control = this.txtWlgg;
this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem27.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem27.Location = new System.Drawing.Point(0, 78);
+ this.layoutControlItem27.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(680, 40);
+ this.layoutControlItem27.Size = new System.Drawing.Size(680, 36);
this.layoutControlItem27.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1565,10 +1674,10 @@
this.layoutControlItem24.Control = this.txtWlmc;
this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem24.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 39);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem24.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1577,11 +1686,11 @@
this.layoutControlItem25.Control = this.txt_yQty;
this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem25.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 39);
+ this.layoutControlItem25.Location = new System.Drawing.Point(340, 36);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem25.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1590,22 +1699,22 @@
this.layoutControlItem26.Control = this.txt_psnQty_1;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(680, 39);
+ this.layoutControlItem26.Location = new System.Drawing.Point(680, 36);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem26.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.dataLayoutControl1;
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 78);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 72);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 40);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem28.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1616,7 +1725,7 @@
this.layoutControlItem31.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem31.Text = "鑷姩璁＄畻";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1628,18 +1737,18 @@
this.layoutControlItem21.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem21.Text = "鐗╂枡缂栫爜";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.ucBtnPrint1;
- this.layoutControlItem32.Location = new System.Drawing.Point(1020, 39);
+ this.layoutControlItem32.Location = new System.Drawing.Point(1020, 36);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem32.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem32.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1653,7 +1762,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.rptBl});
- this.gcMx1.Size = new System.Drawing.Size(1256, 228);
+ this.gcMx1.Size = new System.Drawing.Size(1256, 193);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1940,7 +2049,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1256, 378);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1256, 343);
this.xtraTabPage3.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
@@ -1949,7 +2058,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1256, 378);
+ this.gcMx2.Size = new System.Drawing.Size(1256, 343);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2173,29 +2282,37 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2286,16 +2403,12 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.CheckEdit txt_tbl013;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.TextEdit txt_tbl009;
private DevExpress.XtraEditors.TextEdit txt_tbl010;
private DevExpress.XtraEditors.CheckEdit txt_tbl020;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2342,7 +2455,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -2354,8 +2466,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraEditors.TextEdit txt_tbl026;
private DevExpress.XtraEditors.TextEdit txt_tbl025;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraEditors.SplitContainerControl split99;
private DevExpress.XtraLayout.LayoutControl lay99;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
@@ -2387,10 +2497,25 @@
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraEditors.CheckEdit txt_chkOut;
- private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraEditors.CheckEdit checkEdit1;
+ private DevExpress.XtraEditors.TextEdit txt_tbl028;
+ private DevExpress.XtraEditors.TextEdit txt_tbl029;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.CheckEdit txt_tbl027;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 8924802..8758067 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -34,6 +34,8 @@
toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
+ toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -197,7 +199,7 @@
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
-
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -269,6 +271,24 @@
private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e)
{
_toolCk(3);
+ }
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(4);
+ }
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(5);
}
/// <summary>
/// 瀹℃牳浜嬩欢
@@ -447,7 +467,13 @@
}
if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
+ txt_tbl005.Focus();
+ return;
+ }
+ if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
txt_tbl005.Focus();
return;
}
@@ -715,6 +741,12 @@
case 3:
strMsg = "鍙嶆壒鍑�";
break;
+ case 4:
+ strMsg = "鍝佽川瀹℃牳";
+ break;
+ case 5:
+ strMsg = "鍝佽川鍙嶅鏍�";
+ break;
}
;
toolBarMenu1.guidKey = "";
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 23cca95..1daefa8 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1937,15 +1937,15 @@
edit.SelectAll();
}
- public static void SetGridLayout(GridView gridView1)
+ public static void SetGridLayout(GridView gridView1,int maxWidth=500)
{
foreach (GridColumn column in gridView1.Columns)
{
- if (column.Width > 500)
- column.Width = 500;
+ if (column.Width > maxWidth)
+ column.Width = maxWidth;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
index 34b78f4..fa83b6e 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -42,6 +42,7 @@
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -55,7 +56,7 @@
this.gcMain.Name = "gcMain";
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.Size = new System.Drawing.Size(751, 489);
this.gcMain.TabIndex = 3;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -69,7 +70,8 @@
this.gv_msg,
this.gv_userName,
this.gv_Btn,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -87,7 +89,7 @@
this.gv_operationTime.Tag = "query_OPERATION_TIME";
this.gv_operationTime.Visible = true;
this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 300;
+ this.gv_operationTime.Width = 10;
//
// gv_operationTable
//
@@ -100,7 +102,7 @@
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Visible = true;
this.gv_operationTable.VisibleIndex = 1;
- this.gv_operationTable.Width = 100;
+ this.gv_operationTable.Width = 10;
//
// gv_msg
//
@@ -113,7 +115,7 @@
this.gv_msg.Tag = "query_MSG";
this.gv_msg.Visible = true;
this.gv_msg.VisibleIndex = 2;
- this.gv_msg.Width = 200;
+ this.gv_msg.Width = 10;
//
// gv_userName
//
@@ -124,7 +126,7 @@
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
- this.gv_userName.Width = 250;
+ this.gv_userName.Width = 10;
//
// gv_Btn
//
@@ -133,16 +135,16 @@
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 4;
- this.gv_Btn.Width = 94;
+ this.gv_Btn.VisibleIndex = 5;
+ this.gv_Btn.Width = 25;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -154,14 +156,24 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 25;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn2.FieldName = "kcQty";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 94;
//
// SelectCk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
+ this.ClientSize = new System.Drawing.Size(751, 489);
this.Controls.Add(this.gcMain);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
@@ -187,5 +199,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index ca8220d..31d40d4 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -10,11 +10,19 @@
{
public partial class SelectCk : DevExpress.XtraEditors.XtraForm
{
+ /// <summary>
+ /// 缁勭粐id
+ /// </summary>
string _strGuid = "";
+ /// <summary>
+ /// 鐗╂枡id锛屼负浜嗘煡璇㈠簱瀛�
+ /// </summary>
+ string _itemId = "";
private List<FilterEntity> _filterList = new List<FilterEntity>();
- public SelectCk(string strGuid)
+ public SelectCk(string strGuid, string itemId="")
{
_strGuid = strGuid;
+ _itemId = itemId;
InitializeComponent();
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
@@ -45,9 +53,9 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += (" and org.fid='" + _strGuid + "'");
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString(),this._itemId);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 2a3bea3..2f0c056 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -63,6 +63,8 @@
this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnFPingZhi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -137,9 +139,11 @@
this.btnGongZi,
this.btnLianBan,
this.btnGx,
- this.btnBaoGao});
+ this.btnBaoGao,
+ this.btnPingZhi,
+ this.btnFPingZhi});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 76;
+ this.barManager1.MaxItemId = 78;
//
// bar2
//
@@ -182,6 +186,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnPingZhi),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnFPingZhi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnAll),
new DevExpress.XtraBars.LinkPersistInfo(this.btnGongZi),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLianBan),
@@ -495,6 +501,25 @@
this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnPingZhi
+ //
+ this.btnPingZhi.Caption = "鍝佽川瀹℃牳";
+ this.btnPingZhi.Id = 76;
+ this.btnPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.Image")));
+ this.btnPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPingZhi.ImageOptions.LargeImage")));
+ this.btnPingZhi.Name = "btnPingZhi";
+ this.btnPingZhi.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnFPingZhi
+ //
+ this.btnFPingZhi.Caption = "鍝佽川鍙嶅鏍�";
+ this.btnFPingZhi.Id = 77;
+ this.btnFPingZhi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.Image")));
+ this.btnFPingZhi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnFPingZhi.ImageOptions.LargeImage")));
+ this.btnFPingZhi.Name = "btnFPingZhi";
+ this.btnFPingZhi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnAll
//
this.btnAll.Caption = "鎵归噺璁剧疆";
@@ -620,7 +645,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 70);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -649,7 +674,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 72);
+ this.Size = new System.Drawing.Size(1543, 70);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -705,5 +730,7 @@
private DevExpress.XtraBars.BarLargeButtonItem btnLianBan;
private DevExpress.XtraBars.BarLargeButtonItem btnGx;
private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
+ private DevExpress.XtraBars.BarLargeButtonItem btnPingZhi;
+ private DevExpress.XtraBars.BarLargeButtonItem btnFPingZhi;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b62ed97..d3ffe88 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -65,21 +65,19 @@
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
+ btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
+ btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
+
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
lst.Add(item.Caption);
actions = lst;
-
-
-
-
}
+
-
-
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -88,7 +86,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -124,13 +121,11 @@
}
return false;
}
-
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
}
-
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
@@ -403,6 +398,17 @@
if (btnBaoGaoClick != null)
btnBaoGaoClick(this, e);
}
+ private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPingZhiClick != null)
+ btnFPingZhiClick(this, e);
+ }
+ private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPingZhiClick != null)
+ btnPingZhiClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -442,6 +448,8 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -450,7 +458,6 @@
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -495,6 +502,8 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -1032,6 +1041,17 @@
/// 鐢熸垚鎶ュ憡
/// </summary>
public event EventHandler btnBaoGaoClick;
+
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ public event EventHandler btnPingZhiClick;
+
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ public event EventHandler btnFPingZhiClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1175,7 +1195,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index ef3b42f..a2e9e79 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -311,6 +311,119 @@
AABJRU5ErkJggg==
</value>
</data>
+ <data name="btnPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFN0YWNrZWRCYXIzRDszRDsQhC4B
+ AAACTElEQVQ4T23Sy09TQRQG8PlzfC3cqXtduDICmqhEtInRqIhg0SAFBBHBWIuIQRuBYlFjeEiioWJ5
+ iVQTQI0mSOJGV5QiLX3Q3kfv7eeZU3qh4uLXSe8983XSb0R779cxggde6Qtre5rzGfd7slo90hxc3XO4
+ 1zXLnJ0zY6Kp4yMyQBZ9WOsWmXWAyTKob/sA0fgwwA8V1UBKTRMDSV7TvCb5e/bZmrLBpJS61imIm+3T
+ HCAHfr5/ifHmIozdLsTorQLUtPTgqjtgSaR0i0EBta5JCHkMeRyZ2ntmD8ylbpihLsz/DmBgYYU5vHM4
+ WNqPeFLPSmkwDBPVzgmIWtcUHyeRSqO7eDfCfhtmW/bhrOcb65kJ8mYpmtQQW9MQXdOhU0DVnXGIGuck
+ H0cmu4/ugvvITjwu2mFtynky9J02alhNUADR0yauNY9CXL87gbSRQYwCZLIc4sHcSsNSJCeepekGKpv8
+ EDJFozQeohdhHlBZmKzE/qVgJapwS+UNIxB2SlF1E2F6+WP8RV4L/sbDeNdwCI5mT14byxSQVHSU3fDl
+ B2xuwVwiwU7M/5re0kZeQEXjCBTNoGOpVguLz/dj8dmB/7ax95gby6spvguldcMQ5fVv+RL9odTNLTwq
+ 3I6Ogm15TcjNLu8nhCIpxOkPv+B4A1FW5+NLFFpV+MVmSxGFyHVDMCwluaHz1RRwsXaYL5F1y4isNEa/
+ IOVqZVyput6YinNVryFslUM+m30Ip+2vcIqUXBlEScUgTpYPsOLL/ZYTZTl9OH5J6vP9BTA7SFAVdssX
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="btnPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="btnFPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFN0YWNrZWRDb2x1bW4zRDszRDvW
+ itYeAAACs0lEQVQ4T2XS20sUURwH8PkbIrqgyBppIZuSCUUvGYQ9FD34kKCZZklSXtK08H7bpETH1bw9
+ 2Opm1oN5AS+r5WWxG5S2LwlRQRlFXnLvOzszO7vfzjnrbEkPn5nhzI/v+XF+h2t/ZJklcL+fes+0PVQt
+ Ma3GJej7qEW09C6CN7xjmh+8neUaul4jAASRR+j9n8AWwM8EUNv2Apyu4xVb9IoKBNFHKPCwt4+9g4Jr
+ bu9ffpJSrV8AV9/+kgWECslPlVo8vPgTV40WJvHWCFyCDIUEVLWYwdE2aDvBYnlL8JsWUud5M+a/umC0
+ WHE8dwBOQYKi+FHePA+uqmWBteMStu905EofnB6ZOdfwDBOfHUjuXkb8ZQPsbhkyCShtnANX2Wxm7dDC
+ s7opfLFKmCO7aVM74XBLTFLFGIaW7UjiLdCmdcHukiD7/Lh9dwZcWdM8fEoADhJwqnQUE5+cSDd8RFQy
+ T3aSmDf6HAjL3fjeehgj+adhdUqQZAUlDc+3B0xnn4Hb0ogVfTx6Eg6EAhbuZZKADhIQh8fZJ7YH0DYk
+ 0o6NtDWRchKupTv4xsejWxuJTafIzNSkQPjQRta1MKYfxW+7l425sG4aXDFJEWU/Nh0insRE4EdNHuZi
+ I9EavpMVUuOJCVhv18Ecq0FnVDjWyZqHTKmgxgSuSDcNr6SQQhH90WFYKcvB7CENmvbuwAZZo4aOabHK
+ V2LmYBj4iF1YtwlsvHnVk+AKa6fYJdogqYZ9e9ATSWh2w1RbhzWblxmI2w9jjAa90eEw1ddjzSrASUZ5
+ vWIcXEG1iV0cVkx+/GvV6t1Cv4N+bVIedrjXyklAbtUku0TqpaHoRBxkB5U6DTp/m0tkB24lh5tTOgYu
+ q2TUlFU8ikvFI8gkMm4OI6NoGBcLh0Iu3HjKpBWoBpGaTw2a/gBu+TxKuR3xJAAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnFPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+</value>
+ </data>
<data name="btnGongZi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
--
Gitblit v1.9.3