yantian yue
2023-12-29 cd7c9e15bc51e65be0b456129d7d380667b9351e
更新
已修改8个文件
17 ■■■■■ 文件已修改
.vs/YX/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.exe 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.exe 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/wt/Frmwt.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/YX/v16/.suo
Binary files differ
YX/bin/Debug/YX.exe
Binary files differ
YX/bin/Debug/YX.pdb
Binary files differ
YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache
Binary files differ
YX/obj/Debug/YX.csproj.AssemblyReference.cache
Binary files differ
YX/obj/Debug/YX.exe
Binary files differ
YX/obj/Debug/YX.pdb
Binary files differ
YX/wt/Frmwt.cs
@@ -49,7 +49,7 @@
            {
                Console.WriteLine($"发生错误:{ex}");
            }
            dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "称重");
            dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "四码合一");
            macBox.Text = GetMacByNetworkInterface();
        }
@@ -59,16 +59,13 @@
            while (true)
            {
                ProcessDelegate showProcess = new ProcessDelegate(LabelShow);
                //string str = "1\n2\n3\n";
                //str = str.Replace("\n", string.Empty); // 将 \n 替换为空字符串
                string str = ModbusTCPRead(5, 1).Trim("\n".ToCharArray());
                if (ModbusTCPRead(5, 1).Trim("\n".ToCharArray()) == "1")
                {
                    try
                    {
                        //PSN = ModbusTCPRead(5, 20).Replace("\n", string.Empty);
                        PSN = ModbusTCPReadString(25, 30).Replace("\0", string.Empty);
                        PSN = ModbusTCPReadString(25, 30).Replace("\0", string.Empty); //将\0替换为空字符串
                        PSN2 = ModbusTCPReadString(45, 20).Replace("\0", string.Empty);
                        PSN3 = ModbusTCPReadString(65, 20).Replace("\0", string.Empty);
                        label1.Invoke(showProcess);
@@ -237,7 +234,7 @@
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "WI6027调用失败!",
                    Type = "称重",
                    Type = "四码合一",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return;
@@ -268,7 +265,7 @@
                    }
                }
            }
            dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "称重");
            dataGridView1.DataSource = System_Bll.GetSystemLog(FrmLogin.LocalIP, "四码合一");
            Refresh();
        }
@@ -350,7 +347,7 @@
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "WI601K接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    Type = "四码合一",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return false;
@@ -381,7 +378,7 @@
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "WI1032接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    Type = "四码合一",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return null;
@@ -438,7 +435,7 @@
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "WI6041接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    Type = "四码合一",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return false;