From ba0c935cafc358cd8dc85b002ce8befba22c04a1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 11 八月 2025 08:42:59 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/App.config | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 187 ++++++++++++++++++------------------
DevApp/Gs.DevApp/UserControl/Toast.cs | 15 ++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 65 +++++++-----
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1
5 files changed, 145 insertions(+), 124 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index b236262..de7edef 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -44,6 +44,7 @@
<add key="Version" value="0.1" />
<add key="IsAutoUpdater" value="0" />
<add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
+ <add key="ToastSeconds" value="3" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index dc569ff..1b8b23e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -67,7 +67,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup();
+ this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup();
this.txt_fCustId = new Gs.DevApp.UserControl.UcLookCustomer();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
@@ -95,9 +95,9 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -141,7 +141,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -164,9 +164,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -303,7 +303,7 @@
//
this.gv_returnType.AppearanceCell.Options.UseFont = true;
this.gv_returnType.Caption = "鏈夋棤婧愬崟";
- this.gv_returnType.FieldName = "fIsLink";
+ this.gv_returnType.FieldName = "fHasLinkTxt";
this.gv_returnType.Name = "gv_returnType";
this.gv_returnType.OptionsColumn.AllowEdit = false;
this.gv_returnType.Tag = "query_a.RETURN_TYPE";
@@ -479,7 +479,7 @@
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.txt_fIsLink);
+ this.layoutMx1.Controls.Add(this.txt_fHasLinkRad);
this.layoutMx1.Controls.Add(this.txt_fCustId);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -505,26 +505,26 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
- // txt_fIsLink
+ // txt_fHasLinkRad
//
- this.txt_fIsLink.EditValue = "1";
- this.txt_fIsLink.Location = new System.Drawing.Point(385, 74);
- this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
- this.txt_fIsLink.Name = "txt_fIsLink";
- this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ this.txt_fHasLinkRad.EditValue = "1";
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 43);
+ this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
+ this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
- this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fIsLink.Size = new System.Drawing.Size(165, 27);
- this.txt_fIsLink.StyleController = this.layoutMx1;
- this.txt_fIsLink.TabIndex = 533;
+ this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 27);
+ this.txt_fHasLinkRad.StyleController = this.layoutMx1;
+ this.txt_fHasLinkRad.TabIndex = 533;
//
// txt_fCustId
//
this.txt_fCustId.IsReadly = false;
- this.txt_fCustId.Location = new System.Drawing.Point(385, 43);
+ this.txt_fCustId.Location = new System.Drawing.Point(355, 74);
this.txt_fCustId.Name = "txt_fCustId";
- this.txt_fCustId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCustId.Size = new System.Drawing.Size(195, 24);
this.txt_fCustId.TabIndex = 532;
//
// btnSelect
@@ -549,17 +549,17 @@
// txt_fStockOrgId
//
this.txt_fStockOrgId.IsReadly = false;
- this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 43);
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 43);
this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(195, 24);
this.txt_fStockOrgId.TabIndex = 526;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -567,7 +567,7 @@
// txt_fReturnStyle
//
this.txt_fReturnStyle.EditValue = "-璇烽�夋嫨-";
- this.txt_fReturnStyle.Location = new System.Drawing.Point(385, 12);
+ this.txt_fReturnStyle.Location = new System.Drawing.Point(355, 12);
this.txt_fReturnStyle.Name = "txt_fReturnStyle";
this.txt_fReturnStyle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -576,16 +576,16 @@
"閫�鏂欎笉琛ユ枡(ReturnNoFeed)",
"閫�鏂欒ˉ鏂�(ReturnFeed)"});
this.txt_fReturnStyle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fReturnStyle.Size = new System.Drawing.Size(165, 24);
+ this.txt_fReturnStyle.Size = new System.Drawing.Size(195, 24);
this.txt_fReturnStyle.StyleController = this.layoutMx1;
this.txt_fReturnStyle.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(897, 43);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
@@ -593,27 +593,27 @@
// txt_fStockId
//
this.txt_fStockId.IsReadly = false;
- this.txt_fStockId.Location = new System.Drawing.Point(114, 74);
+ this.txt_fStockId.Location = new System.Drawing.Point(84, 74);
this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
this.txt_fStockId.Name = "txt_fStockId";
- this.txt_fStockId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fStockId.Size = new System.Drawing.Size(195, 24);
this.txt_fStockId.TabIndex = 260;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(385, 105);
+ this.txt_remark.Location = new System.Drawing.Point(355, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(436, 24);
+ this.txt_remark.Size = new System.Drawing.Size(466, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readonly";
@@ -640,18 +640,18 @@
//
// txt_lastUpdateUser
//
- this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12);
+ this.txt_lastUpdateUser.Location = new System.Drawing.Point(626, 12);
this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
- this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24);
+ this.txt_lastUpdateUser.Size = new System.Drawing.Size(195, 24);
this.txt_lastUpdateUser.StyleController = this.layoutMx1;
this.txt_lastUpdateUser.TabIndex = 530;
this.txt_lastUpdateUser.Tag = "readonly";
//
// txt_lastUpdateTime
//
- this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
+ this.txt_lastUpdateTime.Location = new System.Drawing.Point(626, 43);
this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
- this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
+ this.txt_lastUpdateTime.Size = new System.Drawing.Size(195, 24);
this.txt_lastUpdateTime.StyleController = this.layoutMx1;
this.txt_lastUpdateTime.TabIndex = 531;
this.txt_lastUpdateTime.Tag = "readonly";
@@ -684,9 +684,9 @@
this.layoutControlItem12,
this.layoutControlItem11,
this.layoutControlItem5,
- this.layoutControlItem4,
+ this.layoutControlItem7,
this.layoutControlItem6,
- this.layoutControlItem7});
+ this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -725,7 +725,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
@@ -735,7 +735,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
@@ -745,7 +745,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
@@ -755,7 +755,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -766,7 +766,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
@@ -775,19 +775,20 @@
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.Text = "鏇存柊浜哄憳";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_lastUpdateTime;
+ this.layoutControlItem15.CustomizationFormText = "鏇存柊鏃堕棿";
this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
@@ -835,31 +836,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fCustId;
- this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fIsLink;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 62);
- this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem6.Text = "鏈夋棤婧愬崟";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -871,7 +848,31 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
this.layoutControlItem7.Text = "鐢宠澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fHasLinkRad;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem6.Text = "鏈夋棤婧愬崟";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fCustId;
+ this.layoutControlItem4.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -978,8 +979,6 @@
this.gvMx1itemId.MinWidth = 50;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 1;
this.gvMx1itemId.Width = 94;
//
// gridColumn2
@@ -989,7 +988,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
//
// gridColumn5
@@ -999,7 +998,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
//
// gridColumn3
@@ -1009,7 +1008,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 4;
+ this.gridColumn3.VisibleIndex = 8;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -1019,7 +1018,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 5;
+ this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
//
// gvMx1sqNum
@@ -1035,7 +1034,7 @@
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
- this.gvMx1sqNum.VisibleIndex = 6;
+ this.gvMx1sqNum.VisibleIndex = 4;
this.gvMx1sqNum.Width = 94;
//
// gvMx1ysNum
@@ -1047,7 +1046,7 @@
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "query_a.YS_NUM";
this.gvMx1ysNum.Visible = true;
- this.gvMx1ysNum.VisibleIndex = 7;
+ this.gvMx1ysNum.VisibleIndex = 5;
this.gvMx1ysNum.Width = 94;
//
// gvMx1remark
@@ -1063,7 +1062,7 @@
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 8;
+ this.gvMx1remark.VisibleIndex = 6;
this.gvMx1remark.Width = 94;
//
// gridColumn6
@@ -1079,7 +1078,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "edit";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 7;
this.gridColumn6.Width = 94;
//
// repositoryItemComboBox1
@@ -1110,7 +1109,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 94;
//
// gvMxDel
@@ -1120,7 +1119,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 12;
+ this.gvMxDel.VisibleIndex = 11;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1141,7 +1140,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// picCheckBox
@@ -1184,7 +1183,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1207,9 +1206,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1291,15 +1290,15 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
+ private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index ae48c2b..86547ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -75,7 +75,7 @@
this.txt_fStockId.Focus();
return;
}
- var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
+ var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fHasLinkRad.SelectedIndex.ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -106,7 +106,7 @@
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
};
frm.ShowDialog();
@@ -206,7 +206,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -224,20 +224,20 @@
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);
}
-
}
/// <summary>
@@ -275,7 +275,7 @@
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -289,6 +289,10 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_fStockOrgId.IsReadly = true;
+ txt_fCustId.IsReadly = true;
+ txt_fHasLinkRad.ReadOnly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -318,28 +322,27 @@
var _ckId = txt_fStockId.GetId();
var _khId = txt_fCustId.GetId();
string _orgId = txt_fStockOrgId.GetId();
- int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
if (string.IsNullOrEmpty(_orgId))
{
- MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
+ MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�");
txt_fStockOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_ckId))
{
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
txt_fStockId.Focus();
return;
}
if (string.IsNullOrEmpty(_khId))
{
- MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�");
+ MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�");
txt_fCustId.Focus();
return;
}
if (txt_fReturnStyle.SelectedIndex <= 0)
{
- MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+ MsgHelper.ShowError("璇烽�夋嫨閫�鏂欐柟寮忥紒");
txt_fReturnStyle.Focus();
return;
}
@@ -350,14 +353,13 @@
Remark = txt_remark.Text.Trim(), //澶囨敞
CusId = int.Parse(_khId),
DepotId = int.Parse(_ckId),
- FIsLink = _fIsLink,//鏈夋棤婧愬崟
+ FIsLink = txt_fHasLinkRad.SelectedIndex,//鏈夋棤婧愬崟
FReturnStyle = txt_fReturnStyle.Text,//閫�鏂欐柟寮�
list = new List<dynamic>(),
- }; gvMx1.PostEditor();
+ };
+ gvMx1.PostEditor();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
-
-
if (gvMx1.DataRowCount <= 0)
{
MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
@@ -397,9 +399,9 @@
_webServiceName + "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.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -409,10 +411,12 @@
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);
}
}
@@ -465,7 +469,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -507,11 +511,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);
}
}
/// <summary>
@@ -535,7 +539,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -551,9 +555,10 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -562,10 +567,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
@@ -600,13 +607,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index fbf24e5..c206f49 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2487,6 +2487,7 @@
cqcjno,//閲嶆鏂规
浜х嚎绉伴噸,
iqc绉伴噸,
+ 鍙楁墭鍏ュ簱
}
diff --git a/DevApp/Gs.DevApp/UserControl/Toast.cs b/DevApp/Gs.DevApp/UserControl/Toast.cs
index f33d494..b6e37b0 100644
--- a/DevApp/Gs.DevApp/UserControl/Toast.cs
+++ b/DevApp/Gs.DevApp/UserControl/Toast.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Configuration;
using System.Drawing;
using System.Windows.Forms;
@@ -9,15 +10,25 @@
private System.Windows.Forms.Timer tmr;
private System.Windows.Forms.Timer tmr2;
+
/// <summary>
///
/// </summary>
/// <param name="it">1鎴愬姛锛�-1澶辫触</param>
/// <param name="messageText"></param>
- /// <param name="vanishingSeconds"></param>
- public Toast(int it, string messageText, int vanishingSeconds = 2)
+ /// <param name="vanishingSeconds">鍔ㄧ敾寤堕暱鏃堕棿</param>
+ public Toast(int it, string messageText, int vanishingSeconds = 3)
{
InitializeComponent();
+ try
+ {
+ string _vanishingSeconds = ConfigurationManager.AppSettings["ToastSeconds"];
+ if (!string.IsNullOrEmpty(_vanishingSeconds))
+ vanishingSeconds = int.Parse(_vanishingSeconds);
+ }
+ catch (Exception)
+ {
+ }
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Toast));
if (it > 0)
this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.ok123;
--
Gitblit v1.9.3