From 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 34 -
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 27
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 34
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 4
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 96 ++--
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 129 +++++++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 4
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 52 +-
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 682 +++++++++++++++++++++++++++++++++----
10 files changed, 849 insertions(+), 217 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index e334ef9..508666e 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -770,7 +770,8 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
- getGxList(dy.aboutGuid.ToString());
+ //2025-09-16 kyy
+ // getGxList(dy.aboutGuid.ToString());
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -780,34 +781,35 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+ //2025-09-16 kyy
/// <summary>
/// 璇诲彇宸ュ簭
/// </summary>
/// <param name="daaGuid"></param>
- private void getGxList(string daaGuid)
- {
- txt_fmrmode.Properties.Items.Clear();
- var _obj = new
- {
- guid = daaGuid,
- };
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "WomdaaManager/GetGyList", json);
- var dd = UtilityHelper.ReturnToList(strReturn);
- var dt = dd.rtnData;
- foreach (DataRow row in dt.Rows)
- {
- txt_fmrmode.Properties.Items.Add(row["processNo"].ToString());
- }
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
+
+ //private void getGxList(string daaGuid)
+ //{
+ // txt_fmrmode.Properties.Items.Clear();
+ // var _obj = new
+ // {
+ // guid = daaGuid,
+ // };
+ // var json = JsonConvert.SerializeObject(_obj);
+ // try
+ // {
+ // var strReturn = UtilityHelper.HttpPost("", "WomdaaManager/GetGyList", json);
+ // var dd = UtilityHelper.ReturnToList(strReturn);
+ // var dt = dd.rtnData;
+ // foreach (DataRow row in dt.Rows)
+ // {
+ // txt_fmrmode.Properties.Items.Add(row["processNo"].ToString());
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ // }
+ //}
/// <summary>
/// 閫夐」鍗″垏鎹�
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index ec5bacb..3b0da40 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -400,8 +400,8 @@
Memo = row["memo"].ToString(),
FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
- //ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
- ypsl = _ycsl,
+ ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ // ypsl = _ycsl,
stationName = row["stationName"].ToString(),
FcheckType = row["FcheckType"].ToString(),
isRzxx = _isRzxx,
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 3215710..20af9e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -62,31 +62,23 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
+ this.toolBarMenu1.rptParameter = "return false";
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎵撳嵃鐨勫崟鎹紒");
return;
}
+ string rptParameter = "rpt_Cgrk{"
+ + rowGuid // @inOrderGuid - 鍗曟嵁guid
+ + "," + "100" // @isDesign - 閲嶆墦閮芥槸浼�100
+ + "," + "" // @in1 - 鍏ュ簱鏃堕棿锛堟墿灞曠敤锛�
+ + "," + "" // @in2 - 鐗归噰锛堟墿灞曠敤锛�
+ + "," + "" // @in3 - 渚涘簲鍟唅d锛堟墿灞曠敤锛�
+ + "," + "" // @in4 - 寮犳暟锛堟墿灞曠敤锛�
+ + "," + "" // @in5 - 鏁伴噺锛堟墿灞曠敤锛�
+ + "," + "" // @in6 - 鎵╁睍鐢�
+ + "}";
+ this.toolBarMenu1.rptParameter = rptParameter;
+ this.toolBarMenu1.guidKey = rowGuid;
- try
- {
- string rptParameter = "rpt_Cgrk{"
- + rowGuid // @inOrderGuid - 鍗曟嵁guid
- + "," + "100" // @isDesign - 閲嶆墦閮芥槸浼�100
- + "," + "" // @in1 - 鍏ュ簱鏃堕棿锛堟墿灞曠敤锛�
- + "," + "" // @in2 - 鐗归噰锛堟墿灞曠敤锛�
- + "," + "" // @in3 - 渚涘簲鍟唅d锛堟墿灞曠敤锛�
- + "," + "" // @in4 - 寮犳暟锛堟墿灞曠敤锛�
- + "," + "" // @in5 - 鏁伴噺锛堟墿灞曠敤锛�
- + "," + "" // @in6 - 鎵╁睍鐢�
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
- {
- rpt.ShowDialog();
- }
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
index 9535b70..458989a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -29,12 +29,20 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -52,7 +60,36 @@
this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
- this.gv_cgy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_itemBarcode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txt_quantity = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotSectionsCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ownerName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_indepUserCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_indepDate = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -63,6 +100,39 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemBarcode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotSectionsCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ownerName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_indepUserCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_indepDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -74,10 +144,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1051, 62);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -85,21 +155,20 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1051, 468);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
+ this.xtraTabPage1,
+ this.xtraTabPage2});
//
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1049, 442);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -108,7 +177,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -121,19 +189,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1049, 442);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1049, 402);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -142,6 +208,7 @@
//
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gv_guid,
this.gv_itemId,
this.gridColumn3,
@@ -157,238 +224,622 @@
this.gv_ownerId,
this.gridColumn5,
this.gv_indepUserCode,
- this.gv_indepDate,
- this.gv_cgy});
- this.gridView1.DetailHeight = 272;
+ this.gv_indepDate});
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 44;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 68;
+ //
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 44;
+ this.gv_guid.MinWidth = 50;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 82;
+ this.gv_guid.Width = 94;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID ";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 44;
+ this.gv_itemId.MinWidth = 50;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.ITEM_ID";
- this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 0;
- this.gv_itemId.Width = 70;
+ this.gv_itemId.Width = 73;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 22;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 70;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 22;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 70;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 94;
//
// gridColumn4
//
this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MinWidth = 22;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 70;
+ this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.Width = 94;
//
// gv_itemBarcode
//
this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
this.gv_itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gv_itemBarcode.FieldName = "itemBarcode";
- this.gv_itemBarcode.MinWidth = 44;
+ this.gv_itemBarcode.MinWidth = 50;
this.gv_itemBarcode.Name = "gv_itemBarcode";
this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gv_itemBarcode.Visible = true;
- this.gv_itemBarcode.VisibleIndex = 4;
- this.gv_itemBarcode.Width = 70;
+ this.gv_itemBarcode.VisibleIndex = 1;
+ this.gv_itemBarcode.Width = 94;
//
// gv_quantity
//
+ this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
this.gv_quantity.Caption = "鏁伴噺 ";
this.gv_quantity.FieldName = "quantity";
- this.gv_quantity.MinWidth = 44;
+ this.gv_quantity.MinWidth = 50;
this.gv_quantity.Name = "gv_quantity";
this.gv_quantity.OptionsColumn.AllowEdit = false;
this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gv_quantity.Tag = "query_a.QUANTITY";
this.gv_quantity.Visible = true;
- this.gv_quantity.VisibleIndex = 5;
- this.gv_quantity.Width = 70;
+ this.gv_quantity.VisibleIndex = 2;
+ this.gv_quantity.Width = 94;
//
// gv_depotId
//
this.gv_depotId.AppearanceCell.Options.UseFont = true;
this.gv_depotId.Caption = "浠撳簱ID";
this.gv_depotId.FieldName = "depotId";
- this.gv_depotId.MinWidth = 44;
+ this.gv_depotId.MinWidth = 50;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
- this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 6;
- this.gv_depotId.Width = 70;
+ this.gv_depotId.Width = 73;
//
// gridColumn6
//
this.gridColumn6.Caption = "浠撳簱缂栧彿";
this.gridColumn6.FieldName = "depotNo";
- this.gridColumn6.MinWidth = 22;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
- this.gridColumn6.Width = 70;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "浠撳簱鍚嶇О";
this.gridColumn1.FieldName = "depotName";
- this.gridColumn1.MinWidth = 22;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 8;
- this.gridColumn1.Width = 70;
+ this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.Width = 94;
//
// gv_depotSectionsCode
//
this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotSectionsCode.Caption = "璐т綅缂栧彿";
this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
- this.gv_depotSectionsCode.MinWidth = 44;
+ this.gv_depotSectionsCode.MinWidth = 50;
this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
this.gv_depotSectionsCode.Visible = true;
- this.gv_depotSectionsCode.VisibleIndex = 9;
- this.gv_depotSectionsCode.Width = 70;
+ this.gv_depotSectionsCode.VisibleIndex = 8;
+ this.gv_depotSectionsCode.Width = 94;
//
// gv_ownerType
//
this.gv_ownerType.AppearanceCell.Options.UseFont = true;
this.gv_ownerType.Caption = "璐т富绫诲瀷";
this.gv_ownerType.FieldName = "ownerType";
- this.gv_ownerType.MinWidth = 44;
+ this.gv_ownerType.MinWidth = 50;
this.gv_ownerType.Name = "gv_ownerType";
this.gv_ownerType.OptionsColumn.AllowEdit = false;
this.gv_ownerType.Tag = "query_a.Owner_Type";
- this.gv_ownerType.Visible = true;
- this.gv_ownerType.VisibleIndex = 10;
- this.gv_ownerType.Width = 70;
+ this.gv_ownerType.Width = 73;
//
// gv_ownerId
//
this.gv_ownerId.AppearanceCell.Options.UseFont = true;
this.gv_ownerId.Caption = "璐т富ID";
this.gv_ownerId.FieldName = "ownerId";
- this.gv_ownerId.MinWidth = 44;
+ this.gv_ownerId.MinWidth = 50;
this.gv_ownerId.Name = "gv_ownerId";
this.gv_ownerId.OptionsColumn.AllowEdit = false;
this.gv_ownerId.Tag = "query_a.Owner_Id";
- this.gv_ownerId.Visible = true;
- this.gv_ownerId.VisibleIndex = 11;
- this.gv_ownerId.Width = 70;
+ this.gv_ownerId.Width = 73;
//
// gridColumn5
//
this.gridColumn5.Caption = "璐т富鍚嶇О";
this.gridColumn5.FieldName = "ownerName";
- this.gridColumn5.MinWidth = 22;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 12;
- this.gridColumn5.Width = 70;
+ this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.Width = 94;
//
// gv_indepUserCode
//
this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
this.gv_indepUserCode.Caption = "鍏ュ簱浜�";
this.gv_indepUserCode.FieldName = "indepUserCode";
- this.gv_indepUserCode.MinWidth = 44;
+ this.gv_indepUserCode.MinWidth = 50;
this.gv_indepUserCode.Name = "gv_indepUserCode";
this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
this.gv_indepUserCode.Visible = true;
- this.gv_indepUserCode.VisibleIndex = 13;
- this.gv_indepUserCode.Width = 67;
+ this.gv_indepUserCode.VisibleIndex = 11;
+ this.gv_indepUserCode.Width = 72;
//
// gv_indepDate
//
this.gv_indepDate.AppearanceCell.Options.UseFont = true;
this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 ";
this.gv_indepDate.FieldName = "indepDate";
- this.gv_indepDate.MinWidth = 9;
+ this.gv_indepDate.MinWidth = 10;
this.gv_indepDate.Name = "gv_indepDate";
this.gv_indepDate.OptionsColumn.AllowEdit = false;
this.gv_indepDate.Tag = "query_a.INDEP_DATE";
this.gv_indepDate.Visible = true;
- this.gv_indepDate.VisibleIndex = 14;
- this.gv_indepDate.Width = 26;
+ this.gv_indepDate.VisibleIndex = 10;
+ this.gv_indepDate.Width = 88;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 402);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1049, 30);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
- // gv_cgy
+ // xtraTabPage2
//
- this.gv_cgy.Caption = "浠撶鍛�";
- this.gv_cgy.FieldName = "cgy";
- this.gv_cgy.Name = "gv_cgy";
- this.gv_cgy.Tag = "st.staff_name";
- this.gv_cgy.Visible = true;
- this.gv_cgy.VisibleIndex = 15;
- this.gv_cgy.Width = 66;
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(2);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(2);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 116;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.ucBtnPrint101);
+ this.layoutMx1.Controls.Add(this.txt_depotName);
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_itemBarcode);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_quantity);
+ this.layoutMx1.Controls.Add(this.txt_depotNo);
+ this.layoutMx1.Controls.Add(this.txt_depotSectionsCode);
+ this.layoutMx1.Controls.Add(this.txt_ownerName);
+ this.layoutMx1.Controls.Add(this.txt_indepUserCode);
+ this.layoutMx1.Controls.Add(this.txt_indepDate);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem24});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(2);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(714, 430, 975, 600);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 116);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutMx1";
+ //
+ // ucBtnPrint101
+ //
+ this.ucBtnPrint101.allClickKey = null;
+ this.ucBtnPrint101.guidKey = null;
+ this.ucBtnPrint101.Location = new System.Drawing.Point(825, 78);
+ this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint101.Name = "ucBtnPrint101";
+ this.ucBtnPrint101.rptParameter = null;
+ this.ucBtnPrint101.Size = new System.Drawing.Size(268, 29);
+ this.ucBtnPrint101.TabIndex = 224;
+ //
+ // txt_depotName
+ //
+ this.txt_depotName.Location = new System.Drawing.Point(626, 45);
+ this.txt_depotName.Name = "txt_depotName";
+ this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotName.Size = new System.Drawing.Size(195, 24);
+ this.txt_depotName.StyleController = this.layoutMx1;
+ this.txt_depotName.TabIndex = 222;
+ this.txt_depotName.Tag = "creatDate";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(564, 90);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(272, 35);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_itemBarcode
+ //
+ this.txt_itemBarcode.Location = new System.Drawing.Point(897, 12);
+ this.txt_itemBarcode.Name = "txt_itemBarcode";
+ this.txt_itemBarcode.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemBarcode.Size = new System.Drawing.Size(196, 24);
+ this.txt_itemBarcode.StyleController = this.layoutMx1;
+ this.txt_itemBarcode.TabIndex = 222;
+ this.txt_itemBarcode.Tag = "itemBarcode";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 222;
+ this.txt_itemNo.Tag = "itemNo";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(355, 12);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 222;
+ this.txt_itemName.Tag = "itemName";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(626, 12);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemModel.StyleController = this.layoutMx1;
+ this.txt_itemModel.TabIndex = 222;
+ this.txt_itemModel.Tag = "itemModel";
+ //
+ // txt_quantity
+ //
+ this.txt_quantity.Location = new System.Drawing.Point(84, 45);
+ this.txt_quantity.Name = "txt_quantity";
+ this.txt_quantity.Properties.Appearance.Options.UseFont = true;
+ this.txt_quantity.Size = new System.Drawing.Size(195, 24);
+ this.txt_quantity.StyleController = this.layoutMx1;
+ this.txt_quantity.TabIndex = 222;
+ this.txt_quantity.Tag = "quantity";
+ //
+ // txt_depotNo
+ //
+ this.txt_depotNo.Location = new System.Drawing.Point(355, 45);
+ this.txt_depotNo.Name = "txt_depotNo";
+ this.txt_depotNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_depotNo.StyleController = this.layoutMx1;
+ this.txt_depotNo.TabIndex = 222;
+ this.txt_depotNo.Tag = "description";
+ //
+ // txt_depotSectionsCode
+ //
+ this.txt_depotSectionsCode.Location = new System.Drawing.Point(897, 45);
+ this.txt_depotSectionsCode.Name = "txt_depotSectionsCode";
+ this.txt_depotSectionsCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotSectionsCode.Size = new System.Drawing.Size(196, 24);
+ this.txt_depotSectionsCode.StyleController = this.layoutMx1;
+ this.txt_depotSectionsCode.TabIndex = 222;
+ this.txt_depotSectionsCode.Tag = "depotSectionsCode";
+ //
+ // txt_ownerName
+ //
+ this.txt_ownerName.Location = new System.Drawing.Point(84, 78);
+ this.txt_ownerName.Name = "txt_ownerName";
+ this.txt_ownerName.Properties.Appearance.Options.UseFont = true;
+ this.txt_ownerName.Size = new System.Drawing.Size(195, 24);
+ this.txt_ownerName.StyleController = this.layoutMx1;
+ this.txt_ownerName.TabIndex = 222;
+ this.txt_ownerName.Tag = "ownerName";
+ //
+ // txt_indepUserCode
+ //
+ this.txt_indepUserCode.Location = new System.Drawing.Point(355, 78);
+ this.txt_indepUserCode.Name = "txt_indepUserCode";
+ this.txt_indepUserCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_indepUserCode.Size = new System.Drawing.Size(195, 24);
+ this.txt_indepUserCode.StyleController = this.layoutMx1;
+ this.txt_indepUserCode.TabIndex = 222;
+ this.txt_indepUserCode.Tag = "indepUserCode";
+ //
+ // txt_indepDate
+ //
+ this.txt_indepDate.Location = new System.Drawing.Point(626, 78);
+ this.txt_indepDate.Name = "txt_indepDate";
+ this.txt_indepDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_indepDate.Size = new System.Drawing.Size(195, 24);
+ this.txt_indepDate.StyleController = this.layoutMx1;
+ this.txt_indepDate.TabIndex = 222;
+ this.txt_indepDate.Tag = "indepDate";
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lbGuid;
+ this.layoutControlItem24.Location = new System.Drawing.Point(552, 78);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(276, 39);
+ this.layoutControlItem24.Text = "lbGuid";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem2,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ this.layoutControlItem4,
+ this.layoutControlItem1,
+ this.layoutControlItem3,
+ this.layoutControlItem5,
+ this.layoutControlItem10,
+ this.layoutControlItem12,
+ this.layoutControlItem11});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1105, 119);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemName;
+ this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem6.CustomizationFormText = "鐗╂枡鍚嶇О";
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem6.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemModel;
+ this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem7.CustomizationFormText = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem7.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem7.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemBarcode;
+ this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem2.CustomizationFormText = "鐗╂枡鏉＄爜";
+ this.layoutControlItem2.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.Size = new System.Drawing.Size(272, 33);
+ this.layoutControlItem2.Text = "鐗╂枡鏉＄爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_quantity;
+ this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem8.CustomizationFormText = "鏁伴噺";
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem8.Text = "鏁伴噺";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_depotNo;
+ this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem9.CustomizationFormText = "浠撳簱缂栧彿";
+ this.layoutControlItem9.Location = new System.Drawing.Point(271, 33);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem9.Text = "浠撳簱缂栧彿";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_depotName;
+ this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem4.CustomizationFormText = "浠撳簱鍚嶇О";
+ this.layoutControlItem4.Location = new System.Drawing.Point(542, 33);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem4.Text = "浠撳簱鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_depotSectionsCode;
+ this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem1.CustomizationFormText = "璐т富缂栧彿";
+ this.layoutControlItem1.Location = new System.Drawing.Point(813, 33);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem1.Size = new System.Drawing.Size(272, 33);
+ this.layoutControlItem1.Text = "璐т富缂栧彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_itemNo;
+ this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem3.CustomizationFormText = "鐗╂枡缂栫爜";
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem3.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_ownerName;
+ this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem5.CustomizationFormText = "璐т富鍚嶇О";
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem5.Text = "璐т富鍚嶇О";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_indepUserCode;
+ this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem10.CustomizationFormText = "鍏ュ簱浜�";
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 66);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem10.Text = "鍏ュ簱浜�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.ucBtnPrint101;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 66);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 33);
+ this.layoutControlItem12.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_indepDate;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "鍏ュ簱鏃ユ湡";
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 66);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 33);
+ this.layoutControlItem11.Text = "鍏ュ簱鏃ユ湡";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// CKTmkc
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1051, 530);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "CKTmkc";
this.Text = "鏉＄爜搴撳瓨";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -401,6 +852,39 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemBarcode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotSectionsCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ownerName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_indepUserCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_indepDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
@@ -428,6 +912,36 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_cgy;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_depotName;
+ private DevExpress.XtraEditors.TextEdit txt_itemBarcode;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraEditors.TextEdit txt_quantity;
+ private DevExpress.XtraEditors.TextEdit txt_depotNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.TextEdit txt_depotSectionsCode;
+ private DevExpress.XtraEditors.TextEdit txt_ownerName;
+ private DevExpress.XtraEditors.TextEdit txt_indepUserCode;
+ private DevExpress.XtraEditors.TextEdit txt_indepDate;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private UserControl.UcBtnPrint ucBtnPrint101;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
index ad1a9d5..ae1c7a9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -1,3 +1,4 @@
+
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -19,19 +20,39 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
{
-
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
+ getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ },lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+
+ //杩欐槸浠撳簱鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+ this.ucBtnPrint101.SetPlButton(false);
+ this.ucBtnPrint101.btnPrintClick += (s, e) =>
+ {
+ _print101();
+ };
+
+
+ //鍔犲叆checkbox begin
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain1, 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;
+ //鍔犲叆checkbox end
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -108,7 +129,6 @@
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -127,5 +147,108 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 杩欐槸鍗曚釜鎵撳嵃
+ /// </summary>
+ private void _print101()
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemBarcode, gridView1);
+ ucBtnPrint101.guidKey = rowGuid;
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint101.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint101.rptParameter = "rpt_cktm{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ }
+
+
+ /// <summary>
+ /// 杩欐槸鎵归噺鎵撳嵃
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ DataTable dt = this.gcMain1.DataSource as DataTable;
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["guid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ if (sb.Length > 0)
+ sb.Append("|");
+ sb.Append(_guid);
+ }
+ }
+ }
+ if (string.IsNullOrEmpty(sb.ToString()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_cktm{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + sb.ToString()
+ + "}";
+ this.toolBarMenu1.guidKey = null;
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index a7362c3..eb3cc1e 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -55,8 +55,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- //Application.Run(new DevFrm.User.SysMenu());
- //return;
+ /* Application.Run(new DevFrm.User.SysMenu());
+ return;*/
bool IsWeight = false;
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
index 894572d..931f126 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -43,9 +43,9 @@
this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�";
switch (aboutType)
{
- case "鎵樻澘鐮�":
+ /*case "鎵樻澘鐮�":
btnDelete.Visible = false;
- break;
+ break;*/
case "杩芥函鐮�":
btnDelete.Visible = false;
colT1.Caption = "绾夸綋缂栧彿";
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 47a43a1..0c3316b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -71,13 +71,13 @@
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnChbg = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
this.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -568,6 +568,15 @@
this.btnChbg.Name = "btnChbg";
this.btnChbg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnBaoGao
+ //
+ this.btnBaoGao.Caption = "鐢熶骇鎶ュ憡";
+ this.btnBaoGao.Id = 70;
+ this.btnBaoGao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnBaoGao.ImageOptions.Image")));
+ this.btnBaoGao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnBaoGao.ImageOptions.LargeImage")));
+ this.btnBaoGao.Name = "btnBaoGao";
+ this.btnBaoGao.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -581,7 +590,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 114);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 306);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
@@ -593,7 +602,7 @@
this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
this.barDockControlLeft.Manager = this.barManager1;
this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 192);
//
// barDockControlRight
//
@@ -602,7 +611,7 @@
this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 192);
//
// barButtonItem1
//
@@ -620,14 +629,6 @@
this.barLargeButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.LargeImage")));
this.barLargeButtonItem5.Name = "barLargeButtonItem5";
//
- // btnBaoGao
- //
- this.btnBaoGao.Caption = "鐢熶骇鎶ュ憡";
- this.btnBaoGao.Id = 70;
- this.btnBaoGao.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.Image")));
- this.btnBaoGao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem6.ImageOptions.LargeImage")));
- this.btnBaoGao.Name = "btnBaoGao";
- //
// UcToolBarMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -638,7 +639,7 @@
this.Controls.Add(this.barDockControlTop);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1350, 114);
+ this.Size = new System.Drawing.Size(1350, 306);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 2b068ee..5a8d8f1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -312,24 +312,24 @@
btnPrintClick(this, e);
else
return;
- //2025-09-01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
- //if (rptParameter == "return false")
- // return;
- //if (string.IsNullOrEmpty(rptParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
- // return;
- //}
- //var _bl = false;
- //_bl = _ckRptService();
- //if (_bl)
- //{
- // var frm = new RptPreview(guidKey, rptParameter);
- // frm.ShowDialog();
- // return;
- //}
+ // 2025 - 09 - 01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
+ if (rptParameter == "return false")
+ return;
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ var _bl = false;
+ _bl = _ckRptService();
+ if (_bl)
+ {
+ var frm = new RptPreview(guidKey, rptParameter);
+ frm.ShowDialog();
+ return;
+ }
- //MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index bee4571..588d1a6 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -383,58 +383,58 @@
IbOtAAAAAElFTkSuQmCC
</value>
</data>
- <data name="barLargeButtonItem6.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnBaoGao.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- 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
+ 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
</value>
</data>
- <data name="barLargeButtonItem6.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnBaoGao.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- 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
+ 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
</value>
</data>
<data name="barButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
Gitblit v1.9.3