From 49bec810586be811fd5e841d0633ce9fb8b1871b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 13 五月 2025 15:56:14 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index d16bb81..b968cb5 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1812,7 +1812,7 @@
}
}
- gridView1.IndicatorWidth = 50;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2042,7 +2042,7 @@
gridView1.OptionsFind.ShowSearchNavButtons = false;
gridView1.OptionsView.ShowAutoFilterRow = false;
gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.IndicatorWidth = 40;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2077,12 +2077,21 @@
}
#endregion
-
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑鏁板��
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
public static bool IsNumeric(string str)
{
Regex regex = new Regex("^[0-9]+$");
return regex.IsMatch(str);
}
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堟灉鐨刣ecimal鏁板��
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
public static bool IsNumeric2(string str)
{
string input = str;
@@ -2104,7 +2113,16 @@
return true;
return false;
}
- public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="box1">txt_psnQty_1:姣忓紶鏉＄爜鏁伴噺</param>
+ /// <param name="box2">txt_iCount_1:鏁村紶鏁板��</param>
+ /// <param name="sum">txt_kQty:鍙墦鍗伴噺</param>
+ /// <param name="rd"></param>
+ /// <param name="txt_yuliang">txt_yuliang:浣欓噺</param>
+ public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
if (rd.SelectedIndex == 2)
return;
@@ -2114,50 +2132,39 @@
string t2 = box2.Text.Trim();
if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
return;
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(t1) <= 0)
+ return;
decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum);
decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1);
+ decimal dividend = decimal.Parse(sum); // 琚櫎鏁�
+ decimal divisor = decimal.Parse(t1); // 闄ゆ暟
+ decimal shang = dividend / divisor;
- int dividend = int.Parse(sum); // 琚櫎鏁�
- int divisor = int.Parse(t1); // 闄ゆ暟
+ decimal integerPart = Math.Truncate(shang); // 鑾峰彇鏁存暟閮ㄥ垎
+ decimal decimalPart = dividend - divisor* integerPart; // 鑾峰彇灏忔暟閮ㄥ垎
- int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
- int remainder = dividend % divisor; // 浣欐暟
-
- box2.Text = quotient.ToString();
-
+ //decimal quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
+ //decimal remainder = dividend % divisor; // 浣欐暟
+ box2.Text = integerPart.ToString();
if (rd.SelectedIndex == 0)
- rd.Properties.Items[0].Description = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
+ txt_yuliang.Text = decimalPart.ToString();
}
catch (Exception ex)
{
-
- Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("杈撳叆鏁版嵁閿欒:"+ex.Message);
}
-
}
- public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+ public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
txt_psnQty_1.Text = "";
txt_iCount_1.Text = "";
- radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+ txt_yuliang.Text = "";
if (radOut.SelectedIndex == 2)
txt_iCount_1.ReadOnly = false;
else
txt_iCount_1.ReadOnly = true;
}
- public static decimal PrintYuLiang(DevExpress.XtraEditors.RadioGroup rd)
- {
- decimal dc = 0;
- if (rd.SelectedIndex != 0)
- return 0;
- string txt = rd.Properties.Items[0].Description;// = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
- txt = txt.Trim().Replace("鍏ㄨ嚜鍔ㄣ��", "");
- txt = txt.Replace("銆�", "");
- if (string.IsNullOrEmpty(txt))
- return 0;
- return decimal.Parse(txt);
- }
-
+
#region 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
/// <summary>
/// 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
--
Gitblit v1.9.3