删除不合适的仓库 优化订单和售后单读取

This commit is contained in:
wule committed 2026-07-03 22:05:18 +08:00
1 parent 6f7aa58ac1
commit 13b68fa64e
53 files changed
+14843 -820

No files matched your search

+40 -4
View File
@@ -9,6 +9,7 @@ using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using Work.BaseForms;
@@ -39,29 +40,32 @@ namespace _29WxOrderWpf.BaseWindows
return msgBox;
}
public static BaseMsgWindow ShowInfo(Window window, string msg, string caption = "", MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
public static BaseMsgWindow ShowInfo(string msg, string caption = "", Window window = null, MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
{
string title = string.IsNullOrEmpty(caption) ? "系统提示" : caption;
BaseMsgWindow msgBox = CreateMsgForm(msg, title, wl);
msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgInfo"] as ImageSource;
if (window != null)
msgBox.Owner = window;
msgBox.ShowDialog();
else msgBox.Owner = MainWindow.Instance;
msgBox.ShowDialog();
return msgBox;
}
public static BaseMsgWindow ShowError(Window window, string msg, string caption = "", MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
public static BaseMsgWindow ShowError(string msg, string caption = "", Window window = null, MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
{
string title = string.IsNullOrEmpty(caption) ? "系统错误" : caption;
BaseMsgWindow msgBox = CreateMsgForm(msg, title, wl);
msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgErr"] as ImageSource;
if (window != null)
msgBox.Owner = window;
else
msgBox.Owner = MainWindow.Instance;
msgBox.ShowDialog();
return msgBox;
}
public static BaseMsgWindow ShowConfirm(Window window, string msg, string caption = "", MsgWindowLevel fl = MsgWindowLevel.MEDIUM)
public static BaseMsgWindow ShowConfirm(string msg, string caption = "", Window window = null, MsgWindowLevel fl = MsgWindowLevel.MEDIUM)
{
string title = string.IsNullOrEmpty(caption) ? "确认系统提示" : caption;
BaseMsgWindow msgBox = new BaseMsgWindow
@@ -77,6 +81,8 @@ namespace _29WxOrderWpf.BaseWindows
}
if (window != null)
msgBox.Owner = window;
else
msgBox.Owner = MainWindow.Instance;
msgBox.ShowDialog();
return msgBox;
}
@@ -90,6 +96,36 @@ namespace _29WxOrderWpf.BaseWindows
{
DialogResult = false;
}
public static void ShowAnimateMessage(string message)
{
MainWindow.Instance.tbMessage.Text = message;
MainWindow.Instance.borderMessage.Visibility = Visibility.Visible;
// 创建Storyboard并添加动画
Storyboard storyboard = new Storyboard();
DoubleAnimation fadeInAnimation1 = new DoubleAnimation
{
From = 0, // 开始时完全透明
To = 1, // 结束时完全不透明
Duration = new Duration(TimeSpan.FromSeconds(0.2)) // 持续时间2秒
};
Storyboard.SetTarget(fadeInAnimation1, MainWindow.Instance.borderMessage);
Storyboard.SetTargetProperty(fadeInAnimation1, new PropertyPath(OpacityProperty));
storyboard.Children.Add(fadeInAnimation1);
DoubleAnimation fadeInAnimation2 = new DoubleAnimation
{
BeginTime = new TimeSpan(0, 0, 1),
From = 1,
To = 0,
Duration = new Duration(TimeSpan.FromSeconds(0.2)) // 持续时间2秒
};
Storyboard.SetTarget(fadeInAnimation2, MainWindow.Instance.borderMessage);
Storyboard.SetTargetProperty(fadeInAnimation2, new PropertyPath(OpacityProperty));
storyboard.Children.Add(fadeInAnimation2);
// 开始动画
storyboard.Begin();
}
}
public enum MsgWindowLevel