Compare commits

...
70 Commits
Author SHA1 Message Date
sc ed61970ffa Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-07-03 23:48:58 +08:00
sc 192d8c7841 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-07-03 23:48:56 +08:00
sc 529aa29677 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-07-01 00:27:52 +08:00
sc 8a383bf4d1 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-07-01 00:27:49 +08:00
sc fb65c392c8 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-30 13:36:42 +08:00
sc bbf2871230 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-30 13:36:40 +08:00
sc 37bcbd8aea Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-30 10:58:14 +08:00
sc ce0f43a583 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-30 10:58:10 +08:00
sc 1c925c5c95 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:29:12 +08:00
sc c49ac6c885 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:29:10 +08:00
sc de56564372 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:20:38 +08:00
sc 83a38deaa6 mvvm模式升级从 packages.config 迁移到 PackageReference 2024-06-29 23:20:36 +08:00
sc 9ff4a7d035 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:10:54 +08:00
sc ec9eaedc64 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:10:53 +08:00
sc 6adc2ae527 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:05:55 +08:00
sc cb6facf0d4 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 23:05:53 +08:00
sc 827e9cc387 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 22:56:13 +08:00
sc f57cb897fb Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 22:56:11 +08:00
sc 9fcb61fa52 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 22:46:37 +08:00
sc 0f0f2bfb30 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 22:46:35 +08:00
sc 8515d2b100 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 21:56:29 +08:00
sc 86ae16fa94 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 21:56:26 +08:00
sc f58bd85164 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-29 00:00:35 +08:00
sc 85bcc41e58 注册码显示逻辑修改 2024-06-29 00:00:33 +08:00
sc 9580a0f60c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-28 22:07:43 +08:00
sc 280062d86c 修改tcp的ip选择逻辑 2024-06-28 22:07:41 +08:00
sc 959392786e Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 23:19:58 +08:00
sc df7bc3bae6 修改网络信息获取方式 2024-06-27 23:19:57 +08:00
sc edd40f136d Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 23:15:46 +08:00
sc dc4dfecf15 去除无效变量 2024-06-27 23:15:45 +08:00
sc 03f77e45c9 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 23:13:38 +08:00
sc bc0c921d85 去除无效变量 2024-06-27 23:13:35 +08:00
sc 36af454eff Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 23:09:30 +08:00
sc 5474b42e7e 关闭程序逻辑bug处理 2024-06-27 23:09:28 +08:00
sc 3ea5a91776 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 23:01:24 +08:00
sc 6a706ea804 修改日志文件函数调用逻辑 2024-06-27 23:01:22 +08:00
sc e96e537d5e Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 00:14:14 +08:00
sc 53fd4909ee Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-27 00:14:13 +08:00
sc 31ba1bad4c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-26 22:49:49 +08:00
sc adb98a0f46 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-26 22:49:46 +08:00
sc c1712f1368 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-25 22:42:23 +08:00
sc deb1e1bbe9 tcp 2024-06-25 22:42:21 +08:00
sc b6f3533709 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-25 21:01:34 +08:00
sc 785bacc182 添加tcp&udp 2024-06-25 21:01:31 +08:00
sc 263bb90b3d Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-25 11:27:53 +08:00
sc 2c1d2c0e5f Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-25 11:27:38 +08:00
sc 0328ddfcd6 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-24 15:32:55 +08:00
sc 81e335fc62 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-24 15:32:52 +08:00
sc 1b6777f8ad Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-19 23:34:51 +08:00
sc d3a021dcf0 许可证安全检查逻辑调整 2024-06-19 23:34:48 +08:00
sc 5c929d8cc9 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-06-12 09:26:38 +08:00
sc 8530d3d750 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-06-12 09:26:35 +08:00
sc 6c18a79a7b Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-05-20 23:24:45 +08:00
sc 3bffc936be Exchange页面完成 2024-05-20 23:24:44 +08:00
sc fc217d6448 Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage 2024-05-20 20:49:24 +08:00
sc dd6bb40912 LOG日志修改 2024-05-20 20:49:22 +08:00
sc 85028a60bc Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 17:37:26 +08:00
sc 9f89693f97 Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 17:37:25 +08:00
sc d8c9c8111c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 16:27:52 +08:00
sc 0c3fa8fd24 添加转换日志查询 2024-05-20 16:27:49 +08:00
sc f39cfd5cbd Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 15:45:38 +08:00
sc aa1b08f6c4 EX添加日志记录 2024-05-20 15:45:35 +08:00
sc fda9b5210a Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 14:25:38 +08:00
sc 1ef3b73f5a 添加登录页面工作日志 2024-05-20 14:25:37 +08:00
sc abc214763c Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 14:24:31 +08:00
sc efb99dcf3f 添加登录页面工作日志 2024-05-20 14:24:27 +08:00
sc baee6c4a5f Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-20 14:04:44 +08:00
sc 2b50338365 添加报错记录 2024-05-20 14:04:41 +08:00
sc 57549329fe Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage 2024-05-18 17:31:33 +08:00
sc d59701122e 打印设置页面完成 2024-05-18 17:31:31 +08:00
61 changed files with 1354 additions and 1090 deletions

No files matched your search

+56
View File
@@ -33,6 +33,62 @@
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetty.Transport" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetty.Buffers" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetty.Codecs.Http" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetty.Common" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DotNetty.Codecs" publicKeyToken="bc13ca065fa06c29" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
+50 -15
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.IO;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
namespace formula_manage namespace formula_manage
@@ -44,25 +40,64 @@ namespace formula_manage
private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{ {
e.Handled = true; e.Handled = true;
if (e.Exception.InnerException == null) if (e.Exception.InnerException == null)
{ {
MessageBox.Show("发生了一个无法处理的错误!请联系SUNLIGHT处理!" + Environment.NewLine MessageBox.Show("发生了一个无法处理的错误!请联系SUNLIGHT处理!"
// + "(2)错误源:" + e.Exception.Source + Environment.NewLine + "(1)错误" + Environment.NewLine
+ "详细信息:" + e.Exception.Message + Environment.NewLine + "(2)错误源:" + e.Exception.Source + Environment.NewLine
// + "(4)报错区域:" + e.Exception.StackTrace // + (3)详细信息:" + e.Exception.Message + Environment.NewLine
// + "(4)报错区域:" + e.Exception.StackTrace
); );
} }
else else
{ {
MessageBox.Show("发生了一个无法处理的错误!请联系SUNLIGHT处理!" + Environment.NewLine MessageBox.Show("发生了一个无法处理的错误!请联系SUNLIGHT处理!"
// + "(2)错误源:" + e.Exception.InnerException.Source + Environment.NewLine + "(1)错误" + Environment.NewLine
+ "错误信息:" + e.Exception.Message + Environment.NewLine // + "(2)错误源:" + e.Exception.InnerException.Source + Environment.NewLine
// + "(4)详细信息:" + e.Exception.InnerException.Message + Environment.NewLine + "(3)错误信息:" + e.Exception.Message + Environment.NewLine
// + "(5)报错区域:" + e.Exception.InnerException.StackTrace // + "(4)详细信息:" + e.Exception.InnerException.Message + Environment.NewLine
// + "(5)报错区域:" + e.Exception.InnerException.StackTrace
); );
} }
string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
string logpath = System.Environment.CurrentDirectory + "\\ERR";//日志文件目录
//string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件
// System.IO.DirectoryInfo log = new System.IO.DirectoryInfo();//生成日志文件目录
string log_path = logpath + "\\ERR" + Log_time + ".txt";
string Log_timehms = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
if (Directory.Exists(logpath))//检查日志路径
{
if (!File.Exists(log_path))//检查文件并写入
{
FileStream fs = new FileStream(log_path, FileMode.CreateNew, FileAccess.Write);//创建文件
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.Close();
FileStream fil = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件
StreamWriter wfil = new StreamWriter(fil);//创建文件
wfil.WriteLine("[" + Log_timehms + "];[Error] ||" + Environment.NewLine.ToString());
wfil.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
wfil.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
wfil.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
wfil.Close();
}
else
{
FileStream fs = new FileStream(log_path, FileMode.Append, FileAccess.Write);//创建写入文件
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine("[" + Log_timehms + "];[Error] ||" + Environment.NewLine.ToString());
wr.WriteLine("[" + Log_timehms + "];[Error source] ||" + e.Exception.Source.ToString() + Environment.NewLine.ToString());
wr.WriteLine("[" + Log_timehms + "];[Error message] ||" + e.Exception.Message.ToString() + Environment.NewLine.ToString());
wr.WriteLine("[" + Log_timehms + "];[Error area] ||" + e.Exception.StackTrace.ToString());
wr.Close();
}
}
else
{
DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
directoryInfo.Create();
}
} }
/// <summary> /// <summary>
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
+4 -8
View File
@@ -1,14 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
{ {
/// <summary> /// <summary>
/// RGB色彩数值转换器 /// RGB色彩数值转换器
/// 将色彩数值转换为ARGB代码返回 /// 将色彩数值转换为ARGB代码返回
/// </summary> /// </summary>
@@ -19,7 +15,7 @@ namespace formula_manage.ConvertMoels
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{ {
if (value != null) if (value != null)
{ {
string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0” string colorValue = string.Format("{0:X6}", value);//十进制RGB数值转十六进制六位RGB并补0位例“C0C0C0”
/*string StuffColor = "#FF" + colorValue;//RGB数值拼接为ARGB数值(正向)*/ /*string StuffColor = "#FF" + colorValue;//RGB数值拼接为ARGB数值(正向)*/
string StuffColor_B = colorValue.Substring(0, 2);//获取蓝色参数 string StuffColor_B = colorValue.Substring(0, 2);//获取蓝色参数
@@ -33,8 +29,8 @@ namespace formula_manage.ConvertMoels
return null;//返回空 return null;//返回空
} }
} }
/// <summary> /// <summary>
/// </summary> /// </summary>
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{ {
return null; return null;
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace Audit.ConvertMoels namespace Audit.ConvertMoels
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace Audit.ConvertMoels namespace Audit.ConvertMoels
+2 -6
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
@@ -40,8 +36,8 @@ namespace formula_manage.ConvertMoels
} }
} }
} }
/// <summary> /// <summary>
/// </summary> /// </summary>
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{ {
return null; return null;
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
+1 -8
View File
@@ -1,12 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Input;
using System.Windows.Controls;
/// <summary> /// <summary>
/// 运行状态变换器 /// 运行状态变换器
@@ -40,7 +33,7 @@ namespace Audit.ConvertMoels
} }
} }
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
-7
View File
@@ -1,12 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Input;
using System.Windows.Controls;
namespace Audit.ConvertMoels namespace Audit.ConvertMoels
{ {
+1 -5
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data; using System.Windows.Data;
namespace formula_manage.ConvertMoels namespace formula_manage.ConvertMoels
@@ -37,7 +33,7 @@ namespace formula_manage.ConvertMoels
} }
} }
} }
/// <summary> /// <summary>
/// </summary> /// </summary>
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+3 -3
View File
@@ -5,15 +5,15 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:formula_manage.EX" xmlns:local="clr-namespace:formula_manage.EX"
mc:Ignorable="d" mc:Ignorable="d"
Title="ExProgram" Height="450" Width="800"> Title="ExProgram" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0">
<Grid> <Grid>
<RichTextBox Margin="0,300,0,0" IsReadOnly="True"> <RichTextBox x:Name="textLog" Margin="0,300,0,0" IsReadOnly="True" VerticalScrollBarVisibility="Visible" Background="White">
<FlowDocument> <FlowDocument>
<Paragraph> <Paragraph>
<Run Text="LOG"/> <Run Text="TEXTLOG"/>
</Paragraph> </Paragraph>
</FlowDocument> </FlowDocument>
</RichTextBox> </RichTextBox>
+2 -12
View File
@@ -1,16 +1,5 @@
using System; using formula_manage.UserClass;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace formula_manage.EX namespace formula_manage.EX
{ {
@@ -22,6 +11,7 @@ namespace formula_manage.EX
public ExProgram() public ExProgram()
{ {
InitializeComponent(); InitializeComponent();
LogDataRead.SetTextControl(textLog);
} }
} }
} }
+34
View File
@@ -0,0 +1,34 @@
<Window x:Class="formula_manage.EX.Exchange"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:formula_manage.EX"
mc:Ignorable="d"
DataContext="{Binding Source={StaticResource Locator}, Path=Exchange}"
Title="Exchange" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0">
<Grid>
<DataGrid x:Name="gridLog" Margin="5,5,0,5" HorizontalAlignment="Left" Width="245" HeadersVisibility ="Column" Background="White" BorderBrush="White"
IsReadOnly="True" AutoGenerateColumns="False" MouseDoubleClick="DataGrid_gridLogClick" >
<DataGrid.Columns>
<!--列信息绑定-->
<DataGridTextColumn Binding="{Binding Name}" Header="文件" Width="195" MaxWidth="195" MinWidth="195" CanUserReorder="False"/>
<DataGridTextColumn Binding="{Binding Length}" Header="大小" Width="50" MaxWidth="50" MinWidth="50" CanUserReorder="False"/>
<DataGridTextColumn Binding="{Binding CreationTimeUtc}" Header="创建时间" Width="150" MaxWidth="150" MinWidth="150" CanUserReorder="False"/>
<DataGridTextColumn Binding="{Binding LastWriteTimeUtc}" Header="最后修改时间" Width="150" MaxWidth="150" MinWidth="150" CanUserReorder="False"/>
</DataGrid.Columns>
</DataGrid>
<RichTextBox x:Name="Logtext" Margin="255,5,5,5" IsReadOnly="True" VerticalScrollBarVisibility="Visible" Background="White" SelectionBrush="White">
<FlowDocument>
<Paragraph>
<Run Text="LOG"/>
</Paragraph>
</FlowDocument>
</RichTextBox>
<!--遮罩-->
<Grid Grid.Column="1" x:Name="logR" Margin="0,0,0,0" Background="White" Opacity="0.8" Visibility="Hidden">
<TextBlock Height="50" Margin="0,0,0,150" TextWrapping="Wrap" Text="文件读取中请稍后..." Width="300" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Grid>
</Grid>
</Window>
+88
View File
@@ -0,0 +1,88 @@
using System;
using System.Data;
using System.IO;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Input;
namespace formula_manage.EX
{
/// <summary>
/// Exchange.xaml 的交互逻辑
/// </summary>
public partial class Exchange : Window
{
string Log_time = DateTime.Now.ToString("yyyy-MM-dd");
DataTable logdataTable = new DataTable(); //建立RRODUCT缓存
public Exchange()
{
WindowStartupLocation = WindowStartupLocation.CenterScreen;
InitializeComponent();
logdataTable.Columns.Add("Name", typeof(string));
logdataTable.Columns.Add("Length", typeof(int));
logdataTable.Columns.Add("CreationTimeUtc", typeof(string));
logdataTable.Columns.Add("LastWriteTimeUtc", typeof(string));
LOG_file();
}
private void LOG_file()//建立列表
{
DirectoryInfo loginfo = new DirectoryInfo(System.Environment.CurrentDirectory + "\\Exchange"); //new文件夹
foreach (var item in loginfo.GetFiles())
{
DataRow FileRow = logdataTable.NewRow();
FileRow["Name"] = item.Name;
FileRow["Length"] = item.Length / 1024;
FileRow["CreationTimeUtc"] = item.CreationTimeUtc;
FileRow["LastWriteTimeUtc"] = item.LastWriteTimeUtc;
logdataTable.Rows.Add(FileRow);
}
gridLog.ItemsSource = logdataTable.DefaultView;
}
private void DataGrid_gridLogClick(object sender, MouseButtonEventArgs e)//数据表双击事件
{
int rownum = gridLog.SelectedIndex;//获取鼠标选中行并定义变量
logR.Visibility = Visibility.Visible; //开启页面遮罩
if (rownum != -1)//判断鼠标定位是否有效
{
/*定位选中行及指定列单元格文本信息*/
LOGDATA_file((gridLog.Columns[0].GetCellContent(gridLog.Items[rownum]) as TextBlock).Text.TrimEnd());//
}
logR.Visibility = Visibility.Hidden;
}
private void LOGDATA_file(string dat) //读取文件显示到前端
{
Logtext.Document = new FlowDocument();
string filePath = System.Environment.CurrentDirectory + "\\Exchange\\";
try
{
// 使用StreamReader读取文件
using (StreamReader reader = new StreamReader(filePath + dat))
{
// 读取文件直到文件的末尾
while (!reader.EndOfStream)
{
// 添加文件的每一行到RichTextBox
Logtext.AppendText(reader.ReadLine() + "\r\n");
}
}
}
catch (Exception ex)
{
// 处理可能发生的任何异常
MessageBox.Show("Error reading file: " + ex.Message);
}
}
}
}
+1 -13
View File
@@ -1,16 +1,4 @@
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace formula_manage namespace formula_manage
{ {
+2 -8
View File
@@ -1,10 +1,4 @@
using System; namespace formula_manage
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage
{ {
/// <summary> /// <summary>
/// 查询接口 /// 查询接口
@@ -12,6 +6,6 @@ namespace formula_manage
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
public interface IProvider<T> where T : class public interface IProvider<T> where T : class
{ {
} }
} }
+38 -62
View File
@@ -1,24 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Runtime.InteropServices;
using System.Data.SqlClient;
using System.Data;
using System.Security.Policy;
using System.IO;
using formula_manage.Windows;
namespace formula_manage namespace formula_manage
{ {
@@ -27,41 +14,23 @@ namespace formula_manage
/// </summary> /// </summary>
public partial class Login : Window public partial class Login : Window
{ {
string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\Log.txt";//日志文件
string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]:";
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径 public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
DataTable logindataTable = new DataTable(); //建立login缓存 DataTable logindataTable = new DataTable(); //建立login缓存
public Login() public Login()
{ {
WindowStartupLocation = WindowStartupLocation.CenterScreen; WindowStartupLocation = WindowStartupLocation.CenterScreen;
InitializeComponent(); InitializeComponent();
System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录 UserClass.LogGing.LogGingDATA("FORMULA_start");
if (!File.Exists(logPath))//检查日志文件并写入启动日志
{
FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + "FORMULA_start");
wr.Close();
}
else
{
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + "FORMULA_start");
wr.Close();
}
} }
private void Button_Click(object sender, RoutedEventArgs e) //退出按钮事件 private void Button_Click(object sender, RoutedEventArgs e) //退出按钮事件
{ {
this.Close(); UserClass.LogGing.LogGingDATA("FORMULA_LogStop");
Window window = Window.GetWindow(this);
window.Close();
} }
private void Button_Click_1(object sender, RoutedEventArgs e) //登录按钮事件 private void Button_Click_1(object sender, RoutedEventArgs e) //登录按钮事件
@@ -83,18 +52,15 @@ namespace formula_manage
MainWindow Main = new MainWindow(); MainWindow Main = new MainWindow();
window.Close(); window.Close();
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write); UserClass.LogGing.LogGingDATA("LOGon = ENGINEER");
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + "LOGon_ENGINEER");
wr.Close();
Main.ShowDialog();//实例化并置顶打开窗口 Main.ShowDialog();//实例化并置顶打开窗口
} }
else else
{ {
string var_sql; string var_sql;
if (pasword =="") var_sql = "[UserCode]='" + user + "' and [PassWord] is null"; //查询字符 if (pasword == "") var_sql = "[UserCode]='" + user + "' and [PassWord] is null"; //查询字符
else var_sql = "[UserCode]='" + user + "' and [PassWord]='" + pasword + "'"; else var_sql = "[UserCode]='" + user + "' and [PassWord]='" + pasword + "'";
var loginOK = this.logindataTable.Select(var_sql).FirstOrDefault(); //查询账号信息是否正确,不正确返回null var loginOK = this.logindataTable.Select(var_sql).FirstOrDefault(); //查询账号信息是否正确,不正确返回null
@@ -107,15 +73,12 @@ namespace formula_manage
MainWindow Main = new MainWindow(); MainWindow Main = new MainWindow();
window.Close(); window.Close();
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write); UserClass.LogGing.LogGingDATA("LOGon = " + user);
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + "LOGon_" + user);
wr.Close();
Main.ShowDialog();//实例化并置顶打开窗口 Main.ShowDialog();//实例化并置顶打开窗口
} }
else else
System.Windows.MessageBox.Show("账号或密码错误"); System.Windows.MessageBox.Show("账号或密码错误");
} }
} }
@@ -150,18 +113,20 @@ namespace formula_manage
DBCLINK.Visibility = Visibility.Hidden; DBCLINK.Visibility = Visibility.Hidden;
EXLINK.Visibility = Visibility.Hidden; EXLINK.Visibility = Visibility.Hidden;
USERLINK.Visibility = Visibility.Hidden; USERLINK.Visibility = Visibility.Hidden;
DISPENLINK.Background = Brushes.Red; DISPENLINK.Background = Brushes.Red;
} }
if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6"))) if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
{ {
try try
{ {
EXLINK.Background = Brushes.Green; EXLINK.Background = Brushes.Green;
}catch(Exception) }
catch (Exception)
{ {
EXLINK.Background = Brushes.Red; EXLINK.Background = Brushes.Red;
System.Windows.MessageBox.Show("扩展程序未启动"); System.Windows.MessageBox.Show("扩展程序未启动");
UserClass.LogGing.LogGingDATA("EX = FALL_TO_START");
} }
} }
try try
@@ -172,16 +137,17 @@ namespace formula_manage
TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4"); TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5"); TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
SQL2 = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6")); //数据库对象2是否生效 SQL2 = Boolean.Parse(Configini.IniReadvalue("SQL_SERVER", "SQL6")); //数据库对象2是否生效
}catch(Exception) }
{ catch (Exception)
System.Windows.MessageBox.Show("配置信息丢失"); {
System.Windows.MessageBox.Show("配置信息丢失");
} }
if (TEXT_SQMOD == "0") //判断连接方式 if (TEXT_SQMOD == "0") //判断连接方式
{ {
Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI"; Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";Trusted_Connection=SSPI";
} }
else else
{ {
Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR; Connstr_SC = "server=" + TEXT_SQLIP + ";database=" + TEXT_SQLNAME + ";User ID=" + TEXT_SQLUSER + ";Password=" + TEXT_SQLPASWOR;
} }
@@ -190,16 +156,20 @@ namespace formula_manage
try try
{ {
await conn_SC.OpenAsync(); await conn_SC.OpenAsync();
}catch (Exception) }
catch (Exception)
{ {
DISPENLINK.Background = Brushes.Red; //连接失败红色 DISPENLINK.Background = Brushes.Red; //连接失败红色
DBCLINK.Background = Brushes.Red; DBCLINK.Background = Brushes.Red;
System.Windows.MessageBox.Show("连接数据库失败"); System.Windows.MessageBox.Show("连接数据库失败");
//Windows.Sql sql = new Windows.Sql(); //Windows.Sql sql = new Windows.Sql();
//sql.ShowDialog();//实例化并置顶打开数据库设置窗口 //sql.ShowDialog();//实例化并置顶打开数据库设置窗口
UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
return; return;
} }
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
DISPENLINK.Background = Brushes.Green; //连接成功绿色 DISPENLINK.Background = Brushes.Green; //连接成功绿色
@@ -220,15 +190,19 @@ namespace formula_manage
} }
SqlConnection conn_DBC = new SqlConnection(Connstr_DBC); SqlConnection conn_DBC = new SqlConnection(Connstr_DBC);
try try
{ {
await conn_DBC.OpenAsync(); await conn_DBC.OpenAsync();
}catch (Exception) }
catch (Exception)
{ {
DBCLINK.Background = Brushes.Red; //连接失败红色 DBCLINK.Background = Brushes.Red; //连接失败红色
System.Windows.MessageBox.Show("连接数据库失败"); System.Windows.MessageBox.Show("连接数据库失败");
//Windows.Sql sql = new Windows.Sql(); //Windows.Sql sql = new Windows.Sql();
//sql.ShowDialog();//实例化并置顶打开数据库设置窗口 //sql.ShowDialog();//实例化并置顶打开数据库设置窗口
UserClass.LogGing.LogGingDATA("DBCLINK = ConnectFailed");
return; return;
} }
DBCLINK.Background = Brushes.Green; //连接成功绿色 DBCLINK.Background = Brushes.Green; //连接成功绿色
@@ -255,11 +229,13 @@ namespace formula_manage
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求信息失败,检查连接"); System.Windows.MessageBox.Show("请求信息失败,检查连接");
UserClass.LogGing.LogGingDATA("USER = NoData");
return; return;
} }
} }
} }
} }
} }
+11 -8
View File
@@ -24,7 +24,6 @@
<MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/> <MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/>
<Separator/> <Separator/>
<MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/> <MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
<MenuItem Header="_转换设置" FontSize="16" Name="_EXCHANGE_SET" IsEnabled="False"/>
<MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/> <MenuItem Header="_打印设置" FontSize="16" Name="_PRINT_SET" Click="PRINT_SET" IsEnabled="False"/>
<MenuItem Header="_登录限制" FontSize="16" Name="_USER_log" IsEnabled="False"/> <MenuItem Header="_登录限制" FontSize="16" Name="_USER_log" IsEnabled="False"/>
</MenuItem> </MenuItem>
@@ -46,9 +45,13 @@
</MenuItem> </MenuItem>
<MenuItem Header="_查询" FontSize="16" Focusable ="False"> <MenuItem Header="_查询" FontSize="16" Focusable ="False">
<MenuItem Header="_领料单据" FontSize="16"/> <MenuItem Header="_领料单据" FontSize="16"/>
<MenuItem Header="_转换历史" FontSize="16"/>
<MenuItem Header="_统计" FontSize="16" Name="_statistics" IsEnabled="False"/> <MenuItem Header="_统计" FontSize="16" Name="_statistics" IsEnabled="False"/>
</MenuItem> </MenuItem>
<MenuItem Header="_扩展" FontSize="16" Focusable ="False">
<MenuItem Header="_模式" FontSize="16" Name="_WorkingMode" IsEnabled="False"/>
<MenuItem Header="_转换设置" FontSize="16" Name="_EX_SET" Click="EX_SET" IsEnabled="False"/>
<MenuItem Header="_转换历史" FontSize="16" Name="_exchange" Click="EXCHANGE" IsEnabled="False"/>
</MenuItem>
<MenuItem Header="_帮助" FontSize="16" Focusable ="False"> <MenuItem Header="_帮助" FontSize="16" Focusable ="False">
<MenuItem Header="_帮助" FontSize="16" Click="HELP"/> <MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
</MenuItem> </MenuItem>
@@ -217,12 +220,12 @@
<ContentControl x:Name="Deputy"/> <ContentControl x:Name="Deputy"/>
</Grid> </Grid>
<Grid Grid.Column="1" Margin="0,0,0,0" Background="White" Opacity="0.8" Visibility="{Binding Cdk_page}"> <Grid Grid.Column="1" Margin="0,0,0,0" Background="White" Visibility="{Binding Cdk_page}" Opacity="0.8">
<TextBlock Height="50" Margin="0,0,0,300" TextWrapping="Wrap" Text="The registration code expires" Width="500" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Height="150" Margin="0,0,0,300" TextWrapping="Wrap" Text="注册信息到期,处理注册信息预计需要3个工作日,为避免影响系统使用请及时提交注册信息!" Width="500" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Height="50" Margin="0,0,0,200" TextWrapping="Wrap" Text="{Binding Cdk_time}" Width="500" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Height="50" Margin="0,0,0,100" TextWrapping="Wrap" Text="{Binding Cdk_time}" Width="500" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Red"/>
<TextBlock Height="50" Margin="0,0,0,100" TextWrapping="Wrap" Text="Contact SUNLIGHT Reactivate" Width="500" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Height="50" Margin="0,0,0,0" TextWrapping="Wrap" Text="请联系 SUNLIGHT" Width="300" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<Button Content="Reactivate" HorizontalAlignment="Center" Height="50" Margin="200,100,0,0" VerticalAlignment="Center" Width="150" FontSize="24" BorderBrush="{x:Null}" Background="#FFDFDFDF" Click="CDKEY_SET"/> <Button Content="激活" HorizontalAlignment="Center" Height="50" Margin="200,100,0,-100" VerticalAlignment="Center" Width="150" FontSize="24" BorderBrush="{x:Null}" Background="#FFDFDFDF" Click="CDKEY_SET"/>
<Button Content="Contact" HorizontalAlignment="Center" Height="50" Margin="0,100,200,0" VerticalAlignment="Center" Width="150" FontSize="24" BorderBrush="{x:Null}" Background="#FFDFDFDF" Click="HELP"/> <Button Content="帮助" HorizontalAlignment="Center" Height="50" Margin="0,100,200,-100" VerticalAlignment="Center" Width="150" FontSize="24" BorderBrush="{x:Null}" Background="#FFDFDFDF" Click="HELP"/>
<TextBlock Height="50" Margin="0,0,0,0" TextWrapping="Wrap" Text="{Binding Cdk_pageT}" Width="500" FontSize="34" HorizontalAlignment="Right" VerticalAlignment="Bottom"/> <TextBlock Height="50" Margin="0,0,0,0" TextWrapping="Wrap" Text="{Binding Cdk_pageT}" Width="500" FontSize="34" HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
</Grid> </Grid>
+70 -68
View File
@@ -1,40 +1,18 @@
using formula_manage.Windows; using formula_manage.UserClass;
using formula_manage.View;
using formula_manage.ViewModel;
using formula_manage.Windows;
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Globalization; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
using formula_manage.ViewModel;
using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
using static System.Net.Mime.MediaTypeNames;
using formula_manage.UserClass;
using System.Drawing;
using System.Diagnostics;
using System.Printing;
using System.Drawing.Printing;
using static System.Drawing.Printing.PrinterSettings;
using formula_manage.View;
namespace formula_manage namespace formula_manage
{ {
@@ -43,16 +21,18 @@ namespace formula_manage
/// </summary> /// </summary>
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
Font font = new Font("Microsoft YaHei", 20); Font font = new Font("Microsoft YaHei", 20);
bool quit = false; bool quit = false;
// DataTable DissolvedataTable = new DataTable(); //建立Dissolve缓存 // DataTable DissolvedataTable = new DataTable(); //建立Dissolve缓存
// DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存 // DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存
// DataTable MACHINEdataTable = new DataTable(); //建立Machine缓存 // DataTable MACHINEdataTable = new DataTable(); //建立Machine缓存
DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT缓存 DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT缓存
// DataTable RecipedataTable = new DataTable(); //建立Recipe缓存 // DataTable RecipedataTable = new DataTable(); //建立Recipe缓存
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径 private readonly string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
//调用配置文件
private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini");
string TEXT_SQLIP; string TEXT_SQLIP;
string TEXT_SQLNAME; string TEXT_SQLNAME;
@@ -61,7 +41,6 @@ namespace formula_manage
string TEXT_SQLPASWOR; string TEXT_SQLPASWOR;
string Connstr_SC; string Connstr_SC;
int ID_N = 1; int ID_N = 1;
string DYELOT_;
string Tlist_Weight; string Tlist_Weight;
string Tlist_Proportion; string Tlist_Proportion;
@@ -74,6 +53,16 @@ namespace formula_manage
InitializeComponent(); InitializeComponent();
this.Closing += Window_Closing; //添加窗口关闭事件 this.Closing += Window_Closing; //添加窗口关闭事件
if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
{
UserClass.TCPServer.Start(); //开启网路通讯
_WorkingMode.Header = "服务端";
}
else
{
_WorkingMode.Header = "客户端";
}
USER.Text = App.USER_Purview; USER.Text = App.USER_Purview;
RRODUCTdataTable.Columns.Add("ID", typeof(int)); RRODUCTdataTable.Columns.Add("ID", typeof(int));
RRODUCTdataTable.Columns.Add("DYELOT", typeof(string)); RRODUCTdataTable.Columns.Add("DYELOT", typeof(string));
@@ -93,7 +82,7 @@ namespace formula_manage
_SQL.IsEnabled = true; _SQL.IsEnabled = true;
_SQLBAK.IsEnabled = true; _SQLBAK.IsEnabled = true;
_SOFTWARE_SET.IsEnabled = true; _SOFTWARE_SET.IsEnabled = true;
_EXCHANGE_SET.IsEnabled = true; _EX_SET.IsEnabled = true;
_PRINT_SET.IsEnabled = true; _PRINT_SET.IsEnabled = true;
_USER_SET.IsEnabled = true; _USER_SET.IsEnabled = true;
_USER_log.IsEnabled = true; _USER_log.IsEnabled = true;
@@ -107,6 +96,7 @@ namespace formula_manage
_client.IsEnabled = true; _client.IsEnabled = true;
_color.IsEnabled = true; _color.IsEnabled = true;
_statistics.IsEnabled = true; _statistics.IsEnabled = true;
_exchange.IsEnabled = true;
} }
sql_(); sql_();
@@ -124,8 +114,7 @@ namespace formula_manage
private void PrintForms()//传入可用打印模板 private void PrintForms()//传入可用打印模板
{ {
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); int dirID = 0;
int dirID=0;
DataTable Report = new DataTable(); DataTable Report = new DataTable();
Report.Columns.Add("NAME", typeof(string)); Report.Columns.Add("NAME", typeof(string));
@@ -153,9 +142,8 @@ namespace formula_manage
Forms_.Text = Temp_m; Forms_.Text = Temp_m;
} }
private void sql_() private void sql_()
{ {
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件 TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2"); TEXT_SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3"); TEXT_SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
@@ -194,6 +182,7 @@ namespace formula_manage
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求信息失败,检查连接"); System.Windows.MessageBox.Show("请求信息失败,检查连接");
UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
return; return;
} }
@@ -207,7 +196,7 @@ namespace formula_manage
_SQL.IsEnabled = true; _SQL.IsEnabled = true;
_SQLBAK.IsEnabled = true; _SQLBAK.IsEnabled = true;
_SOFTWARE_SET.IsEnabled = true; _SOFTWARE_SET.IsEnabled = true;
_EXCHANGE_SET.IsEnabled = true; _EX_SET.IsEnabled = true;
_PRINT_SET.IsEnabled = true; _PRINT_SET.IsEnabled = true;
_USER_SET.IsEnabled = true; _USER_SET.IsEnabled = true;
_RECIPE.IsEnabled = true; _RECIPE.IsEnabled = true;
@@ -220,6 +209,7 @@ namespace formula_manage
_client.IsEnabled = true; _client.IsEnabled = true;
_color.IsEnabled = true; _color.IsEnabled = true;
_statistics.IsEnabled = true; _statistics.IsEnabled = true;
_exchange.IsEnabled = true;
} }
else else
{ {
@@ -237,15 +227,12 @@ namespace formula_manage
_client.IsEnabled = true; _client.IsEnabled = true;
_color.IsEnabled = true; _color.IsEnabled = true;
_statistics.IsEnabled = true; _statistics.IsEnabled = true;
_exchange.IsEnabled = true;
} }
} }
} }
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件 private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件
{ {
string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\Log.txt";//日志文件
string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]:";
if (!quit) if (!quit)
{ {
MessageBoxResult result = System.Windows.MessageBox.Show("您确定要退出吗?", "SUNLIGHT", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel); MessageBoxResult result = System.Windows.MessageBox.Show("您确定要退出吗?", "SUNLIGHT", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
@@ -253,14 +240,17 @@ namespace formula_manage
if (result == MessageBoxResult.Cancel) //判断是否确认 if (result == MessageBoxResult.Cancel) //判断是否确认
{ {
e.Cancel = true; // 中断点击事件 e.Cancel = true; // 中断点击事件
return;
} }
} }
System.IO.DirectoryInfo log = new System.IO.DirectoryInfo(@logpath);//生成日志文件目录 // UserClass.LogGing.LogGingDATA(Log_time + "HttpSERVER_STOP");
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write); if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
StreamWriter wr = new StreamWriter(fs);//创建文件 {
wr.WriteLine(Log_time + "FORMULA_STOP"); UserClass.TCPServer.Btn_SendAll("SERVER_STOP");
wr.Close(); }
UserClass.LogGing.LogGingDATA("FORMULA_STOP");
} }
private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //回车跳转功能 private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e) //回车跳转功能
{ {
@@ -302,7 +292,7 @@ namespace formula_manage
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
string PreposeT4 = Configini.IniReadvalue("SOFTWARE_SET", "T6"); // string PreposeT4 = Configini.IniReadvalue("SOFTWARE_SET", "T6"); //
string time = System.DateTime.Now.ToString(PreposeT); //获取系统时 string time = System.DateTime.Now.ToString(PreposeT); //获取系统时
if (PreposeT4 != time) PreposeSl = 0; if (PreposeT4 != time) PreposeSl = 0;
PreposeSl = PreposeSl + 1; PreposeSl = PreposeSl + 1;
str_Prepose = String.Format("{0:D" + preposeL + "}", PreposeSl); str_Prepose = String.Format("{0:D" + preposeL + "}", PreposeSl);
@@ -381,10 +371,15 @@ namespace formula_manage
Windows.User user_set = new Windows.User(); Windows.User user_set = new Windows.User();
user_set.ShowDialog();//实例化并置顶打开用户窗口 user_set.ShowDialog();//实例化并置顶打开用户窗口
} }
private void PRINT_SET(object sender, RoutedEventArgs e) private void EX_SET(object sender, RoutedEventArgs e)//扩展程序
{
EX.ExProgram ex = new EX.ExProgram();
ex.ShowDialog();
}
private void PRINT_SET(object sender, RoutedEventArgs e)//打印设置
{ {
Windows.Print print = new Windows.Print(); Windows.Print print = new Windows.Print();
print.ShowDialog();//实例化并置顶打开打印窗口 print.ShowDialog();
} }
private void HELP(object sender, RoutedEventArgs e) private void HELP(object sender, RoutedEventArgs e)
{ {
@@ -419,6 +414,12 @@ namespace formula_manage
Windows.Dissolve dissolve = new Windows.Dissolve(); Windows.Dissolve dissolve = new Windows.Dissolve();
dissolve.ShowDialog();//实例化并置顶打开设置窗口 dissolve.ShowDialog();//实例化并置顶打开设置窗口
} }
private void EXCHANGE(object sender, RoutedEventArgs e)//交换日志
{
EX.Exchange exchange = new EX.Exchange();
exchange.ShowDialog();
}
private void print(object sender, RoutedEventArgs e) private void print(object sender, RoutedEventArgs e)
{ {
Print.IsEnabled = false; Print.IsEnabled = false;
@@ -431,7 +432,7 @@ namespace formula_manage
if (dialog.ShowDialog() == true) if (dialog.ShowDialog() == true)
{ {
// dialog.PrintVisual(printArea, "Print Test"); // dialog.PrintVisual(printArea, "Print Test");
// dialog.PrintVisual(richText, "测试"); // dialog.PrintVisual(richText, "测试");
} }
Print.IsEnabled = true; Print.IsEnabled = true;
@@ -491,6 +492,7 @@ namespace formula_manage
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("数据访问失败,重试"); System.Windows.MessageBox.Show("数据访问失败,重试");
UserClass.LogGing.LogGingDATA("DatabaseConnectionFailed");
return; return;
} //单号重复检查 } //单号重复检查
if (Machine.Text == "") if (Machine.Text == "")
@@ -558,7 +560,7 @@ namespace formula_manage
Procedures_N.Text = "1"; Procedures_N.Text = "1";
Procedures_P.Text = "1"; Procedures_P.Text = "1";
System.Windows.MessageBox.Show(Number.Text+"-"+ ReDye.Text + "已保存"); System.Windows.MessageBox.Show(Number.Text + "-" + ReDye.Text + "已保存");
Number_Event(); Number_Event();
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); //记录当前单序号 UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); //记录当前单序号
@@ -619,7 +621,7 @@ namespace formula_manage
public void Recevie_order(string[] value)//订单选择信息传递 public void Recevie_order(string[] value)//订单选择信息传递
{ {
order.Text = value[0]; order.Text = value[0];
Technology.Text = value[1]+"@" + value[2]; Technology.Text = value[1] + "@" + value[2];
} }
private void Button_Order(object sender, RoutedEventArgs e) private void Button_Order(object sender, RoutedEventArgs e)
@@ -637,7 +639,7 @@ namespace formula_manage
private void Button_Technology(object sender, RoutedEventArgs e) private void Button_Technology(object sender, RoutedEventArgs e)
{ {
ViewProcess viewProcess = new ViewProcess(); ViewProcess viewProcess = new ViewProcess();
viewProcess.sendMessage = Recevie_Technology; viewProcess.sendMessage = Recevie_Technology;
Deputy.Content = viewProcess; //打开工艺选择 Deputy.Content = viewProcess; //打开工艺选择
} }
@@ -665,7 +667,7 @@ namespace formula_manage
if (!r.Any()) return; //检查信息 if (!r.Any()) return; //检查信息
if (double.Parse(r[0].ItemArray[1].ToString()) < a) if (double.Parse(r[0].ItemArray[1].ToString()) < a)
{ {
System.Windows.MessageBox.Show("超载,确定重量","错误",MessageBoxButton.OK,MessageBoxImage.Error); System.Windows.MessageBox.Show("超载,确定重量", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
list_Weight.Text = "0"; list_Weight.Text = "0";
list_Total.Text = "0"; list_Total.Text = "0";
return; return;
@@ -673,7 +675,7 @@ namespace formula_manage
} }
private void Proportion(object sender, TextChangedEventArgs e) //浴比输入 private void Proportion(object sender, TextChangedEventArgs e) //浴比输入
{ {
float a, b, c=0; float a, b, c = 0;
b = float.Parse(list_Proportion.Text); b = float.Parse(list_Proportion.Text);
if (list_Weight.Text != "") //判断比例是否有效 if (list_Weight.Text != "") //判断比例是否有效
{ {
@@ -697,10 +699,10 @@ namespace formula_manage
string Name_; string Name_;
string Type_; string Type_;
string Conc_; string Conc_;
double Weight_=0; double Weight_ = 0;
private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//原料代码输入事件 private void CP_PRODUCT_CODE_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//原料代码输入事件
{ {
double ang; double ang;
if (e.Key == Key.Enter) if (e.Key == Key.Enter)
{ {
@@ -748,7 +750,7 @@ namespace formula_manage
Name_ = r[0].ItemArray[1].ToString(); Name_ = r[0].ItemArray[1].ToString();
Type_ = r[0].ItemArray[2].ToString(); Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString(); Conc_ = r[0].ItemArray[3].ToString();
Conc_ = (double.Parse(Conc_)/100).ToString(); Conc_ = (double.Parse(Conc_) / 100).ToString();
if ((Type_ == "0") || (Type_ == "3")) if ((Type_ == "0") || (Type_ == "3"))
{ {
@@ -777,7 +779,7 @@ namespace formula_manage
return; return;
} }
} }
DataRow row = RRODUCTdataTable.Rows[grid_row]; //ID列 DataRow row = RRODUCTdataTable.Rows[grid_row]; //ID列
row.BeginEdit(); row.BeginEdit();
row["PRODUCT_CODE"] = Code_; row["PRODUCT_CODE"] = Code_;
@@ -811,7 +813,7 @@ namespace formula_manage
private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//目标饱和度输入事件 private void CP_CONC_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)//目标饱和度输入事件
{ {
double ang; double ang;
double conc=0; double conc = 0;
System.Windows.Controls.TextBox curTextBox = sender as System.Windows.Controls.TextBox; System.Windows.Controls.TextBox curTextBox = sender as System.Windows.Controls.TextBox;
int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行 int grid_row = Grid_RRODUCT.SelectedIndex; //获取当前行
@@ -823,8 +825,8 @@ namespace formula_manage
System.Windows.MessageBox.Show("先选择原料"); System.Windows.MessageBox.Show("先选择原料");
return; return;
} }
if (e.Key == Key.Enter) if (e.Key == Key.Enter)
{ {
if (!double.TryParse(curTextBox.Text, out ang)) if (!double.TryParse(curTextBox.Text, out ang))
{ {
@@ -873,6 +875,7 @@ namespace formula_manage
} }
} }
} }
private void CP_PRODUCT_CODE_DropDownClosed(object sender, EventArgs e)//原料代码选择事件 private void CP_PRODUCT_CODE_DropDownClosed(object sender, EventArgs e)//原料代码选择事件
{ {
double ang; double ang;
@@ -921,7 +924,7 @@ namespace formula_manage
Name_ = r[0].ItemArray[1].ToString(); Name_ = r[0].ItemArray[1].ToString();
Type_ = r[0].ItemArray[2].ToString(); Type_ = r[0].ItemArray[2].ToString();
Conc_ = r[0].ItemArray[3].ToString(); Conc_ = r[0].ItemArray[3].ToString();
Conc_ = (double.Parse(Conc_)/100).ToString(); Conc_ = (double.Parse(Conc_) / 100).ToString();
if (double.TryParse(list_Weight.Text, out ang)) if (double.TryParse(list_Weight.Text, out ang))
{ {
@@ -962,7 +965,7 @@ namespace formula_manage
row["PRODUCT_CODE"] = Code_; row["PRODUCT_CODE"] = Code_;
row["PRODUCT_NAME"] = Name_; row["PRODUCT_NAME"] = Name_;
row["SHIFT"] = Type_; row["SHIFT"] = Type_;
row.EndEdit(); row.EndEdit();
DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true); //实时更新datagrid DataGridHelper.SetRealTimeCommit(Grid_RRODUCT, true); //实时更新datagrid
Save.IsEnabled = false; Save.IsEnabled = false;
Confirm.IsEnabled = false; Confirm.IsEnabled = false;
@@ -1034,6 +1037,5 @@ namespace formula_manage
Save.IsEnabled = false; Save.IsEnabled = false;
Confirm.IsEnabled = false; Confirm.IsEnabled = false;
} }
} }
} }
-2
View File
@@ -1,6 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
+2 -6
View File
@@ -1,14 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.SQLModels namespace formula_manage.SQLModels
{ {
// internal class STUFF_Product // internal class STUFF_Product
//{ //{
// } // }
public partial class Product public partial class Product
{ {
-3
View File
@@ -1,8 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
-3
View File
@@ -2,9 +2,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
+1 -5
View File
@@ -1,10 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows; using System.Windows;
using System.Windows.Controls;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
@@ -1,15 +1,11 @@
using System; using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Data; using System.Data;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
internal class DataTableToObservableCollection internal class DataTableToObservableCollection //数据表到可观察集合
{ {
public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new() public ObservableCollection<T> ToObservableCollection<T>(DataTable dt) where T : class, new()
{ {
+1 -6
View File
@@ -1,9 +1,4 @@
using System; using System.Management;
using System.Collections.Generic;
using System.Linq;
using System.Management;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
+1 -5
View File
@@ -1,9 +1,5 @@
using System; using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
+76
View File
@@ -0,0 +1,76 @@
using System.Text;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Media;
namespace formula_manage.UserClass
{
public static class LogDataRead
{
private const int MaxCount = 1000;
private static int Count = 0;
private static RichTextBox textControl;
private static InlineCollection inlines;
//设置主控件
public static void SetTextControl(RichTextBox _textBox)
{
textControl = _textBox;
Paragraph graph = new Paragraph();
inlines = graph.Inlines;
textControl.Document.Blocks.Add(graph);
}
//输出黑色消息
public static void Info(string format, params object[] args)
{
AppendText(Brushes.Black, format, args);
}
//输出绿色消息
public static void Suc(string format, params object[] args)
{
AppendText(Brushes.DarkGreen, format, args);
}
//输出黄色消息
public static void Warning(string format, params object[] args)
{
AppendText(Brushes.DarkOrange, format, args);
}
//输出红色消息
public static void Error(string format, params object[] args)
{
AppendText(Brushes.Red, format, args);
}
//清除日志
public static void Clear()
{
Count = 0;
inlines.Clear();
textControl.ScrollToEnd();
}
private static void AppendText(Brush color, string format, params object[] args)
{
textControl.BeginChange();
StringBuilder builder = new StringBuilder();
builder.Append("[");
builder.Append(Count++);
builder.Append("] : ");
builder.Append(string.Format(format, (object[])args));
builder.Append("\n");
string str = builder.ToString();
inlines.Add(new Run(str) { Foreground = color });
if (inlines.Count > MaxCount)
{
inlines.Remove(inlines.FirstInline);
}
textControl.ScrollToEnd();
textControl.EndChange();
}
}
}
+37
View File
@@ -0,0 +1,37 @@
using System;
using System.IO;
namespace formula_manage.UserClass
{
public class LogGing
{
public static void LogGingDATA(string dat)
{
string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录
string logPath = "" + System.Environment.CurrentDirectory + "\\Log\\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt";//日志文件
string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]:";
if (Directory.Exists(logpath))//检查日志路径
{
if (!File.Exists(logPath))//检查日志文件并写入启动日志
{
FileStream fs = new FileStream(logPath, FileMode.CreateNew, FileAccess.Write);//创建写入文件
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + dat);
wr.Close();
}
else
{
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + dat);
wr.Close(); }
}
else
{
DirectoryInfo directoryInfo = new DirectoryInfo(logpath);
directoryInfo.Create();//创建日志路径
}
}
}
}
-3
View File
@@ -1,9 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
-4
View File
@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace formula_manage.UserClass namespace formula_manage.UserClass
+3 -6
View File
@@ -3,9 +3,6 @@ using FastReport.Data;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
@@ -83,9 +80,9 @@ namespace formula_manage.UserClass
{ {
string chineseSimpleFrl = AppDomain.CurrentDomain.BaseDirectory + @"FastReport\Localization\language.frl"; string chineseSimpleFrl = AppDomain.CurrentDomain.BaseDirectory + @"FastReport\Localization\language.frl";
FastReport.Utils.Res.LoadLocale(chineseSimpleFrl); FastReport.Utils.Res.LoadLocale(chineseSimpleFrl);
} }
catch (Exception ex) catch (Exception)
{ {
} }
try try
+2 -6
View File
@@ -1,8 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass namespace formula_manage.UserClass
{ {
@@ -30,8 +26,8 @@ namespace formula_manage.UserClass
//方法3 //方法3
//int r3 = Convert.ToInt32(str, 16); //int r3 = Convert.ToInt32(str, 16);
//Console.WriteLine(r3); //Console.WriteLine(r3);
} }
catch (Exception e) catch (Exception)
{ {
res = 0; res = 0;
} }
+186
View File
@@ -0,0 +1,186 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
namespace formula_manage.UserClass
{
public class TCPServer
{
public static string infoR;
//第一步:调用socket()函数创建一个用于通信的套接字
public static Socket listenSocket;
//字典集合:存储IP和Socket的集合
public static Dictionary<string, Socket> OnLineList = new Dictionary<string, Socket>();
//当前时间
private string CurrentTime
{
get { return DateTime.Now.ToString("HH:mm:ss") + Environment.NewLine; }
}
//编码格式
public static Encoding econding = Encoding.UTF8;
public static void Start()
{
//第一步:调用socket()函数创建一个用于通信的套接字
listenSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
//第二步:给已经创建的套接字绑定一个端口号,这一般通过设置网络套接口地址和调用Bind()函数来实现
IPEndPoint endPoint = new IPEndPoint(IPAddress.Parse(UserClass.get_local_ip_address.IP_Address()), int.Parse("11080"));
UserClass.LogGing.LogGingDATA("NativeIP = " + UserClass.get_local_ip_address.IP_Address());
UserClass.LogGing.LogGingDATA("NativePORT = 11080");
try
{
listenSocket.Bind(endPoint);
}
catch (Exception ex)
{
UserClass.LogGing.LogGingDATA("TCP_NotStart");
UserClass.LogGing.LogGingDATA(ex.Message);
return;
}
//第三步:调用listen()函数使套接字成为一个监听套接字
listenSocket.Listen(10);
//ShowMessage("服务器开启成功");
//开启一个线程监听
Task.Run(new Action(() => { ListenConnection(); }));
}
public static void ListenConnection()
{
while (true)
{
Socket clientSocket = listenSocket.Accept();
string ip = clientSocket.RemoteEndPoint.ToString();
//更新在线列表
// AddOnLine(ip, true);
//更新在线列表集合
OnLineList.Add(ip, clientSocket);
UserClass.LogGing.LogGingDATA("IP_Online = " + ip);
// ShowMessage(ip + "上线了");
Task.Run(() => ReceiveMsg(clientSocket));
}
}
/// <summary>
/// 接收方法
/// </summary>
/// <param name="clientSocket"></param>
public static void ReceiveMsg(Socket clientSocket)
{
while (true)
{
//定义一个2M的缓冲区
byte[] buffer = new byte[1024 * 1024 * 10];
int length = -1;
try
{
length = clientSocket.Receive(buffer);
}
catch (Exception)
{
//客户端下线了
//更新在线列表
string ip = clientSocket.RemoteEndPoint.ToString();
UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
// AddOnLine(ip, false);
OnLineList.Remove(ip); //移除ip
break; //退出循环
}
if (length == 0)
{
//客户端下线了
//更新在线列表
string ip = clientSocket.RemoteEndPoint.ToString();
UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
// AddOnLine(ip, false);
OnLineList.Remove(ip);
break;
}
else
{
infoR = econding.GetString(buffer, 0, length);
//ShowMessage(info);
string ip = clientSocket.RemoteEndPoint.ToString();
}
}
}
/*
/// <summary>
/// 在线列表更新
/// </summary>
/// <param name="clientIp"></param>
/// <param name="value"></param>
private void AddOnLine(string clientIp, bool value)
{
Invoke(new Action(() =>
{
if (value)
{
this.lst_Online.Items.Add(clientIp);
}
else
{
this.lst_Online.Items.Remove(clientIp);
}
}));
}
/// <summary>
/// 更新接收区
/// </summary>
/// <param name="info"></param>
private void ShowMessage(string info)
{
Invoke(new Action(() =>
{
this.txt_Rcv.AppendText(CurrentTime + info + Environment.NewLine);
}));
}
*/
/// <summary>
/// 消息发送
/// </summary>
public static void Bn_Send(string IP, string DAT)
{
if (OnLineList.ContainsKey(IP))
{
OnLineList[IP].Send(econding.GetBytes(DAT));
}
}
/// <summary>
/// 群发功能
/// </summary>
public static void Btn_SendAll(string DAT)
{
foreach (string item in OnLineList.Keys.ToArray())
{
if (OnLineList.ContainsKey(item))
{
OnLineList[item].Send(econding.GetBytes(DAT));
}
}
}
}
}
+2 -6
View File
@@ -1,11 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Drawing.Printing; using System.Drawing.Printing;
using System.Linq;
using System.Management; using System.Management;
using System.Printing; using System.Printing;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace formula_manage.UserClass namespace formula_manage.UserClass
@@ -192,11 +188,11 @@ namespace formula_manage.UserClass
MessageBox.Show("网络打印机不可用", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("网络打印机不可用", "警告", MessageBoxButtons.OK, MessageBoxIcon.Error);
// WriteLog.SetString(ex.Message); // WriteLog.SetString(ex.Message);
} }
else else
{ {
// WriteLog.SetException(ex); // WriteLog.SetException(ex);
} }
} }
} }
+46
View File
@@ -0,0 +1,46 @@
using System.Net.NetworkInformation;
using System.Net.Sockets;
namespace formula_manage.UserClass
{
public class get_local_ip_address
{
public static string getLocalIPAddressWithNetworkInterface(NetworkInterfaceType _type)//获取本机ip并以字符串方式返回
{
string output = "";
foreach (NetworkInterface item in NetworkInterface.GetAllNetworkInterfaces())
{
if (item.NetworkInterfaceType == _type && item.OperationalStatus == OperationalStatus.Up)
{
foreach (UnicastIPAddressInformation ip in item.GetIPProperties().UnicastAddresses)
{
if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
{
output = ip.Address.ToString();
}
}
}
}
return output;
}
public static string IP_Address()
{
string ip;
ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ethernet);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wireless80211);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Ppp);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Wwanpp);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.TokenRing);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Fddi);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.GenericModem);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.IPOverAtm);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Tunnel);
if (ip == "") ip = getLocalIPAddressWithNetworkInterface(NetworkInterfaceType.Unknown);
if (ip == "") ip = "127.0.0.1";
return ip;
}
}
}
+1 -14
View File
@@ -1,17 +1,4 @@
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace formula_manage.View namespace formula_manage.View
{ {
+6 -18
View File
@@ -1,28 +1,16 @@
using System; using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using FastReport.Editor;
using FastReport.DevComponents.DotNetBar;
namespace formula_manage.View namespace formula_manage.View
{ {
/// <summary> /// <summary>
/// ViewProcess.xaml 的交互逻辑 /// ViewProcess.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class ViewOrder: UserControl public partial class ViewOrder : UserControl
{ {
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径 public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini"; //配置文件路径
@@ -89,11 +77,11 @@ namespace formula_manage.View
{ {
int a; int a;
string order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句 string order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
a = condition.SelectedIndex; //获取选择条件 a = condition.SelectedIndex; //获取选择条件
if(a==1) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where ProcessNAME = '"+ search.Text + "' order by OrdeTime desc";//查询语句 if (a == 1) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where ProcessNAME = '" + search.Text + "' order by OrdeTime desc";//查询语句
else if(a==2) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where customer = '" + search.Text + "' order by OrdeTime desc";//查询语句 else if (a == 2) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where customer = '" + search.Text + "' order by OrdeTime desc";//查询语句
else if (a == 3) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where colour = '" + search.Text + "' order by OrdeTime desc";//查询语句 else if (a == 3) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] where colour = '" + search.Text + "' order by OrdeTime desc";//查询语句
else if (a == 0) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句 else if (a == 0) order_sql = "SELECT OrdeNO ,ProcessNAME ,ProcessCODE ,colour ,customer ,OrdeTime ,REMARK FROM [Dispensing].[dbo].[ORDER] order by OrdeTime desc";//查询语句
@@ -135,7 +123,7 @@ namespace formula_manage.View
OrderData[4] = (Order.Columns[4].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列 OrderData[4] = (Order.Columns[4].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
OrderData[5] = (Order.Columns[5].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列 OrderData[5] = (Order.Columns[5].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
OrderData[6] = (Order.Columns[6].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列 OrderData[6] = (Order.Columns[6].GetCellContent(Order.Items[rownum]) as TextBlock).Text.Trim();//定位第列
sendMessage(OrderData); //传入数组 sendMessage(OrderData); //传入数组
} }
} }
-11
View File
@@ -1,19 +1,8 @@
using System; using System;
using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace formula_manage.View namespace formula_manage.View
{ {
+33
View File
@@ -0,0 +1,33 @@
using System;
using System.Windows.Threading;
namespace formula_manage.ViewModel
{
public class ExchangeViewModel : ViewModelBase
{
public ExchangeViewModel()
{
CountDown();
}
public void CountDown()
{
DispatcherTimer timer = new DispatcherTimer//初始化循环,每0.5秒调用一次Tick_Event
{
Interval = TimeSpan.FromSeconds(0.5)
};
timer.Tick += Tick_Event;
timer.Start();
//设置定时器
// disTimer.Tick += new EventHandler(DisTimer_Tick);//每一秒执行的方法
// disTimer.Interval = new TimeSpan(10000000); //时间间隔为一秒。
// disTimer.Start();//计时开始
}
void Tick_Event(object sender, EventArgs e)//Tick_Event周期执行事件
{
}
}
}
+51 -45
View File
@@ -1,24 +1,11 @@
using formula_manage.SQLModels; using formula_manage.UserClass;
using formula_manage.UserClass;
using formula_manage.ViewModel;
using formula_manage.Windows;
using GalaSoft.MvvmLight;
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
using System.Windows.Threading; using System.Windows.Threading;
using System.Xml.Linq;
namespace formula_manage.ViewModel namespace formula_manage.ViewModel
{ {
@@ -43,8 +30,8 @@ namespace formula_manage.ViewModel
DataTable DissolvedataTable = new DataTable(); //建立Dissolve DataTable DissolvedataTable = new DataTable(); //建立Dissolve
DataTable STUFFdataTable = new DataTable(); //建立STUFF DataTable STUFFdataTable = new DataTable(); //建立STUFF
DataTable MACHINEdataTable = new DataTable(); //建立Machine DataTable MACHINEdataTable = new DataTable(); //建立Machine
DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT // DataTable RRODUCTdataTable = new DataTable(); //建立RRODUCT
DataTable RecipedataTable = new DataTable(); //建立Recipe // DataTable RecipedataTable = new DataTable(); //建立Recipe
public static DataTable STUFFdatatemp = new DataTable(); //建立STUFF缓存 public static DataTable STUFFdatatemp = new DataTable(); //建立STUFF缓存
public static DataTable MACHINEdatatemp = new DataTable(); //建立Machine缓存 public static DataTable MACHINEdatatemp = new DataTable(); //建立Machine缓存
@@ -54,7 +41,7 @@ namespace formula_manage.ViewModel
public string cdk_time; //注册到期时间 public string cdk_time; //注册到期时间
public string cdk_page = "Hidden"; //注册到期页面状态 public string cdk_page = "Hidden"; //注册到期页面状态
public string cdk_pageT; //注册到期页面关闭时间 public string cdk_pageT; //注册到期页面关闭时间
int cdk_pageT_T=-1;////注册到期页面关闭时间计算 int cdk_pageT_T = -1;////注册到期页面关闭时间计算
public string Sys_Time //通知UI控件参数改变 public string Sys_Time //通知UI控件参数改变
{ {
@@ -88,40 +75,58 @@ namespace formula_manage.ViewModel
string SN_KEY; string SN_KEY;
private void CDkey_() private void CDkey_()
{ {
string id_1 = SN_ID.Substring(5, 1) + SN_ID.Substring(0, 1) + SN_ID.Substring(4, 1) + SN_ID.Substring(1, 1) + SN_ID.Substring(3, 1) + SN_ID.Substring(2, 1); try
if ((id_1 == SN_KEY.Substring(0, 6)) && (SN_KEY.Length == 16))
{ {
if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(SN_KEY.Substring(0, 12)), true) == SN_KEY.Substring(12, 4)) //校验key的crc校验值 string id_1 = SN_ID.Substring(5, 1) + SN_ID.Substring(0, 1) + SN_ID.Substring(4, 1) + SN_ID.Substring(1, 1) + SN_ID.Substring(3, 1) + SN_ID.Substring(2, 1);
if ((id_1 == SN_KEY.Substring(0, 6)) && (SN_KEY.Length == 16))
{ {
string Y = (2255 - StrToInt.To16Convert10(SN_KEY.Substring(6, 2))).ToString(); if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(SN_KEY.Substring(0, 12)), true) == SN_KEY.Substring(12, 4)) //校验key的crc校验值
string M = (255 - StrToInt.To16Convert10(SN_KEY.Substring(8, 2))).ToString();
string D = (255 - StrToInt.To16Convert10(SN_KEY.Substring(10, 2))).ToString();
string YY = DateTime.Now.ToString("yyyy");
string MM = DateTime.Now.ToString("MM");
string DD = DateTime.Now.ToString("dd");
Cdk_time = "Expires time: " + Y +"/"+ M +"/"+ D;
if (string.Compare(Y, YY) < 0)
{ {
if (string.Compare(M, MM) < 0) string Y = (2255 - StrToInt.To16Convert10(SN_KEY.Substring(6, 2))).ToString();
string M = (255 - StrToInt.To16Convert10(SN_KEY.Substring(8, 2))).ToString();
string D = (255 - StrToInt.To16Convert10(SN_KEY.Substring(10, 2))).ToString();
string YY = DateTime.Now.ToString("yyyy");
string MM = DateTime.Now.ToString("MM");
string DD = DateTime.Now.ToString("dd");
Cdk_time = "注册到期时间: " + Y + "/" + M + "/" + D;
if (string.Compare(Y, YY) < 0)
{ {
if (string.Compare(D, DD) < 0) if (string.Compare(M, MM) < 0)
{ {
Cdk_page = "Visible"; if (string.Compare(D, DD) < 0)
//cdk_pageT_T = -1; //防止触发倒计时 {
} Cdk_page = "Visible";
else if ((int.Parse(D) - int.Parse(DD)) <= 3)//提前三天提醒 //cdk_pageT_T = -1; //防止触发倒计时
{ }
Cdk_page = "Visible"; else if ((int.Parse(D) - int.Parse(DD)) <= 10)//提前三天提醒
cdk_pageT_T = 60; //页面关闭倒计时30秒 {
Cdk_page = "Visible";
cdk_pageT_T = 180; //页面关闭倒计时30秒
}
} }
} }
} }
else
{
Cdk_page = "Visible";
Cdk_time = "许可证安全校验错误请重新激活";
}
} }
else
{
Cdk_page = "Visible";
Cdk_time = "计算机信息变更当前许可证失效";
}
}
catch (Exception)
{
Cdk_page = "Visible";
Cdk_time = "许可证安全校验错误请重新激活";
} }
} }
@@ -134,7 +139,7 @@ namespace formula_manage.ViewModel
TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4"); TEXT_SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5"); TEXT_SQLPASWOR = Configini.IniReadvalue("SQL_SERVER", "SQL5");
SN_ID = Configini.IniReadvalue("SN", "SN2"); SN_ID = Configini.IniReadvalue("SN", "SN2");
SN_KEY = Configini.IniReadvalue("SN", "SN1"); SN_KEY = Configini.IniReadvalue("SN", "SN1");
if (TEXT_SQMOD == "0") //判断连接方式 if (TEXT_SQMOD == "0") //判断连接方式
{ {
@@ -165,7 +170,8 @@ namespace formula_manage.ViewModel
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求原料信息失败,检查连接"); System.Windows.MessageBox.Show("请求信息失败");
UserClass.LogGing.LogGingDATA("DISPENLINK = ConnectFailed");
return; return;
} }
} }
@@ -268,7 +274,7 @@ namespace formula_manage.ViewModel
{ {
cdk_pageT_T--; cdk_pageT_T--;
Cdk_pageT = cdk_pageT_T.ToString(); Cdk_pageT = cdk_pageT_T.ToString();
if(cdk_pageT_T == 1) Cdk_page = "Hidden"; if (cdk_pageT_T == 1) Cdk_page = "Hidden";
} }
} }
+42 -55
View File
@@ -1,36 +1,23 @@
using formula_manage.SQLModels; using System;
using formula_manage.ViewModel;
using formula_manage.Windows;
using GalaSoft.MvvmLight;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Threading; using System.Windows.Threading;
using System.Xml.Linq;
namespace formula_manage.ViewModel namespace formula_manage.ViewModel
{ {
/* public class ViewModelBase : INotifyPropertyChanged /* public class ViewModelBase : INotifyPropertyChanged
{ {
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
protected virtual void OnPropertyChanged(string propertyName) protected virtual void OnPropertyChanged(string propertyName)
{ {
if (this.PropertyChanged != null) if (this.PropertyChanged != null)
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
} }
}*/ }*/
///<Summary> ///<Summary>
/// ///
/// ///
@@ -191,40 +178,40 @@ namespace formula_manage.ViewModel
} }
} }
/* public class Product //stuff_Product /* public class Product //stuff_Product
{ {
public string ProductCode { get; set; } public string ProductCode { get; set; }
public string ProductName { get; set; } public string ProductName { get; set; }
public int ProductType { get; set; } public int ProductType { get; set; }
public int Concentration { get; set; } public int Concentration { get; set; }
public override string ToString() public override string ToString()
{ {
return ProductCode; return ProductCode;
} }
} }
public class Machine //mac public class Machine //mac
{ {
public string Name { get; set; } public string Name { get; set; }
public float Volume { get; set; } public float Volume { get; set; }
public float Capacity { get; set; } public float Capacity { get; set; }
public override string ToString() public override string ToString()
{ {
return Name; return Name;
} }
} }
public class Workflow //Dissolve public class Workflow //Dissolve
{ {
public string DissolveName { get; set; } public string DissolveName { get; set; }
public int MaterialType { get; set; } public int MaterialType { get; set; }
public int WeightMIN { get; set; } public int WeightMIN { get; set; }
public int WeightMAX { get; set; } public int WeightMAX { get; set; }
public override string ToString() public override string ToString()
{ {
return DissolveName; return DissolveName;
} }
}*/ }*/
} }
+10 -7
View File
@@ -1,10 +1,4 @@
using CommonServiceLocator; using CommonServiceLocator;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Ioc; using GalaSoft.MvvmLight.Ioc;
namespace formula_manage.ViewModel namespace formula_manage.ViewModel
@@ -28,8 +22,9 @@ namespace formula_manage.ViewModel
SimpleIoc.Default.Register<MainWindowViewModel>(); SimpleIoc.Default.Register<MainWindowViewModel>();
SimpleIoc.Default.Register<RECIPEViewModel>(); SimpleIoc.Default.Register<RECIPEViewModel>();
SimpleIoc.Default.Register<ExchangeViewModel>();
} }
public MainWindowViewModel Main public MainWindowViewModel Main
{ {
get get
@@ -46,5 +41,13 @@ namespace formula_manage.ViewModel
} }
} }
public ExchangeViewModel Exchange
{
get
{
return ServiceLocator.Current.GetInstance<ExchangeViewModel>();
}
}
} }
} }
+2 -13
View File
@@ -1,17 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -33,7 +22,7 @@ namespace formula_manage.Windows
string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]:"; string Log_time = "[" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "]:";
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件 private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件
{ {
MessageBoxResult result = System.Windows.MessageBox.Show("设置完成后请重启程序","提示", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel); MessageBoxResult result = System.Windows.MessageBox.Show("设置完成后请重启程序", "提示", MessageBoxButton.OKCancel, MessageBoxImage.None, MessageBoxResult.Cancel);
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString()); Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
@@ -53,7 +42,7 @@ namespace formula_manage.Windows
FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write); FileStream fs = new FileStream(logPath, FileMode.Append, FileAccess.Write);
StreamWriter wr = new StreamWriter(fs);//创建文件 StreamWriter wr = new StreamWriter(fs);//创建文件
wr.WriteLine(Log_time + "FORMULA_SET:INIFile_Write"); wr.WriteLine(Log_time + "FORMULA_SET:INIFile_Write");
wr.Close(); wr.Close();
} }
bool Loginlink; bool Loginlink;
+48 -38
View File
@@ -1,23 +1,6 @@
using formula_manage.UserClass; using formula_manage.UserClass;
using System; using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Globalization;
using System.Linq;
using System.Management;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace formula_manage.Windows namespace formula_manage.Windows
@@ -41,12 +24,33 @@ namespace formula_manage.Windows
private void Window_CDKEY(object sender, RoutedEventArgs e) //打开页面 private void Window_CDKEY(object sender, RoutedEventArgs e) //打开页面
{ {
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取 UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);//生效配置读取
cdk.Text = Configini.IniReadvalue("SN", "SN1"); //读配置文件 string cdk = Configini.IniReadvalue("SN", "SN1"); //读配置文件
string Y = (2255 - StrToInt.To16Convert10(cdk.Text.Substring(6, 2))).ToString(); if (cdk.Length == 16)
string M = (255 - StrToInt.To16Convert10(cdk.Text.Substring(8, 2))).ToString(); {
string D = (255 - StrToInt.To16Convert10(cdk.Text.Substring(10, 2))).ToString(); if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Substring(0, 12)), true) == cdk.Substring(12, 4)) //校验key的crc校验值
sn_time.Text = "CDkeyDueTime: " + Y + "-" + M + "-" + D; {
try
{
string Y = (2255 - StrToInt.To16Convert10(cdk.Substring(6, 2))).ToString();
string M = (255 - StrToInt.To16Convert10(cdk.Substring(8, 2))).ToString();
string D = (255 - StrToInt.To16Convert10(cdk.Substring(10, 2))).ToString();
sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
}
catch (Exception)
{
sn_time.Text = "注册有效时间: --------";
}
}
else
{
sn_time.Text = "注册有效时间: --------";
}
}
else
{
sn_time.Text = "注册有效时间: --------";
}
// 获取CPU序列号 // 获取CPU序列号
cpuSerialNumber = HardwareSN.GetCPUSerialNumber(); cpuSerialNumber = HardwareSN.GetCPUSerialNumber();
@@ -56,16 +60,22 @@ namespace formula_manage.Windows
//string hardDiskSerialNumber = HardwareSN.GetHardDiskSerialNumber(); //string hardDiskSerialNumber = HardwareSN.GetHardDiskSerialNumber();
// 获取网卡地址 // 获取网卡地址
//string netCardMACAddress = HardwareSN.GetNetCardMACAddress(); //string netCardMACAddress = HardwareSN.GetNetCardMACAddress();
sn_id.Text = MD5check.MD5Encrypt16(cpuSerialNumber + biosSerialNumber);//生成id基于硬件值的md5校验
}
sn_id.Text = MD5check.MD5Encrypt16(cpuSerialNumber+ biosSerialNumber);//生成id基于硬件值的md5校验
}
private void Button_Click_2(object sender, RoutedEventArgs e) //cdk确认按钮 private void Button_Click_2(object sender, RoutedEventArgs e) //cdk确认按钮
{ {
string id_1; string id_1;
id_1 = sn_id.Text.Substring(5, 1) + sn_id.Text.Substring(0, 1) + sn_id.Text.Substring(4, 1) + sn_id.Text.Substring(1, 1) + sn_id.Text.Substring(3, 1) + sn_id.Text.Substring(2, 1); id_1 = sn_id.Text.Substring(5, 1) + sn_id.Text.Substring(0, 1) + sn_id.Text.Substring(4, 1) + sn_id.Text.Substring(1, 1) + sn_id.Text.Substring(3, 1) + sn_id.Text.Substring(2, 1);
if ((id_1 == cdk.Text.Substring(0, 6)) && (cdk.Text.Length == 16)) if (cdk.Text.Length != 16)
{
System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
if (id_1 == cdk.Text.Substring(0, 6))
{ {
if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Text.Substring(0, 12)), true) == cdk.Text.Substring(12, 4)) //校验key的crc校验值 if (CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(cdk.Text.Substring(0, 12)), true) == cdk.Text.Substring(12, 4)) //校验key的crc校验值
{ {
@@ -83,8 +93,8 @@ namespace formula_manage.Windows
{ {
if (string.Compare(D, DD) >= 0) if (string.Compare(D, DD) >= 0)
{ {
System.Windows.MessageBox.Show("CDKEY: OK","KEY",MessageBoxButton.OK,MessageBoxImage.Asterisk); System.Windows.MessageBox.Show("CDKEY: 注册成功,请重启软件", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk);
sn_time.Text = "CDkeyDueTime: " + Y + "-" + M + "-" + D; sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Configini.IniWritevalue("SN", " SN1", cdk.Text); Configini.IniWritevalue("SN", " SN1", cdk.Text);
@@ -92,8 +102,8 @@ namespace formula_manage.Windows
} }
else if (string.Compare(M, MM) > 0) else if (string.Compare(M, MM) > 0)
{ {
System.Windows.MessageBox.Show("CDKEY: OK", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk); System.Windows.MessageBox.Show("CDKEY: 注册成功,请重启软件", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk);
sn_time.Text = "CDkeyDueTime: " + Y + "-" + M + "-" + D; sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Configini.IniWritevalue("SN", " SN1", cdk.Text); Configini.IniWritevalue("SN", " SN1", cdk.Text);
@@ -101,18 +111,18 @@ namespace formula_manage.Windows
} }
else else
{ {
System.Windows.MessageBox.Show("CDKEY: Overdue", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning); System.Windows.MessageBox.Show("CDKEY: 注册码过期", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning);
} }
} }
else else
{ {
System.Windows.MessageBox.Show("CDKEY: Overdue", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning); System.Windows.MessageBox.Show("CDKEY: 注册码过期", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning);
} }
} }
else if (string.Compare(Y, YY) > 0) else if (string.Compare(Y, YY) > 0)
{ {
System.Windows.MessageBox.Show("CDKEY: OK", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk); System.Windows.MessageBox.Show("CDKEY: 注册成功,请重启软件", "KEY", MessageBoxButton.OK, MessageBoxImage.Asterisk);
sn_time.Text = "CDkeyDueTime: " + Y + "-" + M + "-" + D; sn_time.Text = "注册有效时间: " + Y + "-" + M + "-" + D;
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Configini.IniWritevalue("SN", " SN1", cdk.Text); Configini.IniWritevalue("SN", " SN1", cdk.Text);
@@ -120,17 +130,17 @@ namespace formula_manage.Windows
} }
else else
{ {
System.Windows.MessageBox.Show("CDKEY: Overdue","WARNING",MessageBoxButton.OK,MessageBoxImage.Warning); System.Windows.MessageBox.Show("CDKEY: 注册码过期", "WARNING", MessageBoxButton.OK, MessageBoxImage.Warning);
} }
} }
else else
{ {
System.Windows.MessageBox.Show("CDKEY: Linvalid", "ERR", MessageBoxButton.OK, MessageBoxImage.Error); System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
} }
} }
else else
{ {
System.Windows.MessageBox.Show("CDKEY: Linvalid","ERR" , MessageBoxButton.OK,MessageBoxImage.Error); System.Windows.MessageBox.Show("CDKEY: 无效注册码", "ERR", MessageBoxButton.OK, MessageBoxImage.Error);
} }
} }
+17 -31
View File
@@ -1,24 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -127,7 +113,7 @@ namespace formula_manage.Windows
string Dissolve_sql; string Dissolve_sql;
int int_ion = 0; int int_ion = 0;
if ((name.Text == "") ||(Code.Text == "")) if ((name.Text == "") || (Code.Text == ""))
{ {
System.Windows.MessageBox.Show("请输入代码或名称"); System.Windows.MessageBox.Show("请输入代码或名称");
return; return;
@@ -171,33 +157,33 @@ namespace formula_manage.Windows
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
Dissolve_sql = string.Format("INSERT INTO[dbo].[Dissolve](DissolveCode ,DissolveName ,REMARK ,MaterialType ,WeightMIN ,WeightMAX) " + Dissolve_sql = string.Format("INSERT INTO[dbo].[Dissolve](DissolveCode ,DissolveName ,REMARK ,MaterialType ,WeightMIN ,WeightMAX) " +
"VALUES ('" + Code.Text + "','" + name.Text + "','" + Remark.Text + "','" + int_ion + "','"+ min.Text + "','" + max.Text + "')"); "VALUES ('" + Code.Text + "','" + name.Text + "','" + Remark.Text + "','" + int_ion + "','" + min.Text + "','" + max.Text + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("添加失败"); System.Windows.MessageBox.Show("添加失败");
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成");// System.Windows.MessageBox.Show("添加完成");//
} }
} }
else else
{ {
Dissolve_sql = string.Format("UPDATE [dbo].[Dissolve] SET DissolveName ='" + name.Text + "',REMARK='" + Remark.Text + "',MaterialType='" + int_ion + "',WeightMIN='" + min.Text + "',WeightMAX='" + max.Text + "' Where DissolveCode ='" + Code.Text + "'"); Dissolve_sql = string.Format("UPDATE [dbo].[Dissolve] SET DissolveName ='" + name.Text + "',REMARK='" + Remark.Text + "',MaterialType='" + int_ion + "',WeightMIN='" + min.Text + "',WeightMAX='" + max.Text + "' Where DissolveCode ='" + Code.Text + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Dissolve_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("修改失败"); System.Windows.MessageBox.Show("修改失败");
} }
else else
@@ -213,7 +199,7 @@ namespace formula_manage.Windows
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
+16 -30
View File
@@ -1,24 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -132,7 +118,7 @@ namespace formula_manage.Windows
/*定位选中行及指定列单元格文本信息*/ /*定位选中行及指定列单元格文本信息*/
mac_Name.Text = (DataGridMac.Columns[1].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第列 mac_Name.Text = (DataGridMac.Columns[1].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//定位第列
mac_MacGroup.Text = (DataGridMac.Columns[2].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// mac_MacGroup.Text = (DataGridMac.Columns[2].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac .Items[rownum]) as TextBlock).Text.TrimEnd();// mac_Capacity.Text = (DataGridMac.Columns[3].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
mac_Volume.Text = (DataGridMac.Columns[4].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// mac_Volume.Text = (DataGridMac.Columns[4].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
mac_Industry.Text = (DataGridMac.Columns[5].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// mac_Industry.Text = (DataGridMac.Columns[5].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
mac_Categories.Text = (DataGridMac.Columns[6].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();// mac_Categories.Text = (DataGridMac.Columns[6].GetCellContent(DataGridMac.Items[rownum]) as TextBlock).Text.TrimEnd();//
@@ -182,7 +168,7 @@ namespace formula_manage.Windows
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
MAC_sql = string.Format("INSERT INTO [dbo].[MACHINE](Name ,MacGroup ,Capacity ,Volume ,Industry ,Categories ,Note ) " + MAC_sql = string.Format("INSERT INTO [dbo].[MACHINE](Name ,MacGroup ,Capacity ,Volume ,Industry ,Categories ,Note ) " +
"VALUES ('" + Mac_name + "','" + Mac_group + "'," + Mac_capacity + "," + Mac_volume + "," + Mac_industry + "," + Mac_categories + ",'" + Mac_note + "')"); "VALUES ('" + Mac_name + "','" + Mac_group + "'," + Mac_capacity + "," + Mac_volume + "," + Mac_industry + "," + Mac_categories + ",'" + Mac_note + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
@@ -190,25 +176,25 @@ namespace formula_manage.Windows
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("添加失败"); System.Windows.MessageBox.Show("添加失败");
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成");// System.Windows.MessageBox.Show("添加完成");//
} }
} }
else else
{ {
MAC_sql = string.Format("UPDATE [dbo].[MACHINE] SET MacGroup ='" + Mac_group + "',Capacity=" + Mac_capacity + " ,Volume=" + Mac_volume + " ,Industry=" + Mac_industry + " ,Categories=" + Mac_categories + " ,Note='" + Mac_note + "' Where Name ='" + Mac_name + "'"); MAC_sql = string.Format("UPDATE [dbo].[MACHINE] SET MacGroup ='" + Mac_group + "',Capacity=" + Mac_capacity + " ,Volume=" + Mac_volume + " ,Industry=" + Mac_industry + " ,Categories=" + Mac_categories + " ,Note='" + Mac_note + "' Where Name ='" + Mac_name + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(MAC_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(MAC_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("修改失败"); System.Windows.MessageBox.Show("修改失败");
} }
else else
@@ -224,7 +210,7 @@ namespace formula_manage.Windows
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
+5 -1
View File
@@ -36,8 +36,12 @@
<Button Content="预览模板" HorizontalAlignment="Left" Height="20" Margin="375,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_22"/> <Button Content="预览模板" HorizontalAlignment="Left" Height="20" Margin="375,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_22"/>
<Button Content="编辑模板" HorizontalAlignment="Left" Height="20" Margin="295,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_12"/> <Button Content="编辑模板" HorizontalAlignment="Left" Height="20" Margin="295,205,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_12"/>
<TextBlock HorizontalAlignment="Left" Height="15" Margin="20,305,0,0" TextWrapping="Wrap" Text="管理打印模板:" VerticalAlignment="Top" Width="90"/> <TextBlock HorizontalAlignment="Left" Height="15" Margin="20,305,0,0" TextWrapping="Wrap" Text="管理打印模板:" VerticalAlignment="Top" Width="90"/>
<ComboBox HorizontalAlignment="Left" Height="20" Margin="110,305,0,0" VerticalAlignment="Top" Width="180" x:Name="Template" IsEditable="True"/> <ComboBox HorizontalAlignment="Left" Height="20" Margin="110,305,0,0" VerticalAlignment="Top" Width="180" x:Name="PrintTemplate" IsEditable="True"/>
<Button Content="删除模板" HorizontalAlignment="Left" Height="20" Margin="375,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_4"/> <Button Content="删除模板" HorizontalAlignment="Left" Height="20" Margin="375,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_4"/>
<Button Content="添加模板" HorizontalAlignment="Left" Height="20" Margin="295,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_3"/> <Button Content="添加模板" HorizontalAlignment="Left" Height="20" Margin="295,305,0,0" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" Click="Button_Click_3"/>
<Grid Grid.Column="1" x:Name="Prompt" Margin="0,0,0,0" Background="White" Opacity="0.8" Visibility="Hidden">
<TextBlock Height="50" Margin="0,0,0,150" TextWrapping="Wrap" Text="Processing,Pleasewait..." Width="400" FontSize="34" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Grid>
</Grid> </Grid>
</Window> </Window>
+42 -43
View File
@@ -1,30 +1,12 @@
using System; using FastReport;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using ThoughtWorks.QRCode.Codec;
using System.Drawing;
using System.Drawing.Imaging;
using System.Drawing.Printing;
using formula_manage.UserClass; using formula_manage.UserClass;
using System.Xml.Linq; using System;
using FastReport.Format; using System.Collections.Generic;
using Svg; using System.Drawing.Printing;
using System.IO; using System.IO;
using System.Windows.Media.Media3D; using System.Windows;
using System.Reflection; using System.Windows.Forms;
using FastReport; using System.Xml.Linq;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -52,12 +34,12 @@ namespace formula_manage.Windows
bool Printer; bool Printer;
bool Printer2; bool Printer2;
bool Printer3; bool Printer3;
bool Printer4;
bool Printer5;
string Temp_M, Temp_S;
private void Window_Print(object sender, RoutedEventArgs e) private void Window_Print(object sender, RoutedEventArgs e)
{ {
string Temp_M, Temp_S;
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath); UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
Printer = Boolean.Parse(Configini.IniReadvalue("PRINTER", "P1")); Printer = Boolean.Parse(Configini.IniReadvalue("PRINTER", "P1"));
@@ -80,6 +62,11 @@ namespace formula_manage.Windows
TEXT_Print3.IsChecked = Printer3; TEXT_Print3.IsChecked = Printer3;
cbxPrinter3.IsEnabled = Printer3; cbxPrinter3.IsEnabled = Printer3;
PRINT_file();
}
private void PRINT_file()//建立模板列表
{
DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹 DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹
FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集 FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集
Template_M.ItemsSource = files_M;//加载合集 Template_M.ItemsSource = files_M;//加载合集
@@ -91,8 +78,8 @@ namespace formula_manage.Windows
Template_M.Text = Temp_M;//传入保存的默认模板 Template_M.Text = Temp_M;//传入保存的默认模板
Template_S.Text = Temp_S;// Template_S.Text = Temp_S;//
Template.ItemsSource = files_M; PrintTemplate.ItemsSource = files_M;
Template.DisplayMemberPath = "Name"; PrintTemplate.DisplayMemberPath = "Name";
} }
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件 private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) //窗口关闭事件
@@ -147,13 +134,13 @@ namespace formula_manage.Windows
private void Button_Click_1(object sender, RoutedEventArgs e) //编辑模板 private void Button_Click_1(object sender, RoutedEventArgs e) //编辑模板
{ {
if (string.IsNullOrEmpty(Template_M.Text)) if (string.IsNullOrEmpty(Template_M.Text))
{ {
System.Windows.MessageBox.Show("模板不能为空"); System.Windows.MessageBox.Show("模板不能为空");
return; return;
} }
var tuple = PrintHelper.Design(Print_path.Text+"/" + Template_M.Text); var tuple = PrintHelper.Design(Print_path.Text + "/" + Template_M.Text);
if (!tuple.Item1) if (!tuple.Item1)
{ {
System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}"); System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}");
@@ -167,7 +154,7 @@ namespace formula_manage.Windows
return; return;
} }
var tuple = PrintHelper.Design(Print_path2.Text +"/" + Template_S.Text); var tuple = PrintHelper.Design(Print_path2.Text + "/" + Template_S.Text);
if (!tuple.Item1) if (!tuple.Item1)
{ {
System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}"); System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}");
@@ -222,7 +209,7 @@ namespace formula_manage.Windows
list.Add(xePrintName); list.Add(xePrintName);
} }
} }
catch (Exception ex) catch (Exception)
{ {
} }
@@ -231,45 +218,57 @@ namespace formula_manage.Windows
private void Button_Click_3(object sender, RoutedEventArgs e)//新建模板文件 private void Button_Click_3(object sender, RoutedEventArgs e)//新建模板文件
{ {
string Template_path = Print_path.Text + "/" + Template.Text;
Prompt.Visibility = Visibility.Visible; //开启页面遮罩
string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
string Template_DATA = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<Report ScriptLanguage=\"CSharp\" ReportInfo.Created=\"12/12/2023 23:59:59\" ReportInfo.Modified=\"12/12/2023 23:59:59\" ReportInfo.CreatorVersion=\"2023.12.12.0\">\r\n <Dictionary/>\r\n <ReportPage Name=\"Page1\" Watermark.Font=\"宋体, 60pt\">\r\n <ReportTitleBand Name=\"ReportTitle1\" Width=\"718.2\" Height=\"37.8\"/>\r\n <PageHeaderBand Name=\"PageHeader1\" Top=\"41.8\" Width=\"718.2\" Height=\"28.35\"/>\r\n <DataBand Name=\"Data1\" Top=\"74.15\" Width=\"718.2\" Height=\"75.6\"/>\r\n <PageFooterBand Name=\"PageFooter1\" Top=\"153.75\" Width=\"718.2\" Height=\"18.9\"/>\r\n </ReportPage>\r\n</Report>"; string Template_DATA = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<Report ScriptLanguage=\"CSharp\" ReportInfo.Created=\"12/12/2023 23:59:59\" ReportInfo.Modified=\"12/12/2023 23:59:59\" ReportInfo.CreatorVersion=\"2023.12.12.0\">\r\n <Dictionary/>\r\n <ReportPage Name=\"Page1\" Watermark.Font=\"宋体, 60pt\">\r\n <ReportTitleBand Name=\"ReportTitle1\" Width=\"718.2\" Height=\"37.8\"/>\r\n <PageHeaderBand Name=\"PageHeader1\" Top=\"41.8\" Width=\"718.2\" Height=\"28.35\"/>\r\n <DataBand Name=\"Data1\" Top=\"74.15\" Width=\"718.2\" Height=\"75.6\"/>\r\n <PageFooterBand Name=\"PageFooter1\" Top=\"153.75\" Width=\"718.2\" Height=\"18.9\"/>\r\n </ReportPage>\r\n</Report>";
if (File.Exists(Template_path)) //判断文件是否存在 if (File.Exists(Template_path)) //判断文件是否存在
{ {
System.Windows.MessageBox.Show("模板已存在"); System.Windows.MessageBox.Show("模板已存在");
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
return; return;
} }
if (string.IsNullOrEmpty(Template.Text)) if (string.IsNullOrEmpty(PrintTemplate.Text))
{ {
System.Windows.MessageBox.Show("模板名不能为空"); System.Windows.MessageBox.Show("模板名不能为空");
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
return; return;
} }
File.WriteAllText(Template_path + ".frx", Template_DATA); File.WriteAllText(Template_path + ".frx", Template_DATA);
var tuple = PrintHelper.Design(Template_path + ".frx"); var tuple = PrintHelper.Design(Template_path + ".frx");
if (!tuple.Item1) if (!tuple.Item1)
{ {
System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}"); System.Windows.MessageBox.Show($"打开设计器失败:{tuple.Item2}");
Prompt.Visibility = Visibility.Hidden;
return;
} }
PRINT_file(); ;//刷新模板列表
PrintTemplate.Text = null;//清空输入
Prompt.Visibility = Visibility.Hidden;//去页面遮罩
} }
private void Button_Click_4(object sender, RoutedEventArgs e)//删除指定模板 private void Button_Click_4(object sender, RoutedEventArgs e)//删除指定模板
{ {
try try
{ {
string Template_path = Print_path.Text + "/" + Template.Text; string Template_path = Print_path.Text + "/" + PrintTemplate.Text;
File.Delete(Template_path); File.Delete(Template_path);
} }
catch catch
{ {
System.Windows.MessageBox.Show("删除失败"); System.Windows.MessageBox.Show("删除失败");
} }
Template.Text = null; PrintTemplate.Text = null;
DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹 DirectoryInfo di_M = new DirectoryInfo(Print_path.Text); //new文件夹
FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集 FileInfo[] files_M = di_M.GetFiles("*.frx");//生成文件夹中的文件名合集
Template.ItemsSource = files_M;//加载合集 PrintTemplate.ItemsSource = files_M;//加载合集
Template.DisplayMemberPath = "Name"; // 显示文件名 PrintTemplate.DisplayMemberPath = "Name"; // 显示文件名
} }
} }
} }
+7 -34
View File
@@ -1,41 +1,14 @@
using formula_manage.Windows; using formula_manage.UserClass;
using formula_manage.ViewModel;
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Globalization;
using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
using formula_manage.ViewModel;
using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
using static System.Net.Mime.MediaTypeNames;
using formula_manage.UserClass;
using System.Drawing;
using System.Diagnostics;
using System.Printing;
using System.Drawing.Printing;
using static System.Drawing.Printing.PrinterSettings;
using formula_manage.View;
using FastReport.DevComponents.AdvTree;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -160,14 +133,14 @@ namespace formula_manage.Windows
e.Handled = !re.IsMatch(e.Text); e.Handled = !re.IsMatch(e.Text);
} }
private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件 private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
{ {
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数 Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
Regex re_char = new Regex(@"^[A-Za-z0-9\s@()()/+!!_-]+$");//校验用正则表达式由数字,26个英文字母,空白字符和@()()/+!!_-组成的字符串 Regex re_char = new Regex(@"^[A-Za-z0-9\s@()()/+!!_-]+$");//校验用正则表达式由数字,26个英文字母,空白字符和@()()/+!!_-组成的字符串
// string Dissolve_sql; // string Dissolve_sql;
// int int_ion = 0; // int int_ion = 0;
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
+16 -27
View File
@@ -1,18 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
@@ -50,7 +39,7 @@ namespace formula_manage.Windows
SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2"); SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i); //读数据库状态配置文件 int.TryParse(Configini.IniReadvalue("SQL_SERVER", "SQL3"), out i); //读数据库状态配置文件
if (i == 0) SQLMOD = false; if (i == 0) SQLMOD = false;
else SQLMOD = true; else SQLMOD = true;
SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4"); SQLUSER = Configini.IniReadvalue("SQL_SERVER", "SQL4");
SQLPASS = Configini.IniReadvalue("SQL_SERVER", "SQL5"); SQLPASS = Configini.IniReadvalue("SQL_SERVER", "SQL5");
@@ -59,7 +48,7 @@ namespace formula_manage.Windows
SQLTIME = Boolean.Parse(Configini.IniReadvalue("SQL_BAK", "S3")); SQLTIME = Boolean.Parse(Configini.IniReadvalue("SQL_BAK", "S3"));
int.TryParse(Configini.IniReadvalue("SQL_BAK", "S4"), out Time); int.TryParse(Configini.IniReadvalue("SQL_BAK", "S4"), out Time);
if (Time == 0) SQL_TIME.Text = "日"; if (Time == 0) SQL_TIME.Text = "日";
else if(Time == 1) SQL_TIME.Text = "周"; else if (Time == 1) SQL_TIME.Text = "周";
else if (Time == 2) SQL_TIME.Text = "月"; else if (Time == 2) SQL_TIME.Text = "月";
else if (Time == 3) SQL_TIME.Text = "季"; else if (Time == 3) SQL_TIME.Text = "季";
else if (Time == 4) SQL_TIME.Text = "年"; else if (Time == 4) SQL_TIME.Text = "年";
@@ -77,7 +66,7 @@ namespace formula_manage.Windows
SQL_DISPEN_bak.IsEnabled = SQLBAK; SQL_DISPEN_bak.IsEnabled = SQLBAK;
SQL_DISPEN_BUT.IsEnabled = SQLBAK; SQL_DISPEN_BUT.IsEnabled = SQLBAK;
} }
private void SQL_bak_time_Checked(object sender, RoutedEventArgs e) //自动保存 private void SQL_bak_time_Checked(object sender, RoutedEventArgs e) //自动保存
{ {
SQLTIME = SQL_bak_time.IsChecked.GetValueOrDefault(); SQLTIME = SQL_bak_time.IsChecked.GetValueOrDefault();
@@ -90,8 +79,8 @@ namespace formula_manage.Windows
Dilog.SelectedPath = SQL_DISPEN_bak.Text; //打开目录 Dilog.SelectedPath = SQL_DISPEN_bak.Text; //打开目录
Dilog.ShowNewFolderButton = false; //不显示新建文件夹按钮 Dilog.ShowNewFolderButton = false; //不显示新建文件夹按钮
// //
if (Dilog.ShowDialog() == System.Windows.Forms.DialogResult.OK ) if (Dilog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{ {
SQL_DISPEN_bak.Text = Dilog.SelectedPath; //返回选择的字符串 SQL_DISPEN_bak.Text = Dilog.SelectedPath; //返回选择的字符串
} }
} }
@@ -207,23 +196,23 @@ namespace formula_manage.Windows
{ {
ok = Backup(SQLNAME, SQL_DISPEN_bak.Text + "\\" + SQLNAME + System.DateTime.Now.ToString("yyyy_MM_dd_HHmmss") + ".bak"); //指定地址备份 ok = Backup(SQLNAME, SQL_DISPEN_bak.Text + "\\" + SQLNAME + System.DateTime.Now.ToString("yyyy_MM_dd_HHmmss") + ".bak"); //指定地址备份
} }
else else
{ {
ok = Backup(SQLNAME, "C:\\SUNLIGHT\\" + SQLNAME + System.DateTime.Now.ToString("yyyy_MM_dd_HHmmss") + ".bak"); //默认备份到文档文件夹 ok = Backup(SQLNAME, "C:\\SUNLIGHT\\" + SQLNAME + System.DateTime.Now.ToString("yyyy_MM_dd_HHmmss") + ".bak"); //默认备份到文档文件夹
} }
if (ok) if (ok)
{ {
System.Windows.MessageBox.Show("备份成功"); System.Windows.MessageBox.Show("备份成功");
} }
else else
{ {
System.Windows.MessageBox.Show("备份失败"); System.Windows.MessageBox.Show("备份失败");
} }
} }
private async void Button_Click_2(object sender, RoutedEventArgs e) private async void Button_Click_2(object sender, RoutedEventArgs e)
{ {
if (!SQLMOD) //连接数据库测试 if (!SQLMOD) //连接数据库测试
{ {
Connstr_SC = "server=" + SQLIP + ";database=" + SQLNAME + ";Trusted_Connection=SSPI"; Connstr_SC = "server=" + SQLIP + ";database=" + SQLNAME + ";Trusted_Connection=SSPI";
+1 -16
View File
@@ -1,21 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Net.NetworkInformation; using System.Windows;
using System.Runtime.InteropServices;
using System.ComponentModel;
using System.Data.SqlTypes;
namespace formula_manage.Windows namespace formula_manage.Windows
+57 -70
View File
@@ -1,24 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -88,34 +75,34 @@ namespace formula_manage.Windows
/// </summary> /// </summary>
private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e) private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
{ {
e.Row.Header = e.Row.GetIndex() + 1; e.Row.Header = e.Row.GetIndex() + 1;
} }
private void Radiobutton(object sender, EventArgs e) private void Radiobutton(object sender, EventArgs e)
{ {
System.Windows.Controls.RadioButton Radiobutton = (sender as System.Windows.Controls.RadioButton); System.Windows.Controls.RadioButton Radiobutton = (sender as System.Windows.Controls.RadioButton);
string radiobutton = Radiobutton.Content.ToString(); string radiobutton = Radiobutton.Content.ToString();
if (radiobutton == "全部原料") if (radiobutton == "全部原料")
{ {
GridSql(0); GridSql(0);
Button_ID = 0; Button_ID = 0;
} }
else if (radiobutton == "染料") else if (radiobutton == "染料")
{ {
GridSql(1); GridSql(1);
Button_ID = 1; Button_ID = 1;
} }
else if (radiobutton == "助剂") else if (radiobutton == "助剂")
{ {
GridSql(2); GridSql(2);
Button_ID = 2; Button_ID = 2;
} }
else if (radiobutton == "粉体助剂") else if (radiobutton == "粉体助剂")
{ {
GridSql(3); GridSql(3);
Button_ID = 3; Button_ID = 3;
} }
else if (radiobutton == "液体染料") else if (radiobutton == "液体染料")
{ {
GridSql(4); GridSql(4);
Button_ID = 4; Button_ID = 4;
@@ -125,15 +112,15 @@ namespace formula_manage.Windows
/// <summary> /// <summary>
/// 查询数据库的方法 /// 查询数据库的方法
/// </summary> /// </summary>
private async void GridSql(int e ) private async void GridSql(int e)
{ {
string Stuff_sql = null; string Stuff_sql = null;
if (e == 0) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT]";//查询语句 if (e == 0) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT]";//查询语句
else if (e == 1) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '0' "; else if (e == 1) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '0' ";
else if (e == 2) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '1' "; else if (e == 2) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '1' ";
else if (e == 3) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '2' "; else if (e == 3) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '2' ";
else if (e == 4) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '3' "; else if (e == 4) Stuff_sql = "SELECT ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ,ProductIon_Type FROM [dbo].[PRODUCT] Where ProductType = '3' ";
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try try
@@ -155,7 +142,7 @@ namespace formula_manage.Windows
} }
private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件 private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
{ {
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数 Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,2})?$");//校验用正则表达式有1~2位小数的正实数
Regex re_char = new Regex(@"^[A-Za-z0-9\s@()()/+!!_-]+$");//校验用正则表达式由数字,26个英文字母,空白字符和@()()/+!!_-组成的字符串 Regex re_char = new Regex(@"^[A-Za-z0-9\s@()()/+!!_-]+$");//校验用正则表达式由数字,26个英文字母,空白字符和@()()/+!!_-组成的字符串
int int_stuff_ProductType = 0; int int_stuff_ProductType = 0;
@@ -171,14 +158,14 @@ namespace formula_manage.Windows
if (this.stuff_ProductType.Text == "染料") //原料类型0。染料,1助剂,2粉体 if (this.stuff_ProductType.Text == "染料") //原料类型0。染料,1助剂,2粉体
int_stuff_ProductType = 0; int_stuff_ProductType = 0;
else if (this.stuff_ProductType.Text == "助剂") else if (this.stuff_ProductType.Text == "助剂")
int_stuff_ProductType = 1; int_stuff_ProductType = 1;
else if (this.stuff_ProductType.Text == "粉体助剂") else if (this.stuff_ProductType.Text == "粉体助剂")
int_stuff_ProductType = 2; int_stuff_ProductType = 2;
else if (this.stuff_ProductType.Text == "液体染料") else if (this.stuff_ProductType.Text == "液体染料")
int_stuff_ProductType = 3; int_stuff_ProductType = 3;
if(Stuff_ion.Text == "分散") int_stuff_ion = 0; if (Stuff_ion.Text == "分散") int_stuff_ion = 0;
else if (Stuff_ion.Text == "酸性") int_stuff_ion = 1; else if (Stuff_ion.Text == "酸性") int_stuff_ion = 1;
else if (Stuff_ion.Text == "活性") int_stuff_ion = 2; else if (Stuff_ion.Text == "活性") int_stuff_ion = 2;
else if (Stuff_ion.Text == "中性") int_stuff_ion = 3; else if (Stuff_ion.Text == "中性") int_stuff_ion = 3;
@@ -215,37 +202,37 @@ namespace formula_manage.Windows
if (float.Parse(this.stuff_Concentration.Text) < 0 || float.Parse(this.stuff_Concentration.Text) > 100) if (float.Parse(this.stuff_Concentration.Text) < 0 || float.Parse(this.stuff_Concentration.Text) > 100)
System.Windows.MessageBox.Show("ERR:浓度错误", "错误");//检查浓度输入数值 System.Windows.MessageBox.Show("ERR:浓度错误", "错误");//检查浓度输入数值
else else
{ {
try try
{ {
if (int_stuff_ProductType == 0 || int_stuff_ProductType == 3)//判断是否为染料,非染料写空 if (int_stuff_ProductType == 0 || int_stuff_ProductType == 3)//判断是否为染料,非染料写空
{ {
string colorValue = stuff_Color.Background.ToString();//获取色彩框背景色"#FFC1C2C3" string colorValue = stuff_Color.Background.ToString();//获取色彩框背景色"#FFC1C2C3"
string StuffColor_R = string.Format("{0:X2}", colorValue.Substring(3, 2));//获取红色参数C1 string StuffColor_R = string.Format("{0:X2}", colorValue.Substring(3, 2));//获取红色参数C1
string StuffColor_G = string.Format("{0:X2}", colorValue.Substring(5, 2));//获取绿色参数C2 string StuffColor_G = string.Format("{0:X2}", colorValue.Substring(5, 2));//获取绿色参数C2
string StuffColor_B = string.Format("{0:X2}", colorValue.Substring(7, 2));//获取蓝色参数C3 string StuffColor_B = string.Format("{0:X2}", colorValue.Substring(7, 2));//获取蓝色参数C3
string StuffColor = StuffColor_B + StuffColor_G + StuffColor_R;//合并16进制rgb参数 string StuffColor = StuffColor_B + StuffColor_G + StuffColor_R;//合并16进制rgb参数
ColorCode_SQL = Convert.ToInt32(StuffColor, 16);//16进制转10进制 ColorCode_SQL = Convert.ToInt32(StuffColor, 16);//16进制转10进制
if (ColorCode_SQL < 0) ColorCode_SQL = 16777215;//判断色彩数据是否有效 if (ColorCode_SQL < 0) ColorCode_SQL = 16777215;//判断色彩数据是否有效
} }
else else
{ {
ColorCode_SQL = 16777215; ColorCode_SQL = 16777215;
} }
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
Stuff_sql = "SELECT count(*) FROM [dbo].[PRODUCT] WHERE ProductCode = '" + Product_Code + " '";//查询语句 Stuff_sql = "SELECT count(*) FROM [dbo].[PRODUCT] WHERE ProductCode = '" + Product_Code + " '";//查询语句
await conn_SC.OpenAsync(); //打开数据连 await conn_SC.OpenAsync(); //打开数据连
SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC); //查询记录数 SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC); //查询记录数
int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数 int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
Stuff_sql = string.Format( "INSERT INTO [dbo].[PRODUCT](ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ) " + Stuff_sql = string.Format("INSERT INTO [dbo].[PRODUCT](ProductCode ,ProductName , Price , SUPPLIER ,ProductType ,Color ,Concentration , GRAVITY ) " +
"VALUES ('" + Product_Code + "','" + Product_Name + "','" + _Price + "','" + _SUPPLIER + "','" + int_stuff_ProductType + "','" + ColorCode_SQL + "','" + _Concentration + "','" + _GRAVITY + "')"); "VALUES ('" + Product_Code + "','" + Product_Name + "','" + _Price + "','" + _SUPPLIER + "','" + int_stuff_ProductType + "','" + ColorCode_SQL + "','" + _Concentration + "','" + _GRAVITY + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
if (Stuff_ion.Text != "") Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET [ProductIon_Type] =" + int_stuff_ion + " Where ProductCode='" + Product_Code + "'"); if (Stuff_ion.Text != "") Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET [ProductIon_Type] =" + int_stuff_ion + " Where ProductCode='" + Product_Code + "'");
@@ -267,10 +254,10 @@ namespace formula_manage.Windows
else if (Button_ID == 4) GridSql(4); else if (Button_ID == 4) GridSql(4);
System.Windows.MessageBox.Show("添加完成"); System.Windows.MessageBox.Show("添加完成");
} }
} }
else else
{ {
Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET ProductName='" + Product_Name + "',Price='" + _Price + "',SUPPLIER='" + _SUPPLIER + "',ProductType=" + int_stuff_ProductType + ",Color=" + ColorCode_SQL + ",Concentration=" + _Concentration + ",GRAVITY=" + _GRAVITY + " Where ProductCode='"+ Product_Code+"'"); Stuff_sql = string.Format("UPDATE [dbo].[PRODUCT] SET ProductName='" + Product_Name + "',Price='" + _Price + "',SUPPLIER='" + _SUPPLIER + "',ProductType=" + int_stuff_ProductType + ",Color=" + ColorCode_SQL + ",Concentration=" + _Concentration + ",GRAVITY=" + _GRAVITY + " Where ProductCode='" + Product_Code + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
@@ -286,7 +273,7 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("修改失败"); System.Windows.MessageBox.Show("修改失败");
} }
else else
{ {
if (Button_ID == 0) GridSql(0); if (Button_ID == 0) GridSql(0);
else if (Button_ID == 1) GridSql(1); else if (Button_ID == 1) GridSql(1);
else if (Button_ID == 2) GridSql(2); else if (Button_ID == 2) GridSql(2);
@@ -301,44 +288,44 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
string ShowProductName = "是否删除原料【" + this.stuff_ProductName.Text + "】" + this.stuff_ProductCode.Text;//获取原料信息并拼接提示字符串 string ShowProductName = "是否删除原料【" + this.stuff_ProductName.Text + "】" + this.stuff_ProductCode.Text;//获取原料信息并拼接提示字符串
MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料 MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料
if (showProductName == MessageBoxResult.Yes)//判断是否删除原料 if (showProductName == MessageBoxResult.Yes)//判断是否删除原料
{ {
string Stuff_sql = string.Format("DELETE FROM [dbo].[PRODUCT] WHERE ProductCode ='" + stuff_ProductCode.Text.ToString() + "'"); string Stuff_sql = string.Format("DELETE FROM [dbo].[PRODUCT] WHERE ProductCode ='" + stuff_ProductCode.Text.ToString() + "'");
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try try
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("ERR.C0110-2:删除失败", "错误");//判断执行是否成功 System.Windows.MessageBox.Show("ERR.C0110-2:删除失败", "错误");//判断执行是否成功
} }
else else
{ {
if (Button_ID == 0) GridSql(0); if (Button_ID == 0) GridSql(0);
else if (Button_ID == 1) GridSql(1); else if (Button_ID == 1) GridSql(1);
else if (Button_ID == 2) GridSql(2); else if (Button_ID == 2) GridSql(2);
else if (Button_ID == 3) GridSql(3); else if (Button_ID == 3) GridSql(3);
else if (Button_ID == 4) GridSql(4); else if (Button_ID == 4) GridSql(4);
} }
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件 private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
@@ -388,7 +375,7 @@ namespace formula_manage.Windows
System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//使用调色盘控件ColorDialog System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//使用调色盘控件ColorDialog
if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)//打开调色盘 if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)//打开调色盘
{ {
System.Drawing.Color DColor = colorDialog.Color;////获取选中色彩信息 System.Drawing.Color DColor = colorDialog.Color;////获取选中色彩信息
//System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换 //System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换
System.Windows.Media.Color MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//转换并配置ARGB参数 System.Windows.Media.Color MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//转换并配置ARGB参数
@@ -399,5 +386,5 @@ namespace formula_manage.Windows
} }
} }
} }
} }
+55 -69
View File
@@ -1,24 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -141,49 +127,49 @@ namespace formula_manage.Windows
string note = Note.Text; string note = Note.Text;
string Stuff_sql; string Stuff_sql;
if(Capacity.Text == "停用") Cap = 0; if (Capacity.Text == "停用") Cap = 0;
else if (Capacity.Text == "限制") Cap = 1; else if (Capacity.Text == "限制") Cap = 1;
else if (Capacity.Text == "启用") Cap = 2; else if (Capacity.Text == "启用") Cap = 2;
if (name != "") if (name != "")
{ {
try try
{ {
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
Stuff_sql = "SELECT count(*) FROM [Dispensing].[dbo].[UserAccount] WHERE UserCode = '" + name + " '";//查询语句 Stuff_sql = "SELECT count(*) FROM [Dispensing].[dbo].[UserAccount] WHERE UserCode = '" + name + " '";//查询语句
await conn_SC.OpenAsync(); //打开数据连 await conn_SC.OpenAsync(); //打开数据连
SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC); //查询记录数 SqlCommand cmd = new SqlCommand(Stuff_sql, conn_SC); //查询记录数
int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数 int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{
if (password == "")
{ {
if (password == "") Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
{ "VALUES ('" + name + "',null,'" + Group + "'," + Cap + ",'" + note + "')";
Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " + }
"VALUES ('" + name + "',null,'" + Group + "'," + Cap + ",'" + note + "')"; else
}
else
{
Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
"VALUES ('" + name + "'," + password + ",'" + Group + "'," + Cap + ",'" + note + "')";
}
await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接
if (sql_in == 0)
{
System.Windows.MessageBox.Show("添加失败");
}
else
{
GridSql();
}
}
else
{ {
Stuff_sql = "INSERT INTO[Dispensing].[dbo].[UserAccount](UserCode ,PassWord ,GROUP_CODE ,Capacity ,Note ) " +
"VALUES ('" + name + "'," + password + ",'" + Group + "'," + Cap + ",'" + note + "')";
}
await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接
if (sql_in == 0)
{
System.Windows.MessageBox.Show("添加失败");
}
else
{
GridSql();
}
}
else
{
if (password == "") if (password == "")
{ {
@@ -193,26 +179,26 @@ namespace formula_manage.Windows
{ {
Stuff_sql = string.Format("UPDATE [dbo].[UserAccount] SET PassWord=" + password + " ,GROUP_CODE='" + Group + "' ,Capacity=" + Cap + " ,Note='" + note + "' Where UserCode ='" + name + "'"); Stuff_sql = string.Format("UPDATE [dbo].[UserAccount] SET PassWord=" + password + " ,GROUP_CODE='" + Group + "' ,Capacity=" + Cap + " ,Note='" + note + "' Where UserCode ='" + name + "'");
} }
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("修改失败"); System.Windows.MessageBox.Show("修改失败");
} }
else else
{ {
GridSql(); GridSql();
}
} }
} }
catch (Exception) }
{ catch (Exception)
System.Windows.MessageBox.Show("请求失败,检查连接"); {
return; System.Windows.MessageBox.Show("请求失败,检查连接");
} return;
}
} }
} }
+29 -45
View File
@@ -1,25 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
using static System.Net.Mime.MediaTypeNames;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -32,7 +17,6 @@ namespace formula_manage.Windows
DataTable dataTable = new DataTable(); //建立缓存 DataTable dataTable = new DataTable(); //建立缓存
int Button_ID = 0;
string TEXT_SQLIP; string TEXT_SQLIP;
string TEXT_SQLNAME; string TEXT_SQLNAME;
string TEXT_SQMOD; string TEXT_SQMOD;
@@ -72,7 +56,7 @@ namespace formula_manage.Windows
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlDataAdapter client_data = new SqlDataAdapter(client_sql, Connstr_SC); //查询 SqlDataAdapter client_data = new SqlDataAdapter(client_sql, Connstr_SC); //查询
client_data.Fill(dataTable); //查询结果存入缓存 client_data.Fill(dataTable); //查询结果存入缓存
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -90,13 +74,13 @@ namespace formula_manage.Windows
/// </summary> /// </summary>
private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e) private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
{ {
e.Row.Header = e.Row.GetIndex() + 1; e.Row.Header = e.Row.GetIndex() + 1;
} }
/// <summary> /// <summary>
/// 查询数据库的方法 /// 查询数据库的方法
/// </summary> /// </summary>
private async void GridSql() private async void GridSql()
{ {
string client_sql = "SELECT Code ,Name , Remark FROM [dbo].[Client]";//查询语句 string client_sql = "SELECT Code ,Name , Remark FROM [dbo].[Client]";//查询语句
@@ -121,7 +105,7 @@ namespace formula_manage.Windows
} }
private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件 private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
{ {
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数 Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数
string client_sql; string client_sql;
@@ -131,22 +115,22 @@ namespace formula_manage.Windows
if (string.IsNullOrEmpty(this.client_name.Text)) if (string.IsNullOrEmpty(this.client_name.Text))
System.Windows.MessageBox.Show("ERR:无效的名称", "错误");//检查原料名 System.Windows.MessageBox.Show("ERR:无效的名称", "错误");//检查原料名
else else
{ {
try try
{ {
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
client_sql = "SELECT count(*) FROM [dbo].[Client] WHERE Code = '" + client_code.Text + " '";//查询语句 client_sql = "SELECT count(*) FROM [dbo].[Client] WHERE Code = '" + client_code.Text + " '";//查询语句
await conn_SC.OpenAsync(); //打开数据连 await conn_SC.OpenAsync(); //打开数据连
SqlCommand cmd = new SqlCommand(client_sql, conn_SC); //查询记录数 SqlCommand cmd = new SqlCommand(client_sql, conn_SC); //查询记录数
int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数 int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
client_sql = string.Format("INSERT INTO [dbo].[Client](Code ,Name , Remark) " + client_sql = string.Format("INSERT INTO [dbo].[Client](Code ,Name , Remark) " +
"VALUES ('" + client_code.Text + "','" + client_name.Text + "','" + client_Remark.Text + "')"); "VALUES ('" + client_code.Text + "','" + client_name.Text + "','" + client_Remark.Text + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(client_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(client_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -159,10 +143,10 @@ namespace formula_manage.Windows
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成"); System.Windows.MessageBox.Show("添加完成");
} }
} }
else else
{ {
client_sql = string.Format("UPDATE [dbo].[Client] SET Name='" + client_name.Text + "',Remark='" + client_Remark.Text + "' Where Code='"+ client_code.Text + "'"); client_sql = string.Format("UPDATE [dbo].[Client] SET Name='" + client_name.Text + "',Remark='" + client_Remark.Text + "' Where Code='" + client_code.Text + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(client_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(client_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
@@ -173,9 +157,9 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("C0110-1:修改失败"); System.Windows.MessageBox.Show("C0110-1:修改失败");
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("修改完成"); System.Windows.MessageBox.Show("修改完成");
} }
} }
@@ -185,40 +169,40 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
string ShowProductName = "是否删除【" + this.client_name.Text + "】" + this.client_code.Text;//获取信息并拼接提示字符串 string ShowProductName = "是否删除【" + this.client_name.Text + "】" + this.client_code.Text;//获取信息并拼接提示字符串
MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料 MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料
if (showProductName == MessageBoxResult.Yes)//判断是否删除 if (showProductName == MessageBoxResult.Yes)//判断是否删除
{ {
string Stuff_sql = string.Format("DELETE FROM [dbo].[Client] WHERE Code ='" + client_code.Text.ToString() + "'"); string Stuff_sql = string.Format("DELETE FROM [dbo].[Client] WHERE Code ='" + client_code.Text.ToString() + "'");
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try try
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功 System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功
} }
else else
{ {
GridSql(); GridSql();
} }
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private void DataGridclient_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件 private void DataGridclient_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
@@ -233,5 +217,5 @@ namespace formula_manage.Windows
} }
} }
} }
} }
+28 -43
View File
@@ -1,25 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
using static System.Net.Mime.MediaTypeNames;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -32,7 +18,6 @@ namespace formula_manage.Windows
DataTable dataTable = new DataTable(); //建立缓存 DataTable dataTable = new DataTable(); //建立缓存
int Button_ID = 0;
string TEXT_SQLIP; string TEXT_SQLIP;
string TEXT_SQLNAME; string TEXT_SQLNAME;
string TEXT_SQMOD; string TEXT_SQMOD;
@@ -72,7 +57,7 @@ namespace formula_manage.Windows
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlDataAdapter color_data = new SqlDataAdapter(color_sql, Connstr_SC); //查询 SqlDataAdapter color_data = new SqlDataAdapter(color_sql, Connstr_SC); //查询
color_data.Fill(dataTable); //查询结果存入缓存 color_data.Fill(dataTable); //查询结果存入缓存
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -90,13 +75,13 @@ namespace formula_manage.Windows
/// </summary> /// </summary>
private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e) private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
{ {
e.Row.Header = e.Row.GetIndex() + 1; e.Row.Header = e.Row.GetIndex() + 1;
} }
/// <summary> /// <summary>
/// 查询数据库的方法 /// 查询数据库的方法
/// </summary> /// </summary>
private async void GridSql() private async void GridSql()
{ {
string color_sql = "SELECT COLOR_CODE ,COLOR_NAME , COLOR_NO , COLOR_Remark FROM [dbo].[COLOR]";//查询语句 string color_sql = "SELECT COLOR_CODE ,COLOR_NAME , COLOR_NO , COLOR_Remark FROM [dbo].[COLOR]";//查询语句
@@ -121,7 +106,7 @@ namespace formula_manage.Windows
} }
private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件 private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
{ {
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数 Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数
string color_sql; string color_sql;
int ColorCode_SQL; int ColorCode_SQL;
@@ -143,22 +128,22 @@ namespace formula_manage.Windows
if (string.IsNullOrEmpty(this.color_name.Text)) if (string.IsNullOrEmpty(this.color_name.Text))
System.Windows.MessageBox.Show("ERR:无效的原料名称", "错误");//检查原料名 System.Windows.MessageBox.Show("ERR:无效的原料名称", "错误");//检查原料名
else else
{ {
try try
{ {
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
color_sql = "SELECT count(*) FROM [dbo].[COLOR] WHERE COLOR_CODE = '" + color_code.Text + " '";//查询语句 color_sql = "SELECT count(*) FROM [dbo].[COLOR] WHERE COLOR_CODE = '" + color_code.Text + " '";//查询语句
await conn_SC.OpenAsync(); //打开数据连 await conn_SC.OpenAsync(); //打开数据连
SqlCommand cmd = new SqlCommand(color_sql, conn_SC); //查询记录数 SqlCommand cmd = new SqlCommand(color_sql, conn_SC); //查询记录数
int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数 int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
color_sql = string.Format("INSERT INTO [dbo].[COLOR](COLOR_CODE ,COLOR_NAME , COLOR_NO , COLOR_Remark) " + color_sql = string.Format("INSERT INTO [dbo].[COLOR](COLOR_CODE ,COLOR_NAME , COLOR_NO , COLOR_Remark) " +
"VALUES ('" + color_code.Text + "','" + color_name.Text + "','" + ColorCode_SQL + "','" + color_Remark.Text + "')"); "VALUES ('" + color_code.Text + "','" + color_name.Text + "','" + ColorCode_SQL + "','" + color_Remark.Text + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(color_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(color_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -171,8 +156,8 @@ namespace formula_manage.Windows
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成"); System.Windows.MessageBox.Show("添加完成");
} }
} }
else else
{ {
color_sql = string.Format("UPDATE [dbo].[COLOR] SET COLOR_NAME='" + color_name.Text + "',COLOR_NO='" + ColorCode_SQL + "',COLOR_Remark='" + color_Remark.Text + "' Where COLOR_CODE='" + color_code.Text + "'"); color_sql = string.Format("UPDATE [dbo].[COLOR] SET COLOR_NAME='" + color_name.Text + "',COLOR_NO='" + ColorCode_SQL + "',COLOR_Remark='" + color_Remark.Text + "' Where COLOR_CODE='" + color_code.Text + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
@@ -185,9 +170,9 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("C0110-1:修改失败"); System.Windows.MessageBox.Show("C0110-1:修改失败");
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("修改完成"); System.Windows.MessageBox.Show("修改完成");
} }
} }
@@ -197,40 +182,40 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
string ShowProductName = "是否删除【" + this.color_name.Text + "】" + this.color_code.Text;//获取信息并拼接提示字符串 string ShowProductName = "是否删除【" + this.color_name.Text + "】" + this.color_code.Text;//获取信息并拼接提示字符串
MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料 MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料
if (showProductName == MessageBoxResult.Yes)//判断是否删除 if (showProductName == MessageBoxResult.Yes)//判断是否删除
{ {
string Stuff_sql = string.Format("DELETE FROM [dbo].[COLOR] WHERE COLOR_CODE ='" + color_code.Text.ToString() + "'"); string Stuff_sql = string.Format("DELETE FROM [dbo].[COLOR] WHERE COLOR_CODE ='" + color_code.Text.ToString() + "'");
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try try
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功 System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功
} }
else else
{ {
GridSql(); GridSql();
} }
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private void DataGridcolor_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件 private void DataGridcolor_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
@@ -269,5 +254,5 @@ namespace formula_manage.Windows
//ColorCode_SQL = Convert.ToInt32(colorCode, 16);//十六进制RGB转存储数值 //ColorCode_SQL = Convert.ToInt32(colorCode, 16);//十六进制RGB转存储数值
} }
} }
} }
} }
+29 -45
View File
@@ -1,25 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Data;
using System.Linq; using System.Data.SqlClient;
using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using GalaSoft.MvvmLight;
using formula_manage.SQLModels;
using System.Data.SqlClient;
using System.Data;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using Xceed.Wpf.AvalonDock.Themes;
using static System.Net.Mime.MediaTypeNames;
namespace formula_manage.Windows namespace formula_manage.Windows
{ {
@@ -32,7 +17,6 @@ namespace formula_manage.Windows
DataTable dataTable = new DataTable(); //建立缓存 DataTable dataTable = new DataTable(); //建立缓存
int Button_ID = 0;
string TEXT_SQLIP; string TEXT_SQLIP;
string TEXT_SQLNAME; string TEXT_SQLNAME;
string TEXT_SQMOD; string TEXT_SQMOD;
@@ -72,7 +56,7 @@ namespace formula_manage.Windows
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlDataAdapter fabric_data = new SqlDataAdapter(fabric_sql, Connstr_SC); //查询 SqlDataAdapter fabric_data = new SqlDataAdapter(fabric_sql, Connstr_SC); //查询
fabric_data.Fill(dataTable); //查询结果存入缓存 fabric_data.Fill(dataTable); //查询结果存入缓存
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -90,13 +74,13 @@ namespace formula_manage.Windows
/// </summary> /// </summary>
private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e) private void DataGridEquipment_LoadingRow(object sender, DataGridRowEventArgs e)
{ {
e.Row.Header = e.Row.GetIndex() + 1; e.Row.Header = e.Row.GetIndex() + 1;
} }
/// <summary> /// <summary>
/// 查询数据库的方法 /// 查询数据库的方法
/// </summary> /// </summary>
private async void GridSql() private async void GridSql()
{ {
string fabric_sql = "SELECT Code ,Name , GYard , Remark FROM [dbo].[PRODUCTION_Material]";//查询语句 string fabric_sql = "SELECT Code ,Name , GYard , Remark FROM [dbo].[PRODUCTION_Material]";//查询语句
@@ -121,7 +105,7 @@ namespace formula_manage.Windows
} }
private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件 private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
{ {
Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数 Regex re_number = new Regex(@"^[0-9]+(.[0-9]{1,4})?$");//校验用正则表达式有1~2位小数的正实数
string fabric_sql; string fabric_sql;
@@ -134,22 +118,22 @@ namespace formula_manage.Windows
if (string.IsNullOrEmpty(this.fabric_name.Text)) if (string.IsNullOrEmpty(this.fabric_name.Text))
System.Windows.MessageBox.Show("ERR:无效的原料名称", "错误");//检查原料名 System.Windows.MessageBox.Show("ERR:无效的原料名称", "错误");//检查原料名
else else
{ {
try try
{ {
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
fabric_sql = "SELECT count(*) FROM [dbo].[PRODUCTION_Material] WHERE Code = '" + fabric_code.Text + " '";//查询语句 fabric_sql = "SELECT count(*) FROM [dbo].[PRODUCTION_Material] WHERE Code = '" + fabric_code.Text + " '";//查询语句
await conn_SC.OpenAsync(); //打开数据连 await conn_SC.OpenAsync(); //打开数据连
SqlCommand cmd = new SqlCommand(fabric_sql, conn_SC); //查询记录数 SqlCommand cmd = new SqlCommand(fabric_sql, conn_SC); //查询记录数
int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数 int count = Convert.ToInt32(cmd.ExecuteScalar()); //显示记录数
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (count == 0) if (count == 0)
{ {
fabric_sql = string.Format("INSERT INTO [dbo].[PRODUCTION_Material](Code ,Name , GYard , Remark) " + fabric_sql = string.Format("INSERT INTO [dbo].[PRODUCTION_Material](Code ,Name , GYard , Remark) " +
"VALUES ('" + fabric_code.Text + "','" + fabric_name.Text + "','" + fabric_GYard.Text + "','" + fabric_Remark.Text + "')"); "VALUES ('" + fabric_code.Text + "','" + fabric_name.Text + "','" + fabric_GYard.Text + "','" + fabric_Remark.Text + "')");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(fabric_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(fabric_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
@@ -162,10 +146,10 @@ namespace formula_manage.Windows
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成"); System.Windows.MessageBox.Show("添加完成");
} }
} }
else else
{ {
fabric_sql = string.Format("UPDATE [dbo].[PRODUCTION_Material] SET Name='" + fabric_name.Text + "',GYard='" + fabric_GYard.Text + "',Remark='" + fabric_Remark.Text + "' Where Code='"+ fabric_code.Text + "'"); fabric_sql = string.Format("UPDATE [dbo].[PRODUCTION_Material] SET Name='" + fabric_name.Text + "',GYard='" + fabric_GYard.Text + "',Remark='" + fabric_Remark.Text + "' Where Code='" + fabric_code.Text + "'");
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(fabric_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(fabric_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
@@ -176,9 +160,9 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("C0110-1:修改失败"); System.Windows.MessageBox.Show("C0110-1:修改失败");
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("修改完成"); System.Windows.MessageBox.Show("修改完成");
} }
} }
@@ -188,40 +172,40 @@ namespace formula_manage.Windows
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件 private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
{ {
string ShowProductName = "是否删除【" + this.fabric_name.Text + "】" + this.fabric_code.Text;//获取信息并拼接提示字符串 string ShowProductName = "是否删除【" + this.fabric_name.Text + "】" + this.fabric_code.Text;//获取信息并拼接提示字符串
MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料 MessageBoxResult showProductName = System.Windows.MessageBox.Show(ShowProductName, "提示", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.Yes);//弹窗提示是否删除目标原料
if (showProductName == MessageBoxResult.Yes)//判断是否删除 if (showProductName == MessageBoxResult.Yes)//判断是否删除
{ {
string Stuff_sql = string.Format("DELETE FROM [dbo].[PRODUCTION_Material] WHERE Code ='" + fabric_code.Text.ToString() + "'"); string Stuff_sql = string.Format("DELETE FROM [dbo].[PRODUCTION_Material] WHERE Code ='" + fabric_code.Text.ToString() + "'");
SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化 SqlConnection conn_SC = new SqlConnection(Connstr_SC); //实例化
try try
{ {
await conn_SC.OpenAsync(); //打开数据连接 await conn_SC.OpenAsync(); //打开数据连接
SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC); SqlCommand INSERT_cmd = new SqlCommand(Stuff_sql, conn_SC);
int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句 int sql_in = INSERT_cmd.ExecuteNonQuery(); //执行语句
conn_SC.Close(); //关闭连接 conn_SC.Close(); //关闭连接
if (sql_in == 0) if (sql_in == 0)
{ {
System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功 System.Windows.MessageBox.Show("C0110-2:删除失败", "错误");//判断执行是否成功
} }
else else
{ {
GridSql(); GridSql();
} }
} }
catch (Exception) catch (Exception)
{ {
System.Windows.MessageBox.Show("请求失败,检查连接"); System.Windows.MessageBox.Show("请求失败,检查连接");
return; return;
} }
} }
} }
private void DataGridfabric_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件 private void DataGridfabric_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
@@ -237,5 +221,5 @@ namespace formula_manage.Windows
} }
} }
} }
} }
+138 -106
View File
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props" Condition="Exists('packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props')" />
<Import Project="packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props" Condition="Exists('packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -116,122 +114,32 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="CommonServiceLocator, Version=2.0.7.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>packages\CommonServiceLocator.2.0.7\lib\net47\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="CommunityToolkit.Mvvm, Version=8.2.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
<HintPath>packages\CommunityToolkit.Mvvm.8.2.2\lib\netstandard2.0\CommunityToolkit.Mvvm.dll</HintPath>
</Reference>
<Reference Include="FastReport, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.dll</HintPath>
</Reference>
<Reference Include="FastReport.Bars, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Bars.dll</HintPath>
</Reference>
<Reference Include="FastReport.Compat, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Compat.2024.2.2\lib\net462\FastReport.Compat.dll</HintPath>
</Reference>
<Reference Include="FastReport.DataVisualization, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=5ceb240df42bf6e8, processorArchitecture=MSIL">
<HintPath>packages\FastReport.DataVisualization.2024.2.2\lib\net462\FastReport.DataVisualization.dll</HintPath>
</Reference>
<Reference Include="FastReport.Editor, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Editor.dll</HintPath>
</Reference>
<Reference Include="FastReport.VSDesign, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.VSDesign.dll</HintPath>
</Reference>
<Reference Include="FastReport.Web, Version=2024.2.2.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
<HintPath>packages\FastReport.Net.Demo.2024.2.2\lib\net462\FastReport.Web.dll</HintPath>
</Reference>
<Reference Include="FirstFloor.ModernUI, Version=1.0.9.0, Culture=neutral, PublicKeyToken=bc9b0c37bf06c6a9, processorArchitecture=MSIL">
<HintPath>packages\ModernUI.WPF.1.0.9\lib\net45\FirstFloor.ModernUI.dll</HintPath>
</Reference>
<Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
</Reference>
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
</Reference>
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="ModernUI.Xceed.AvalonDock, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="ModernUI.Xceed.Toolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SamOatesGames.ModernUI.Xceed.Toolkit.1.0.1905191936\lib\net45\ModernUI.Xceed.Toolkit.dll</HintPath>
</Reference>
<Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath>
</Reference>
<Reference Include="Smart.FormDesigner, Version=1.4.8302.26895, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Smart.FormDesigner.1.4.3\lib\net40\Smart.FormDesigner.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.ComponentModel.Composition" />
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Design" /> <Reference Include="System.Design" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Printing" /> <Reference Include="System.Printing" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.ServiceProcess" /> <Reference Include="System.ServiceProcess" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Web" />
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml"> <Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework> <RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference> </Reference>
<Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.6.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <ApplicationDefinition Include="App.xaml">
@@ -248,6 +156,9 @@
<Compile Include="ConvertMoels\StatenConvert.cs" /> <Compile Include="ConvertMoels\StatenConvert.cs" />
<Compile Include="ConvertMoels\StatenERRConvert.cs" /> <Compile Include="ConvertMoels\StatenERRConvert.cs" />
<Compile Include="ConvertMoels\UserSQLConvert.cs" /> <Compile Include="ConvertMoels\UserSQLConvert.cs" />
<Compile Include="EX\Exchange.xaml.cs">
<DependentUpon>Exchange.xaml</DependentUpon>
</Compile>
<Compile Include="EX\ExProgram.xaml.cs"> <Compile Include="EX\ExProgram.xaml.cs">
<DependentUpon>ExProgram.xaml</DependentUpon> <DependentUpon>ExProgram.xaml</DependentUpon>
</Compile> </Compile>
@@ -259,14 +170,19 @@
<Compile Include="UserClass\Code128.cs" /> <Compile Include="UserClass\Code128.cs" />
<Compile Include="UserClass\CRCcheck16.cs" /> <Compile Include="UserClass\CRCcheck16.cs" />
<Compile Include="UserClass\DataGridHelper.cs" /> <Compile Include="UserClass\DataGridHelper.cs" />
<Compile Include="UserClass\get_local_ip_address.cs" />
<Compile Include="UserClass\HardwareSN.cs" /> <Compile Include="UserClass\HardwareSN.cs" />
<Compile Include="UserClass\LogGing.cs" />
<Compile Include="UserClass\TCPServer.cs" />
<Compile Include="UserClass\IniFile.cs" /> <Compile Include="UserClass\IniFile.cs" />
<Compile Include="UserClass\LogDataRead.cs" />
<Compile Include="UserClass\MD5check.cs" /> <Compile Include="UserClass\MD5check.cs" />
<Compile Include="UserClass\PressKey.cs" /> <Compile Include="UserClass\PressKey.cs" />
<Compile Include="UserClass\DataTableForToObservableCollection.cs" /> <Compile Include="UserClass\DataTableForToObservableCollection.cs" />
<Compile Include="UserClass\PrintHelper.cs" /> <Compile Include="UserClass\PrintHelper.cs" />
<Compile Include="UserClass\StrToInt.cs" /> <Compile Include="UserClass\StrToInt.cs" />
<Compile Include="UserClass\UserPrint.cs" /> <Compile Include="UserClass\UserPrint.cs" />
<Compile Include="ViewModel\ExchangeViewModel.cs" />
<Compile Include="ViewModel\RECIPEViewModel.cs" /> <Compile Include="ViewModel\RECIPEViewModel.cs" />
<Compile Include="ViewModel\MainWindowViewModel.cs" /> <Compile Include="ViewModel\MainWindowViewModel.cs" />
<Compile Include="ViewModel\ViewModelLocator.cs" /> <Compile Include="ViewModel\ViewModelLocator.cs" />
@@ -318,6 +234,10 @@
<Compile Include="Windows\Stuff.xaml.cs"> <Compile Include="Windows\Stuff.xaml.cs">
<DependentUpon>Stuff.xaml</DependentUpon> <DependentUpon>Stuff.xaml</DependentUpon>
</Compile> </Compile>
<Page Include="EX\Exchange.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="EX\ExProgram.xaml"> <Page Include="EX\ExProgram.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@@ -458,7 +378,6 @@
<None Include="FastReport\Localization\Turkish.frl" /> <None Include="FastReport\Localization\Turkish.frl" />
<None Include="FastReport\Localization\Ukrainian.frl" /> <None Include="FastReport\Localization\Ukrainian.frl" />
<None Include="formula_manage_TemporaryKey.pfx" /> <None Include="formula_manage_TemporaryKey.pfx" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -500,14 +419,127 @@
<ItemGroup> <ItemGroup>
<Resource Include="FastReport\Localization\readme.txt" /> <Resource Include="FastReport\Localization\readme.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="CommonServiceLocator">
<Version>2.0.7</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>8.2.2</Version>
</PackageReference>
<PackageReference Include="DotNetty.Buffers">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNetty.Codecs">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNetty.Codecs.Http">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNetty.Common">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNetty.Handlers">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNetty.Transport">
<Version>0.7.6</Version>
</PackageReference>
<PackageReference Include="DotNettySocket">
<Version>1.2.0</Version>
</PackageReference>
<PackageReference Include="Extended.Wpf.Toolkit">
<Version>4.6.0</Version>
</PackageReference>
<PackageReference Include="FastReport.Compat">
<Version>2024.2.11</Version>
</PackageReference>
<PackageReference Include="FastReport.DataVisualization">
<Version>2024.2.11</Version>
</PackageReference>
<PackageReference Include="FastReport.Net.Demo">
<Version>2024.2.11</Version>
</PackageReference>
<PackageReference Include="FastReport.OpenSource">
<Version>2024.2.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp">
<Version>4.7.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
<Version>8.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
<Version>8.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Options">
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Primitives">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="ModernUI.WPF">
<Version>1.0.9</Version>
</PackageReference>
<PackageReference Include="MvvmLightLibs">
<Version>5.4.1.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="NModbus">
<Version>3.0.81</Version>
</PackageReference>
<PackageReference Include="Prism.Core">
<Version>8.1.97</Version>
</PackageReference>
<PackageReference Include="Prism.Forms">
<Version>8.1.97</Version>
</PackageReference>
<PackageReference Include="SamOatesGames.ModernUI.Xceed.Toolkit">
<Version>1.0.1905191936</Version>
</PackageReference>
<PackageReference Include="System.Buffers">
<Version>4.5.1</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="System.Diagnostics.DiagnosticSource">
<Version>8.0.1</Version>
</PackageReference>
<PackageReference Include="System.Memory">
<Version>4.5.5</Version>
</PackageReference>
<PackageReference Include="System.Numerics.Vectors">
<Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="System.Threading.Tasks.Extensions">
<Version>4.5.4</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="ThoughtWorks.QRCode">
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2662</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\FastReport.OpenSource.2024.2.1\build\FastReport.OpenSource.props'))" />
<Error Condition="!Exists('packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\FastReport.Net.Demo.2024.2.2\build\net462\FastReport.Net.Demo.props'))" />
<Error Condition="!Exists('packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets'))" />
</Target>
<Import Project="packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets" Condition="Exists('packages\CommunityToolkit.Mvvm.8.2.2\build\netstandard2.0\CommunityToolkit.Mvvm.targets')" />
</Project> </Project>
-26
View File
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="2.0.7" targetFramework="net472" />
<package id="CommunityToolkit.Mvvm" version="8.2.2" targetFramework="net472" />
<package id="Extended.Wpf.Toolkit" version="4.6.0" targetFramework="net472" />
<package id="FastReport.Compat" version="2024.2.2" targetFramework="net472" />
<package id="FastReport.DataVisualization" version="2024.2.2" targetFramework="net472" />
<package id="FastReport.Net.Demo" version="2024.2.2" targetFramework="net472" />
<package id="FastReport.OpenSource" version="2024.2.1" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="ModernUI.WPF" version="1.0.9" targetFramework="net46" />
<package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net46" />
<package id="NModbus" version="3.0.81" targetFramework="net462" />
<package id="SamOatesGames.ModernUI.Xceed.Toolkit" version="1.0.1905191936" targetFramework="net46" />
<package id="Smart.FormDesigner" version="1.4.3" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net472" />
<package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
<package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net46" />
</packages>