yantian yue
2023-12-28 74222333166387c1e0508f8ccaf8347b861649a5
更新
已修改50个文件
226 ■■■■ 文件已修改
.vs/VSWorkspaceState.json 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/XY/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
.vs/YX/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
.vs/slnx.sqlite 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.Entity.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/bin/Debug/YX.Entity.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/obj/Debug/YX.BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.BLL/obj/Debug/YX.BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/bin/Debug/YX.DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/bin/Debug/YX.DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/bin/Debug/YX.Entity.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/bin/Debug/YX.Entity.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/obj/Debug/YX.DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.DAL/obj/Debug/YX.DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/bin/Debug/YX.Entity.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/bin/Debug/YX.Entity.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/obj/Debug/YX.Entity.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX.Entity/obj/Debug/YX.Entity.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.Entity.dll 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.Entity.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.exe 补丁 | 查看 | 原始文档 | blame | 历史
YX/bin/Debug/YX.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/DesignTimeResolveAssemblyReferences.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.FrmMain.resources 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.csproj.FileListAbsolute.txt 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.csproj.GenerateResource.cache 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.exe 补丁 | 查看 | 原始文档 | blame | 历史
YX/obj/Debug/YX.pdb 补丁 | 查看 | 原始文档 | blame | 历史
YX/wt/Frmwt.cs 119 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VSWorkspaceState.json
@@ -1,7 +1,8 @@
{
  "ExpandedNodes": [
    ""
    "",
    "\\YX"
  ],
  "SelectedNode": "\\YX.sln",
  "SelectedNode": "\\YX\\wt",
  "PreviewInSolutionExplorer": false
}
.vs/XY/v16/.suo
Binary files differ
.vs/YX/v16/.suo
Binary files differ
.vs/slnx.sqlite
Binary files differ
YX.BLL/bin/Debug/YX.BLL.dll
Binary files differ
YX.BLL/bin/Debug/YX.BLL.pdb
Binary files differ
YX.BLL/bin/Debug/YX.DAL.dll
Binary files differ
YX.BLL/bin/Debug/YX.DAL.pdb
Binary files differ
YX.BLL/bin/Debug/YX.Entity.dll
Binary files differ
YX.BLL/bin/Debug/YX.Entity.pdb
Binary files differ
YX.BLL/obj/Debug/YX.BLL.csproj.AssemblyReference.cache
Binary files differ
YX.BLL/obj/Debug/YX.BLL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
063e96945b5976768b1f948625d250a04dd927f9
f1488af7a4ae78ef75ccf4483a1edc924086ec16
YX.BLL/obj/Debug/YX.BLL.csproj.FileListAbsolute.txt
@@ -40,3 +40,19 @@
D:\YX\YX.BLL\obj\Debug\YX.BLL.csproj.CopyComplete
D:\YX\YX.BLL\obj\Debug\YX.BLL.dll
D:\YX\YX.BLL\obj\Debug\YX.BLL.pdb
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.BLL.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.BLL.pdb
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\EntityFramework.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\EntityFramework.SqlServer.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.DAL.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.Entity.dll
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.DAL.pdb
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.Entity.pdb
D:\项目资料\闻泰项目\XY\YX.BLL\bin\Debug\YX.Entity.dll.config
D:\项目资料\闻泰项目\XY\YX.BLL\obj\Debug\YX.BLL.csproj.AssemblyReference.cache
D:\项目资料\闻泰项目\XY\YX.BLL\obj\Debug\YX.BLL.csproj.CoreCompileInputs.cache
D:\项目资料\闻泰项目\XY\YX.BLL\obj\Debug\YX.BLL.csproj.CopyComplete
D:\项目资料\闻泰项目\XY\YX.BLL\obj\Debug\YX.BLL.dll
D:\项目资料\闻泰项目\XY\YX.BLL\obj\Debug\YX.BLL.pdb
YX.BLL/obj/Debug/YX.BLL.dll
Binary files differ
YX.BLL/obj/Debug/YX.BLL.pdb
Binary files differ
YX.Common/obj/Debug/YX.Common.csproj.AssemblyReference.cache
Binary files differ
YX.Common/obj/Debug/YX.Common.csproj.FileListAbsolute.txt
@@ -16,3 +16,9 @@
D:\YX\YX.Common\obj\Debug\YX.Common.csproj.CoreCompileInputs.cache
D:\YX\YX.Common\obj\Debug\YX.Common.dll
D:\YX\YX.Common\obj\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX.Common\bin\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX.Common\bin\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX.Common\obj\Debug\YX.Common.csproj.AssemblyReference.cache
D:\项目资料\闻泰项目\XY\YX.Common\obj\Debug\YX.Common.csproj.CoreCompileInputs.cache
D:\项目资料\闻泰项目\XY\YX.Common\obj\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX.Common\obj\Debug\YX.Common.pdb
YX.DAL/bin/Debug/YX.DAL.dll
Binary files differ
YX.DAL/bin/Debug/YX.DAL.pdb
Binary files differ
YX.DAL/bin/Debug/YX.Entity.dll
Binary files differ
YX.DAL/bin/Debug/YX.Entity.pdb
Binary files differ
YX.DAL/obj/Debug/YX.DAL.csproj.AssemblyReference.cache
Binary files differ
YX.DAL/obj/Debug/YX.DAL.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
3c1b321a6877c76b555ad2635925733a7586a2f7
47a68bdaf8811719fec5c9959ef4e84916412f6f
YX.DAL/obj/Debug/YX.DAL.csproj.FileListAbsolute.txt
@@ -34,3 +34,17 @@
D:\YX\YX.DAL\obj\Debug\YX.DAL.csproj.CopyComplete
D:\YX\YX.DAL\obj\Debug\YX.DAL.dll
D:\YX\YX.DAL\obj\Debug\YX.DAL.pdb
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.DAL.dll
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.DAL.pdb
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\EntityFramework.dll
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\EntityFramework.SqlServer.dll
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.Entity.dll
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.Entity.pdb
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.Entity.dll.config
D:\项目资料\闻泰项目\XY\YX.DAL\bin\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX.DAL\obj\Debug\YX.DAL.csproj.AssemblyReference.cache
D:\项目资料\闻泰项目\XY\YX.DAL\obj\Debug\YX.DAL.csproj.CoreCompileInputs.cache
D:\项目资料\闻泰项目\XY\YX.DAL\obj\Debug\YX.DAL.csproj.CopyComplete
D:\项目资料\闻泰项目\XY\YX.DAL\obj\Debug\YX.DAL.dll
D:\项目资料\闻泰项目\XY\YX.DAL\obj\Debug\YX.DAL.pdb
YX.DAL/obj/Debug/YX.DAL.dll
Binary files differ
YX.DAL/obj/Debug/YX.DAL.pdb
Binary files differ
YX.Entity/bin/Debug/YX.Entity.dll
Binary files differ
YX.Entity/bin/Debug/YX.Entity.pdb
Binary files differ
YX.Entity/obj/Debug/YX.Entity.csproj.AssemblyReference.cache
Binary files differ
YX.Entity/obj/Debug/YX.Entity.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
d8f53ce9adfc52e9bc42643913659aa4dc61f57a
b5e283db430385ce16b511293d0e30d773cb9f6d
YX.Entity/obj/Debug/YX.Entity.csproj.FileListAbsolute.txt
@@ -30,3 +30,15 @@
D:\YX\YX.Entity\obj\Debug\YX.Entity.csproj.CopyComplete
D:\YX\YX.Entity\obj\Debug\YX.Entity.dll
D:\YX\YX.Entity\obj\Debug\YX.Entity.pdb
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\YX.Entity.dll.config
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\YX.Entity.dll
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\YX.Entity.pdb
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\EntityFramework.dll
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\EntityFramework.SqlServer.dll
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX.Entity\bin\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX.Entity\obj\Debug\YX.Entity.csproj.AssemblyReference.cache
D:\项目资料\闻泰项目\XY\YX.Entity\obj\Debug\YX.Entity.csproj.CoreCompileInputs.cache
D:\项目资料\闻泰项目\XY\YX.Entity\obj\Debug\YX.Entity.csproj.CopyComplete
D:\项目资料\闻泰项目\XY\YX.Entity\obj\Debug\YX.Entity.dll
D:\项目资料\闻泰项目\XY\YX.Entity\obj\Debug\YX.Entity.pdb
YX.Entity/obj/Debug/YX.Entity.dll
Binary files differ
YX.Entity/obj/Debug/YX.Entity.pdb
Binary files differ
YX/bin/Debug/YX.BLL.dll
Binary files differ
YX/bin/Debug/YX.BLL.pdb
Binary files differ
YX/bin/Debug/YX.DAL.dll
Binary files differ
YX/bin/Debug/YX.DAL.pdb
Binary files differ
YX/bin/Debug/YX.Entity.dll
Binary files differ
YX/bin/Debug/YX.Entity.pdb
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.FrmMain.resources
Binary files differ
YX/obj/Debug/YX.csproj.AssemblyReference.cache
Binary files differ
YX/obj/Debug/YX.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
9388a4f6181b0756c8938115c12cc270ee0df3b4
95ea5546ba3dfb78b7ef9a805b28ae5434625aab
YX/obj/Debug/YX.csproj.FileListAbsolute.txt
@@ -123,3 +123,49 @@
D:\YX\YX\bin\Debug\EasyModbus.xml
D:\YX\YX\obj\Debug\YX.Frmhome.resources
D:\YX\YX\obj\Debug\YX.wt.Frmwt.resources
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.exe.config
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.exe
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.pdb
D:\项目资料\闻泰项目\XY\YX\bin\Debug\EasyModbus.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\EntityFramework.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\EntityFramework.SqlServer.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\log4net.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\Newtonsoft.Json.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.BLL.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.Common.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.Entity.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.DAL.dll
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.BLL.pdb
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.Common.pdb
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.Entity.pdb
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.Entity.dll.config
D:\项目资料\闻泰项目\XY\YX\bin\Debug\EasyModbus.xml
D:\项目资料\闻泰项目\XY\YX\bin\Debug\YX.DAL.pdb
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.csproj.AssemblyReference.cache
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.Frmhome.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmGoodsInfo.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmAppendProperty.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmAppendPropertyEdit.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmDataCenter.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmDeptInfo.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmDeptInfoEdit.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmExpress.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmLeft.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmListImages.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmLogin.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmMain.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmMenu.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmMenuEdit.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmRole.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmRoleEdit.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmUserInfo.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.FrmUserInfoEdit.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.Properties.Resources.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.WindowParent.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.wt.Frmwt.resources
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.csproj.GenerateResource.cache
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.csproj.CoreCompileInputs.cache
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.csproj.CopyComplete
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.exe
D:\项目资料\闻泰项目\XY\YX\obj\Debug\YX.pdb
YX/obj/Debug/YX.csproj.GenerateResource.cache
Binary files differ
YX/obj/Debug/YX.exe
Binary files differ
YX/obj/Debug/YX.pdb
Binary files differ
YX/wt/Frmwt.cs
@@ -34,6 +34,7 @@
        public string PSN = "";
        public string PSN2 = "";
        public string PSN3 = "";
        public bool t = true;
        public Frmwt(string ParentId)
        {
            InitializeComponent();
@@ -224,9 +225,8 @@
        private void LabelShow()
        {
            //string[] aaa = PSN.Split(',');
            //string bbbb = aaa[0];
            PSNBox.Text = PSN;
            string[] b_str = PSN.Split(',');
            PSNBox.Text = b_str[1];
            JObject jo = WI6027();
            if (jo == null)
@@ -254,7 +254,7 @@
                JObject jo1032 = WI1032(PSNBox.Text, SNMBox.Text, KPNMBox.Text, KPValueBox.Text);
                if (jo1032 != null)
                {
                    if (WI6041(PSNBox.Text, SNMBox.Text, KPNMBox.Text, jo1032))
                    if (WI6041(PSNBox.Text, SNMBox.Text, KPNMBox.Text, b_str[0]))
                    {
                        System_Bll.WriteLogToDB(new Entity.Base_Log
                        {
@@ -309,9 +309,7 @@
        public JObject WI6027()
        {
            //string WI6027 = "{ \"user\":\"sys\",\"password\":\"sysuser\",\"method\":\"MES_BA_WI6027\",\"servername\":\"TEST_WTMES_Customer\",\"methodparameter\":{ \"mac\":\"6A:15:63:C3:CC:EA\",\"hostName\":\"liuxingliang-PC\"} }";
            string a = "D0:8E:79:02:CF:91";
            string a = "a0:36:9F:6c:0e:95";
            string WI6027 = "{";
            WI6027 += "\"user\":\"sys\",";
            WI6027 += "\"password\":\"sysuser\",";
@@ -319,17 +317,16 @@
            WI6027 += "\"servername\":\"London\",";
            WI6027 += "\"methodparameter\":{";
            WI6027 += "\"mac\":\"" + a + "\",";
            WI6027 += "\"hostName\":\"PC-20230103TQKE\"";
            WI6027 += "\"hostName\":\"DESKTOP-UV8I1I0\"";
            WI6027 += "}}";
            JObject jo = MES_Interface(WI6027, encryptionKey);
            return jo;
            return MES_Interface(WI6027, encryptionKey);
        }
        public bool WI601K(string BarCode)
        {
            //string WI601K = "{\"user\":\"sys\", \"password\":\"sysuser\",\"method\":\"MES_BA_WI601K\",\"servername\":\"TEST_WTMES_Customer\", \"methodparameter\":{\"BarCode\":\"123456789\", \"HostName\":\"liuxingliang-PC\", \"Mac\":\"6A:15:63:C3:CC:EA\" }}\n";
            string a = "a0:36:9F:6c:0e:95";
            string WI601K = "{";
            WI601K += "\"user\":\"sys\",";
            WI601K += "\"password\":\"sysuser\",";
@@ -337,21 +334,23 @@
            WI601K += "\"servername\":\"London\",";
            WI601K += "\"methodparameter\":{";
            WI601K += "\"BarCode\":\"" + BarCode + "\",";
            WI601K += "\"HostName\":\"liuxingliang-PC\",";
            WI601K += "\"Mac\":\"6A:15:63:C3:CC:EA\"";
            WI601K += "\"HostName\":\"DESKTOP-UV8I1I0\",";
            WI601K += "\"Mac\":\"" + a + "\"";
            WI601K += "}";
            WI601K += "}";
            JObject jo = MES_Interface(WI601K, encryptionKey);
            if (jo["state"].ToString() == "false")
            {
                t = false;
                System_Bll.WriteLogToDB(new Entity.Base_Log
                {
                    CreateUserID = FrmLogin.LoginUserID,
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "MES接口WI601K,条码比对失败!",
                    Type = "包装线",
                    LogMessage = "WI601K接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return false;
@@ -375,13 +374,14 @@
            JObject jo = MES_Interface(WI1032, encryptionKey);
            if (jo["state"].ToString() == "false")
            {
                t = false;
                System_Bll.WriteLogToDB(new Entity.Base_Log
                {
                    CreateUserID = FrmLogin.LoginUserID,
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "MES接口WI1032条码邦定失败",
                    Type = "包装线",
                    LogMessage = "WI1032接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    ClassName = typeof(FrmLogin).ToString()
                });
                return null;
@@ -389,61 +389,58 @@
            return jo;
        }
        public bool WI6041(string Line, string Station, string StationID, JObject outWI1032)
        public bool WI6041(string Line, string Station, string StationID, string PSN)
        {
            var contents = outWI1032["content"];
            string WI6041 = "{ " +
                "\n\"user\":\"sys\", " +
                "\n\"password\":\"sysuser\", " +
                "\n\"method\":\"MES_BA_WI6041\", " +
                "\n\"servername\":\"London\", " +
                "\n\"methodparameter\":{ " +
                "\n\"content\":{ " +
                "\n\"snresult\":{ " +
                "\n}, " +
                "\n\"testresult\":{ " +
                "\n\"psn\":\"" + (string)contents["PSN"] + "\", " +
                "\n\"workordernumber\":\"100000236815\", " +
                "\n\"testStationId\":\"" + StationID + "\", " +
                "\n\"testStationName\":\"" + Station + "\", " +
                "\n\"linename\":\"" + Line + "\", " +
                "\n\"hostname\":\"admin-PC-0930\", " +
                "\n\"testTime\":\"" + string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now) + "\", " +
                "\n\"testModel\":\"S87567GB002_BLK1\", " +
                "\n\"testWorkID\":\"\", " +
                "\n\"Fixture\":\"\", " +
                "\n\"FixtureSN\":\"\", " +
                "\n\"Powersupply\":\"\", " +
                "\n\"PowersupplySN\":\"\", " +
                "\n\"Instrument\":\"\", " +
                "\n\"InstrumentSN\":\"\", " +
                "\n\"Operator\":\"\", " +
                "\n\"testVersion\":\"V1.0.1\" " +
                "\n}, " +
                "\n\"itemresult\":[ " +
                "\n]," +
                "\n\"specialitem\":[ " +
                "\n] " +
                "\n}, " +
                "\n\"state\":\"pass\", " +
                "\n\"errcode\":\"\", " +
                "\n\"errmessage\":\"\"} " +
                "\n}";
            string WI6041 = "{ ";
            WI6041 += "\n\"user\":\"sys\", ";
            WI6041 += "\n\"password\":\"sysuser\", ";
            WI6041 += "\n\"method\":\"MES_BA_WI6041\", ";
            WI6041 += "\n\"servername\":\"London\", ";
            WI6041 += "\n\"methodparameter\":{ ";
            WI6041 += "\n\"content\":{ ";
            WI6041 += "\n\"snresult\":{ ";
            WI6041 += "\n}, ";
            WI6041 += "\n\"testresult\":{ ";
            WI6041 += "\n\"psn\":\"" + PSN + "\", ";
            WI6041 += "\n\"workordernumber\":\"100000236815\", ";
            WI6041 += "\n\"testStationId\":\"" + StationID + "\", ";
            WI6041 += "\n\"testStationName\":\"" + Station + "\", ";
            WI6041 += "\n\"linename\":\"" + Line + "\", ";
            WI6041 += "\n\"hostname\":\"admin-PC-0930\", ";
            WI6041 += "\n\"testTime\":\"" + string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now) + "\", ";
            WI6041 += "\n\"testModel\":\"S87567GB002_BLK1\", ";
            WI6041 += "\n\"testWorkID\":\"\", ";
            WI6041 += "\n\"Fixture\":\"\", ";
            WI6041 += "\n\"FixtureSN\":\"\", ";
            WI6041 += "\n\"Powersupply\":\"\", ";
            WI6041 += "\n\"PowersupplySN\":\"\", ";
            WI6041 += "\n\"Instrument\":\"\", ";
            WI6041 += "\n\"InstrumentSN\":\"\", ";
            WI6041 += "\n\"Operator\":\"\", ";
            WI6041 += "\n\"testVersion\":\"V1.0.1\" ";
            WI6041 += "\n}, ";
            WI6041 += "\n\"itemresult\":[ ";
            WI6041 += "\n],";
            WI6041 += "\n\"specialitem\":[ ";
            WI6041 += "\n] ";
            WI6041 += "\n}, ";
            WI6041 += "\n\"state\":\"pass\", ";
            WI6041 += "\n\"errcode\":\"\", ";
            WI6041 += "\n\"errmessage\":\"\"} ";
            WI6041 += "\n}";
            JObject jo = MES_Interface(WI6041, encryptionKey);
            if (jo["state"].ToString() == "false")
            {
                t = false;
                System_Bll.WriteLogToDB(new Entity.Base_Log
                {
                    CreateUserID = FrmLogin.LoginUserID,
                    CreateUserName = FrmLogin.loginUserName,
                    LocalIP = FrmLogin.LocalIP,
                    LogMessage = "MES接口WI6041数据提交失败",
                    Type = "包装线",
                    LogMessage = "WI6041接口调用失败:" + jo["content"].ToString(),
                    Type = "称重",
                    ClassName = typeof(FrmLogin).ToString()
                });
                string a = string.Format("{0:yyyy-MM-dd HH:mm:ss.fff}", DateTime.Now);
                return false;
            }
            return true;