From 5bf6668fc8a570f64498888b8d923911485180b3 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 11 八月 2025 17:43:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 67 ++++--
/dev/null | 123 ------------
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 13
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 94 ++++----
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs | 18 +
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 21 +
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 28 +-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 174 ++++++++---------
DevApp/Gs.DevApp/DevFrm/User/User.cs | 26 +-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 8
11 files changed, 241 insertions(+), 336 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index d30aee1..6d87553 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -125,7 +125,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -139,6 +139,7 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{
getPageList(this.pageBar1.CurrentPage);
@@ -146,11 +147,12 @@
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -187,7 +189,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -231,14 +233,14 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_sampleSizeNo.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鏍囧噯缂栫爜涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍囧噯缂栫爜涓嶈兘涓虹┖锛�");
txt_sampleSizeNo.Focus();
return;
}
if (string.IsNullOrEmpty(txt_sampleSizeName.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鏍囧噯鍚嶇О涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍囧噯鍚嶇О涓嶈兘涓虹┖锛�");
txt_sampleSizeName.Focus();
return;
}
@@ -325,12 +327,12 @@
}
if (qmaql2.Count <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
return;
}
if (qmaql3.Count <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
return;
}
var _obj = new MesQmAql1
@@ -351,9 +353,10 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
List<GridView> gridViews = new List<GridView>();
@@ -363,10 +366,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
catch (Exception ex)
@@ -414,7 +419,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -429,7 +434,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -485,11 +490,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -527,13 +532,17 @@
JsonConvert.SerializeObject(lst));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -570,13 +579,16 @@
JsonConvert.SerializeObject(lst));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text); MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -596,13 +608,14 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -619,9 +632,9 @@
var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -630,10 +643,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 9440399..af362ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -29,18 +29,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -322,8 +322,6 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
this.gridColumn7.Width = 94;
//
// gv_itemNo
@@ -336,7 +334,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.VisibleIndex = 1;
this.gv_itemNo.Width = 150;
//
// gridColumn3
@@ -348,7 +346,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -361,7 +359,7 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 100;
//
// gv_foneCheckor
@@ -374,7 +372,7 @@
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 5;
+ this.gv_foneCheckor.VisibleIndex = 4;
this.gv_foneCheckor.Width = 94;
//
// gv_foneCheckdate
@@ -387,7 +385,7 @@
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 6;
+ this.gv_foneCheckdate.VisibleIndex = 5;
this.gv_foneCheckdate.Width = 120;
//
// gridColumn1
@@ -399,7 +397,7 @@
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -411,7 +409,7 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "query_a.CREATE_DATE";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 180;
//
// gv_memo
@@ -424,7 +422,7 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 9;
+ this.gv_memo.VisibleIndex = 8;
this.gv_memo.Width = 150;
//
// gridColumn16
@@ -444,7 +442,7 @@
this.gridColumn8.OptionsColumn.AllowEdit = false;
this.gridColumn8.Tag = "org.fnumber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 250;
//
// gridColumn18
@@ -454,7 +452,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.VisibleIndex = 10;
this.gridColumn18.Width = 94;
//
// pageBar1
@@ -678,29 +676,29 @@
this.layoutControlItem6});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
this.Root.Size = new System.Drawing.Size(1127, 113);
this.Root.TextVisible = false;
//
@@ -1143,10 +1141,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index bff9872..57b9eda 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -48,7 +48,7 @@
txt_ftype.Text = strType;
if (strType == QcSeason.iqc.ToString())
{
- dfValue = 5;
+ dfValue = 5;
gvMx1.Columns["funit"].Visible = true;
gvMx1.Columns["funit"].VisibleIndex = 13;
gvMx1.Columns["fcheckType"].Visible = false;
@@ -62,7 +62,7 @@
{
dfValue = 0;
gvMx1.Columns["ypsl"].Visible = false;
-
+
}
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
if (strType != QcSeason.ipqc宸℃.ToString())
@@ -251,6 +251,8 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_itemId.Enabled = false;
}
/// <summary>
@@ -592,6 +594,7 @@
}
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -601,7 +604,8 @@
Form parentForm = this.FindForm();
UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
}
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
@@ -844,12 +848,17 @@
_webServiceName + "DeleteModelMx",
JsonConvert.SerializeObject(lst));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
index 5e48fe7..569737b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
@@ -59,7 +59,7 @@
}
if (_oldTable.Rows.Count <= 0)
{
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+ MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
return;
}
gcMainCopy.BindingContext = new BindingContext();
@@ -72,7 +72,7 @@
int _rows = gvMainCopy.RowCount;
if (_rows <= 0)
{
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+ MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
e.Cancel = true;
return;
}
@@ -100,15 +100,17 @@
{
var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
this.wizardControl1.NextClick += (s, e) =>
@@ -119,7 +121,7 @@
int _rows = gvMainCopy.RowCount;
if (_rows <= 0)
{
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+ MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
e.Handled = true;
return;
}
@@ -186,7 +188,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -229,12 +231,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
deleted file mode 100644
index e4e74f4..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
- partial class Frm_PrintUser
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
- this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_remark1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark1 = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_printId = new DevExpress.XtraEditors.LabelControl();
- this.gv_printId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_userId = new DevExpress.XtraEditors.LabelControl();
- this.gv_userId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
- this.txt_printId = new Gs.DevApp.UserControl.UcLookPrint();
- this.txt_userId = new Gs.DevApp.UserControl.UcLookUser();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- this.xtraTabPage2.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
- this.SuspendLayout();
- //
- // lb_isStatus
- //
- this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(44, 125);
- this.lb_isStatus.Name = "lb_isStatus";
- this.lb_isStatus.Size = new System.Drawing.Size(65, 18);
- this.lb_isStatus.TabIndex = 222;
- this.lb_isStatus.Text = "鏄惁鍚敤:";
- //
- // gv_isStatus
- //
- this.gv_isStatus.AppearanceCell.Options.UseFont = true;
- this.gv_isStatus.Caption = "鏄惁鍚敤 ";
- this.gv_isStatus.FieldName = "isStatus";
- this.gv_isStatus.MinWidth = 50;
- this.gv_isStatus.Name = "gv_isStatus";
- this.gv_isStatus.OptionsColumn.AllowEdit = false;
- this.gv_isStatus.Tag = "query_a.is_status";
- this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 4;
- this.gv_isStatus.Width = 94;
- //
- // lb_remark1
- //
- this.lb_remark1.Appearance.Options.UseFont = true;
- this.lb_remark1.Location = new System.Drawing.Point(78, 91);
- this.lb_remark1.Name = "lb_remark1";
- this.lb_remark1.Size = new System.Drawing.Size(35, 18);
- this.lb_remark1.TabIndex = 216;
- this.lb_remark1.Text = "澶囨敞:";
- //
- // txt_remark1
- //
- this.txt_remark1.Location = new System.Drawing.Point(126, 91);
- this.txt_remark1.Name = "txt_remark1";
- this.txt_remark1.Properties.Appearance.Options.UseFont = true;
- this.txt_remark1.Size = new System.Drawing.Size(194, 24);
- this.txt_remark1.TabIndex = 216;
- //
- // gv_remark1
- //
- this.gv_remark1.AppearanceCell.Options.UseFont = true;
- this.gv_remark1.Caption = "澶囨敞";
- this.gv_remark1.FieldName = "remark1";
- this.gv_remark1.MinWidth = 120;
- this.gv_remark1.Name = "gv_remark1";
- this.gv_remark1.OptionsColumn.AllowEdit = false;
- this.gv_remark1.Tag = "query_a.remark1";
- this.gv_remark1.Visible = true;
- this.gv_remark1.VisibleIndex = 3;
- this.gv_remark1.Width = 120;
- //
- // lb_printId
- //
- this.lb_printId.Appearance.Options.UseFont = true;
- this.lb_printId.Location = new System.Drawing.Point(44, 61);
- this.lb_printId.Name = "lb_printId";
- this.lb_printId.Size = new System.Drawing.Size(65, 18);
- this.lb_printId.TabIndex = 213;
- this.lb_printId.Text = "閫夋墦鍗版満:";
- //
- // gv_printId
- //
- this.gv_printId.AppearanceCell.Options.UseFont = true;
- this.gv_printId.Caption = "鎵撳嵃鏈虹紪鍙�";
- this.gv_printId.FieldName = "printNo";
- this.gv_printId.MinWidth = 120;
- this.gv_printId.Name = "gv_printId";
- this.gv_printId.OptionsColumn.AllowEdit = false;
- this.gv_printId.Tag = "query_a.print_id";
- this.gv_printId.Visible = true;
- this.gv_printId.VisibleIndex = 2;
- this.gv_printId.Width = 120;
- //
- // lb_userId
- //
- this.lb_userId.Appearance.Options.UseFont = true;
- this.lb_userId.Location = new System.Drawing.Point(44, 20);
- this.lb_userId.Name = "lb_userId";
- this.lb_userId.Size = new System.Drawing.Size(65, 18);
- this.lb_userId.TabIndex = 211;
- this.lb_userId.Text = "閫夋嫨鐢ㄦ埛:";
- //
- // gv_userId
- //
- this.gv_userId.AppearanceCell.Options.UseFont = true;
- this.gv_userId.Caption = "鐢ㄦ埛璐﹀彿";
- this.gv_userId.FieldName = "account";
- this.gv_userId.MinWidth = 100;
- this.gv_userId.Name = "gv_userId";
- this.gv_userId.OptionsColumn.AllowEdit = false;
- this.gv_userId.Tag = "query_a.user_id";
- this.gv_userId.Visible = true;
- this.gv_userId.VisibleIndex = 0;
- this.gv_userId.Width = 100;
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = null;
- this.toolBarMenu1.currentAction = null;
- this.toolBarMenu1.defaultActions = null;
- this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
- this.toolBarMenu1.guidKey = null;
- this.toolBarMenu1.isSetBtn = false;
- this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_userId,
- this.gridColumn1,
- this.gv_printId,
- this.gv_remark1,
- this.gv_isStatus});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鐢ㄦ埛鍚嶇О";
- this.gridColumn1.FieldName = "userName";
- this.gridColumn1.MinWidth = 100;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 100;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_isStatus);
- this.panel1.Controls.Add(this.txt_printId);
- this.panel1.Controls.Add(this.txt_userId);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_isStatus);
- this.panel1.Controls.Add(this.lb_remark1);
- this.panel1.Controls.Add(this.txt_remark1);
- this.panel1.Controls.Add(this.lb_printId);
- this.panel1.Controls.Add(this.lb_userId);
- this.panel1.Location = new System.Drawing.Point(76, 20);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(664, 264);
- this.panel1.TabIndex = 1;
- //
- // txt_isStatus
- //
- this.txt_isStatus.Location = new System.Drawing.Point(126, 123);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Properties.Caption = "";
- this.txt_isStatus.Size = new System.Drawing.Size(94, 24);
- this.txt_isStatus.TabIndex = 225;
- this.txt_isStatus.Tag = "moren.true";
- //
- // txt_printId
- //
- this.txt_printId.IsReadly = false;
- this.txt_printId.Location = new System.Drawing.Point(126, 55);
- this.txt_printId.Name = "txt_printId";
- this.txt_printId.Size = new System.Drawing.Size(194, 30);
- this.txt_printId.TabIndex = 224;
- //
- // txt_userId
- //
- this.txt_userId.IsReadly = false;
- this.txt_userId.Location = new System.Drawing.Point(126, 20);
- this.txt_userId.Name = "txt_userId";
- this.txt_userId.Size = new System.Drawing.Size(194, 30);
- this.txt_userId.TabIndex = 223;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(403, 30);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(454, 30);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 18);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // Frm_PrintUser
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
- this.Controls.Add(this.xtraTabControl1);
- this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_PrintUser";
- this.Text = "鎵撳嵃鏈虹粦瀹�";
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- this.xtraTabPage2.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
- this.ResumeLayout(false);
-
- }
- #endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
-private DevExpress.XtraEditors.LabelControl lb_isStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
-
-private DevExpress.XtraEditors.LabelControl lb_remark1;
-private DevExpress.XtraEditors.TextEdit txt_remark1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark1;
-
-private DevExpress.XtraEditors.LabelControl lb_printId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_printId;
-
-private DevExpress.XtraEditors.LabelControl lb_userId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_userId;
- private UserControl.UcLookUser txt_userId;
- private UserControl.UcLookPrint txt_printId;
- private DevExpress.XtraEditors.CheckEdit txt_isStatus;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.Utils.ToolTipController tips;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
deleted file mode 100644
index a35334f..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using MES.Service.Modes;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm
-{
- public partial class Frm_PrintUser : DevExpress.XtraEditors.XtraForm
- {
- string _webServiceName = "PrintUserManager/";
- List<FilterEntity> _filterList = new List<FilterEntity>();
- public Frm_PrintUser()
- {
- InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
- Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- {
- getModel(value);
- }, (value) =>
- {
- getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
- getPageList(1);
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- }
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- await Task.Delay(100);
- getPageList(1);
- }
-
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_remark1, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- { }
- else
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
- getPageList(this.pageBar1.CurrentPage);
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- {
- //_filterList.Clear();
- //if (gridView1.ActiveFilter.Count > 0)
- //{
- // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- // gridView1.ActiveFilter.Clear();
- // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- //}
- //getPageList(1);
- getPageList(this.pageBar1.CurrentPage);
- }
- }
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_remark1, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(rowGuid);
- }
- else
- {
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
- }
-
- }
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- lbGuid.Text = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
- }
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- string _userId = txt_userId.GetGuid();
- string _printId = txt_printId.GetGuid();
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(_userId))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢ㄦ埛锛�");
- txt_userId.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_printId))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鎵撳嵃鏈猴紒");
- txt_printId.Focus();
- return;
- }
- var _obj = new PrintUser
- {
- Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- UserId = UtilityHelper.ToGuid(_userId),
- PrintId = UtilityHelper.ToGuid(_printId),
- Remark1 = txt_remark1.Text.Trim(),
- IsStatus = txt_isStatus.Checked, //鐘舵��
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
- toolBarMenu1.currentAction = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and c.GUID is not null and b.guid is not null";
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "c.ACCOUNT",
- "asc", "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- if (dt.Rows.Count > 0)
- {
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
- }
- /// <summary>
- ///
- /// </summary>
- /// <param name="strGuid">涓婚敭</param>
- /// <param name="isEdit">鏄惁鍙紪杈�</param>
- /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
- private void getModel(string strGuid)
- {
- bool isEdit = false;
- if (toolBarMenu1.currentAction == "add") return;
- if (toolBarMenu1.currentAction == "edit") isEdit = true;
- if (string.IsNullOrEmpty(strGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = strGuid,//涓诲缓
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- dynamic dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
- }
- else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx
deleted file mode 100644
index a4826a3..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index fc7e1ff..aaf2e0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -63,7 +63,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -75,7 +76,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index ec3ff79..5569fec 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -106,7 +106,7 @@
lbGuid, txt_roleName, gridView1, "roleName");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
@@ -121,17 +121,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -169,7 +171,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -205,14 +207,14 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_roleName.Text.Trim()))
{
- MsgHelper.Warning("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�");
txt_roleName.Focus();
return;
}
if (string.IsNullOrEmpty(txt_roleRemark.Text.Trim()))
{
- MsgHelper.Warning("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�");
txt_roleRemark.Focus();
return;
}
@@ -228,19 +230,21 @@
var strJson = UtilityHelper.HttpPost("", "Role/EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -283,7 +287,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -297,7 +301,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -318,12 +322,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
// 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐�
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index c382656..44372c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -105,7 +105,7 @@
lbGuid, txt_userName, gridView1, "userName");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
@@ -121,14 +121,16 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
+ else
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -169,7 +171,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -207,21 +209,21 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_account.Text.Trim()))
{
- MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
txt_account.Focus();
return;
}
if (string.IsNullOrEmpty(txt_password.Text.Trim()))
{
- MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("瀵嗙爜涓嶈兘涓虹┖锛�");
txt_password.Focus();
return;
}
if (string.IsNullOrEmpty(txt_userName.Text.Trim()))
{
- MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("濮撳悕涓嶈兘涓虹┖锛�");
txt_userName.Focus();
return;
}
@@ -245,15 +247,17 @@
var strJson = UtilityHelper.HttpPost("", "User/EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -301,7 +305,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -315,7 +319,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -336,12 +340,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 92979ef..839920c 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -26,7 +26,7 @@
{
if (string.IsNullOrEmpty(_userGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒");
return;
}
@@ -52,12 +52,15 @@
strJson = UtilityHelper.HttpPost("", "Role/SetUserRole",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0)
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
Close();
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -92,7 +95,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -166,7 +169,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 6566a59..bda50d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -352,8 +352,6 @@
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Tag = "query_a.ebelnK3id";
- this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 0;
this.gv_factory.Width = 80;
//
// gv_billNo
@@ -366,7 +364,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 1;
+ this.gv_billNo.VisibleIndex = 0;
this.gv_billNo.Width = 120;
//
// gv_documentStatus
@@ -379,7 +377,7 @@
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
- this.gv_documentStatus.VisibleIndex = 2;
+ this.gv_documentStatus.VisibleIndex = 1;
this.gv_documentStatus.Width = 70;
//
// gv_documentType
@@ -392,7 +390,7 @@
this.gv_documentType.OptionsColumn.AllowEdit = false;
this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
this.gv_documentType.Visible = true;
- this.gv_documentType.VisibleIndex = 3;
+ this.gv_documentType.VisibleIndex = 2;
this.gv_documentType.Width = 80;
//
// gv_businessType
@@ -404,8 +402,6 @@
this.gv_businessType.Name = "gv_businessType";
this.gv_businessType.OptionsColumn.AllowEdit = false;
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
- this.gv_businessType.Visible = true;
- this.gv_businessType.VisibleIndex = 4;
this.gv_businessType.Width = 80;
//
// gv_purchaseDate
@@ -418,7 +414,7 @@
this.gv_purchaseDate.OptionsColumn.AllowEdit = false;
this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE";
this.gv_purchaseDate.Visible = true;
- this.gv_purchaseDate.VisibleIndex = 5;
+ this.gv_purchaseDate.VisibleIndex = 3;
this.gv_purchaseDate.Width = 170;
//
// bandedGridColumn1
@@ -430,7 +426,7 @@
this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
this.bandedGridColumn1.Tag = "query_a.suppName";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 6;
+ this.bandedGridColumn1.VisibleIndex = 4;
this.bandedGridColumn1.Width = 134;
//
// gv_supplier
@@ -443,7 +439,7 @@
this.gv_supplier.OptionsColumn.AllowEdit = false;
this.gv_supplier.Tag = "query_a.SUPPLIER";
this.gv_supplier.Visible = true;
- this.gv_supplier.VisibleIndex = 7;
+ this.gv_supplier.VisibleIndex = 5;
this.gv_supplier.Width = 66;
//
// gv_closeStatus
@@ -456,7 +452,7 @@
this.gv_closeStatus.OptionsColumn.AllowEdit = false;
this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
this.gv_closeStatus.Visible = true;
- this.gv_closeStatus.VisibleIndex = 8;
+ this.gv_closeStatus.VisibleIndex = 6;
this.gv_closeStatus.Width = 80;
//
// bandedGridColumn2
@@ -468,7 +464,7 @@
this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
this.bandedGridColumn2.Tag = "query_a.departmentname";
this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.VisibleIndex = 9;
+ this.bandedGridColumn2.VisibleIndex = 7;
this.bandedGridColumn2.Width = 80;
//
// gv_purchaseDept
@@ -480,8 +476,6 @@
this.gv_purchaseDept.Name = "gv_purchaseDept";
this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
- this.gv_purchaseDept.Visible = true;
- this.gv_purchaseDept.VisibleIndex = 10;
this.gv_purchaseDept.Width = 50;
//
// gv_purchaser
@@ -494,7 +488,7 @@
this.gv_purchaser.OptionsColumn.AllowEdit = false;
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
- this.gv_purchaser.VisibleIndex = 11;
+ this.gv_purchaser.VisibleIndex = 8;
this.gv_purchaser.Width = 60;
//
// gv_qualityReq
@@ -507,7 +501,7 @@
this.gv_qualityReq.OptionsColumn.AllowEdit = false;
this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
this.gv_qualityReq.Visible = true;
- this.gv_qualityReq.VisibleIndex = 12;
+ this.gv_qualityReq.VisibleIndex = 9;
this.gv_qualityReq.Width = 80;
//
// gv_settlementParty
@@ -542,7 +536,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.VisibleIndex = 10;
this.gv_remarks.Width = 100;
//
// gv_cancellationStatus
@@ -555,7 +549,7 @@
this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
- this.gv_cancellationStatus.VisibleIndex = 14;
+ this.gv_cancellationStatus.VisibleIndex = 11;
this.gv_cancellationStatus.Width = 60;
//
// gv_cancellationPerson
@@ -568,7 +562,7 @@
this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
this.gv_cancellationPerson.Visible = true;
- this.gv_cancellationPerson.VisibleIndex = 15;
+ this.gv_cancellationPerson.VisibleIndex = 12;
this.gv_cancellationPerson.Width = 60;
//
// gv_cancellationDate
@@ -581,7 +575,7 @@
this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
- this.gv_cancellationDate.VisibleIndex = 16;
+ this.gv_cancellationDate.VisibleIndex = 13;
this.gv_cancellationDate.Width = 180;
//
// gv_createBy
@@ -594,7 +588,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 17;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 80;
//
// gv_createDate
@@ -607,7 +601,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 18;
+ this.gv_createDate.VisibleIndex = 15;
this.gv_createDate.Width = 180;
//
// gv_lastupdateDate
@@ -620,7 +614,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 19;
+ this.gv_lastupdateDate.VisibleIndex = 16;
this.gv_lastupdateDate.Width = 200;
//
// gv_lastupdateBy
@@ -633,7 +627,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 20;
+ this.gv_lastupdateBy.VisibleIndex = 17;
this.gv_lastupdateBy.Width = 100;
//
// gv_erpCheckBy
@@ -646,7 +640,7 @@
this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
- this.gv_erpCheckBy.VisibleIndex = 21;
+ this.gv_erpCheckBy.VisibleIndex = 18;
this.gv_erpCheckBy.Width = 80;
//
// gv_erpCheckDate
@@ -659,7 +653,7 @@
this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
this.gv_erpCheckDate.Visible = true;
- this.gv_erpCheckDate.VisibleIndex = 22;
+ this.gv_erpCheckDate.VisibleIndex = 19;
this.gv_erpCheckDate.Width = 180;
//
// gv_changereason
@@ -672,7 +666,7 @@
this.gv_changereason.OptionsColumn.AllowEdit = false;
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
- this.gv_changereason.VisibleIndex = 23;
+ this.gv_changereason.VisibleIndex = 20;
this.gv_changereason.Width = 100;
//
// gridColumn4
@@ -682,7 +676,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 24;
+ this.gridColumn4.VisibleIndex = 21;
this.gridColumn4.Width = 94;
//
// gridColumn5
@@ -716,7 +710,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 25;
+ this.gridColumn11.VisibleIndex = 22;
this.gridColumn11.Width = 94;
//
// pageBar1
@@ -799,7 +793,7 @@
this.txt_billNo.Location = new System.Drawing.Point(109, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(234, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
@@ -813,41 +807,41 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(769, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(780, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(229, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(235, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 231;
//
// txt_documentTypeTxt
//
- this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
+ this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
- this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
this.txt_documentTypeTxt.StyleController = this.layoutMx1;
this.txt_documentTypeTxt.TabIndex = 232;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
+ this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 233;
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 234;
//
// txt_cancellationStatusTxt
//
- this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
+ this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
- this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
this.txt_cancellationStatusTxt.TabIndex = 235;
//
@@ -855,39 +849,39 @@
//
this.txt_dptName.Location = new System.Drawing.Point(109, 40);
this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Size = new System.Drawing.Size(229, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(234, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 236;
//
// txt_purchaseDate
//
- this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
+ this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
this.txt_purchaseDate.Name = "txt_purchaseDate";
- this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
this.txt_purchaseDate.StyleController = this.layoutMx1;
this.txt_purchaseDate.TabIndex = 237;
//
// txt_docStusTxt
//
- this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
+ this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
this.txt_docStusTxt.Name = "txt_docStusTxt";
- this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_docStusTxt.StyleController = this.layoutMx1;
this.txt_docStusTxt.TabIndex = 238;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(769, 68);
+ this.txt_createDate.Location = new System.Drawing.Point(780, 68);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(235, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 239;
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
- this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
this.txt_erpCheckDate.StyleController = this.layoutMx1;
this.txt_erpCheckDate.TabIndex = 240;
//
@@ -895,7 +889,7 @@
//
this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -962,7 +956,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1342, 104);
+ this.Root.Size = new System.Drawing.Size(1363, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -970,38 +964,38 @@
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(330, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_documentTypeTxt;
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_suppNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1011,72 +1005,72 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_purchaseDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
- this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem8.Text = "浣滃簾鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_closeStatusTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_docStusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem12.Text = "鍚屾鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_erpCheckDate;
- this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1086,7 +1080,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1190,8 +1184,6 @@
this.gv_erpid.FieldName = "ebelnK3id";
this.gv_erpid.MinWidth = 25;
this.gv_erpid.Name = "gv_erpid";
- this.gv_erpid.Visible = true;
- this.gv_erpid.VisibleIndex = 1;
this.gv_erpid.Width = 46;
//
// gvMx1itemId
@@ -1211,7 +1203,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 46;
//
// gridColumn1
@@ -1221,7 +1213,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 55;
//
// gvMx1pricingQty
@@ -1253,7 +1245,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 13;
+ this.gvMx1deliveryDate.VisibleIndex = 12;
this.gvMx1deliveryDate.Width = 92;
//
// gvMx1earliestDeliveryDate
@@ -1265,7 +1257,7 @@
this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
this.gvMx1earliestDeliveryDate.Visible = true;
- this.gvMx1earliestDeliveryDate.VisibleIndex = 14;
+ this.gvMx1earliestDeliveryDate.VisibleIndex = 13;
this.gvMx1earliestDeliveryDate.Width = 92;
//
// gvMx1latestDeliveryDate
@@ -1277,7 +1269,7 @@
this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
this.gvMx1latestDeliveryDate.Visible = true;
- this.gvMx1latestDeliveryDate.VisibleIndex = 15;
+ this.gvMx1latestDeliveryDate.VisibleIndex = 14;
this.gvMx1latestDeliveryDate.Width = 92;
//
// gvMx1purchaseQty
@@ -1289,7 +1281,7 @@
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
- this.gvMx1purchaseQty.VisibleIndex = 4;
+ this.gvMx1purchaseQty.VisibleIndex = 3;
this.gvMx1purchaseQty.Width = 25;
//
// gvMx1purchaseUnit
@@ -1301,7 +1293,7 @@
this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gvMx1purchaseUnit.Visible = true;
- this.gvMx1purchaseUnit.VisibleIndex = 7;
+ this.gvMx1purchaseUnit.VisibleIndex = 6;
this.gvMx1purchaseUnit.Width = 25;
//
// gvMx1inventoryUnit
@@ -1333,7 +1325,7 @@
this.gvMx1isGift.Name = "gvMx1isGift";
this.gvMx1isGift.Tag = "query_a.IS_GIFT";
this.gvMx1isGift.Visible = true;
- this.gvMx1isGift.VisibleIndex = 8;
+ this.gvMx1isGift.VisibleIndex = 7;
this.gvMx1isGift.Width = 25;
//
// gvMx1remarks
@@ -1345,7 +1337,7 @@
this.gvMx1remarks.Name = "gvMx1remarks";
this.gvMx1remarks.Tag = "query_a.REMARKS";
this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 9;
+ this.gvMx1remarks.VisibleIndex = 8;
this.gvMx1remarks.Width = 46;
//
// gvMx1businessTerminate
@@ -1357,7 +1349,7 @@
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
- this.gvMx1businessTerminate.VisibleIndex = 10;
+ this.gvMx1businessTerminate.VisibleIndex = 9;
this.gvMx1businessTerminate.Width = 25;
//
// gvMx1businessClose
@@ -1369,7 +1361,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 11;
+ this.gvMx1businessClose.VisibleIndex = 10;
this.gvMx1businessClose.Width = 25;
//
// gvMx1businessFreeze
@@ -1381,7 +1373,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 12;
+ this.gvMx1businessFreeze.VisibleIndex = 11;
this.gvMx1businessFreeze.Width = 25;
//
// gvMx1freezer
@@ -1491,7 +1483,7 @@
this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
this.gvMx1remainingStoredQty.Visible = true;
- this.gvMx1remainingStoredQty.VisibleIndex = 5;
+ this.gvMx1remainingStoredQty.VisibleIndex = 4;
this.gvMx1remainingStoredQty.Width = 32;
//
// gvMx1returnableReceivedQty
@@ -1531,7 +1523,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 6;
+ this.gridColumn20.VisibleIndex = 5;
this.gridColumn20.Width = 94;
//
// gvMx1returnableStoredQty
@@ -1603,7 +1595,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 16;
+ this.gridColumn8.VisibleIndex = 15;
this.gridColumn8.Width = 43;
//
// gridColumn9
@@ -1613,7 +1605,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 16;
this.gridColumn9.Width = 94;
//
// gridColumn19
@@ -1623,7 +1615,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 18;
+ this.gridColumn19.VisibleIndex = 17;
this.gridColumn19.Width = 94;
//
// rptHistory
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 3cf93b3..dcb8848 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -146,7 +146,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -160,7 +160,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -216,12 +216,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3