sc/formula_manage
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Browse Source
This commit is contained in:
sc committed 2024-07-01 00:27:49 +08:00
2 parents bbf2871230 37bcbd8aea
commit 8a383bf4d1
3 files changed
+21 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+5 -2
View File
@@ -24,7 +24,6 @@
<MenuItem Header="_备份/还原" FontSize="16" Name="_SQLBAK" Click="SQLBAK" IsEnabled="False"/>
<Separator/>
<MenuItem Header="_软件设置" FontSize="16" Name="_SOFTWARE_SET" Click="SOFTWARE_SET" IsEnabled="False"/>
<MenuItem Header="_转换设置" FontSize="16" Name="_EX_SET" Click="EX_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>
@@ -46,9 +45,13 @@
</MenuItem>
<MenuItem Header="_查询" FontSize="16" Focusable ="False">
<MenuItem Header="_领料单据" FontSize="16"/>
<MenuItem Header="_转换历史" FontSize="16" Name="_exchange" Click="EXCHANGE" IsEnabled="False"/>
<MenuItem Header="_统计" FontSize="16" Name="_statistics" IsEnabled="False"/>
</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" Click="HELP"/>
</MenuItem>
MainWindow.xaml.cs
+9 -1
View File
@@ -53,7 +53,15 @@ namespace formula_manage
InitializeComponent();
this.Closing += Window_Closing; //添加窗口关闭事件
if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6"))) UserClass.TCPServer.Start(); //开启网路通讯
if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
{
UserClass.TCPServer.Start(); //开启网路通讯
_WorkingMode.Header = "服务端";
}
else
{
_WorkingMode.Header = "客户端";
}
USER.Text = App.USER_Purview;
RRODUCTdataTable.Columns.Add("ID", typeof(int));
UserClass/TCPServer.cs
+7 -12
View File
@@ -18,16 +18,15 @@ namespace formula_manage.UserClass
//字典集合：存储IP和Socket的集合
public static Dictionary<string, Socket> OnLineList = new Dictionary<string, Socket>();
DataTable IPdataTable = new DataTable(); //建立缓存
//当前时间
//当前时间
private string CurrentTime
{
get { return DateTime.Now.ToString("HH:mm:ss") + Environment.NewLine; }
}
//编码格式
public static Encoding econding = Encoding.Default;
public static Encoding econding = Encoding.UTF8;
public static void Start()
{
@@ -80,7 +79,7 @@ namespace formula_manage.UserClass
while (true)
{
//定义一个2M的缓冲区
byte[] buffer = new byte[1024 * 1024 * 2];
byte[] buffer = new byte[1024 * 1024 * 10];
int length = -1;
try
@@ -94,12 +93,10 @@ namespace formula_manage.UserClass
string ip = clientSocket.RemoteEndPoint.ToString();
UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
// AddOnLine(ip, false);
OnLineList.Remove(ip);
break;
OnLineList.Remove(ip); //移除ip
break; //退出循环
}
if (length == 0)
{
//客户端下线了
@@ -108,11 +105,9 @@ namespace formula_manage.UserClass
UserClass.LogGing.LogGingDATA("IP_Line = " + ip);
// AddOnLine(ip, false);
OnLineList.Remove(ip);
break;
}
if (length > 0)
else
{
infoR = econding.GetString(buffer, 0, length);
//ShowMessage(info);