ModBus类完善，接口SN和资源全部大写

UAS-MES/PublicMethod/ModeBusTCPServer.cs

@@ -16,13 +16,13 @@ namespace UAS_MES.PublicMethod
         byte[] M501_OFF = new byte[] { 0x00, 0x05, 0x11, 0xF5, 0x00, 0x00, 0xD9, 0x15 };
         byte[] M502_ON = new byte[] { 0x00, 0x05, 0x11, 0xF6, 0xFF, 0x00, 0x68, 0xE5 };
         byte[] M502_OFF = new byte[] { 0x00, 0x05, 0x11, 0xF6, 0x00, 0x00, 0x29, 0x15 };
-
+        byte[] M503_READ = new byte[] { 0x00, 0x01, 0x11, 0xF7, 0x00, 0x01, 0x48, 0xD5 };
+        byte[] M503_OFF = new byte[] { 0x00, 0x05, 0x11, 0xF7, 0x00, 0x00, 0x78, 0xD5 };
         private bool isOpen = false;
 
         Thread threadWatch = null; //负责监听客户端的线程
         Socket socketWatch = null; //负责监听客户端的套接字
-        List<Socket> socConnections = new List<Socket>();  //创建一个负责和客户端通信的套接字 
-        List<Thread> dictThread = new List<Thread>();
+        Socket socConnection;
         string ip = "";
         string port = "";
 
@@ -75,17 +75,19 @@ namespace UAS_MES.PublicMethod
 
         private void WatchConnecting()
         {
+            socConnection = socketWatch.Accept();
             while (true)  //持续不断监听客户端发来的请求
             {
-                Socket socConnection = socketWatch.Accept();
-                //创建一个通信线程 
-                ParameterizedThreadStart pts = new ParameterizedThreadStart(ServerRecMsg);
-                Thread thr = new Thread(pts);
-                thr.IsBackground = true;
-                socConnections.Add(socConnection);
-                //启动线程
-                thr.Start(socConnection);
-                dictThread.Add(thr);
+                byte[] data = new byte[1024];
+                socConnection.Receive(data);
+                int length = data[5];
+                byte[] datashow = new byte[length + 6];
+                for (int i = 0; i <= length + 5; i++)
+                {
+                    datashow[i] = data[i];
+                }
+                string stringdata = BitConverter.ToString(datashow);//把数组转换成16进制字符串
+                stringdata = stringdata.Replace("-", "");
             }
         }
 
@@ -96,40 +98,30 @@ namespace UAS_MES.PublicMethod
             isOpen = false;
         }
 
-        private void ServerRecMsg(object obj)
-        {
-            Socket soc = obj as Socket;
-            byte[] data = new byte[1024];
-            soc.Receive(data);
-            int length = data[5];
-            byte[] datashow = new byte[length + 6];
-            for (int i = 0; i <= length + 5; i++)
-                datashow[i] = data[i];
-            string stringdata = BitConverter.ToString(datashow);//把数组转换成16进制字符串
-            Console.WriteLine(stringdata);
-        }
-
         public void SendOrder(string Code)
         {
-            foreach (Socket socConnection in socConnections)
+            switch (Code)
             {
-                switch (Code)
-                {
-                    case "M501_ON":
-                        socConnection.Send(M501_ON);
-                        break;
-                    case "M501_OFF":
-                        socConnection.Send(M501_OFF);
-                        break;
-                    case "M502_ON":
-                        socConnection.Send(M502_ON);
-                        break;
-                    case "M502_OFF":
-                        socConnection.Send(M502_OFF);
-                        break;
-                    default:
-                        break;
-                }
+                case "M501_ON":
+                    socConnection.Send(M501_ON);
+                    break;
+                case "M501_OFF":
+                    socConnection.Send(M501_OFF);
+                    break;
+                case "M502_ON":
+                    socConnection.Send(M502_ON);
+                    break;
+                case "M502_OFF":
+                    socConnection.Send(M502_OFF);
+                    break;
+                case "M503_READ":
+                    socConnection.Send(M503_READ);
+                    break;
+                case "M503_OFF":
+                    socConnection.Send(M503_OFF);
+                    break;
+                default:
+                    break;
             }
         }
     }

UAS_MesInterface(4.0)/MesHelper.cs

@@ -61,6 +61,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("序列号对应工序检测")]
         public bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iResCode = iResCode.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -108,6 +110,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("验证身份信息")]
         public bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage)
         {
+            iResCode = iResCode.ToUpper();
+            iResCode = iResCode.ToUpper();
             oErrMessage = "";
             if (iUserCode == "" || iPassWord == "" || iResCode == "")
             {
@@ -178,6 +182,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("分配MAC和BT信息")]
         public bool GetAddressRangeByMO(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCdoe3, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oWIFI = "";
             oBT = "";
             oCode1 = "";
@@ -227,6 +232,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("分配IMEI和NetCode信息")]
         public bool GetMEIOrNetCodeRange(string iSN, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oIMEI1 = "";
             oIMEI2 = "";
             oMEID = "";
@@ -264,6 +270,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("获取工单软件版本")]
         public bool GetSoftVersion(string iSN, out string oSoftVersion, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             string oMakeCode = "";
             oErrMessage = "";
             GetRcardMOInfo(iSN, out oMakeCode, out oErrMessage);
@@ -281,6 +288,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("获取序列号对应工单信息")]
         public bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
             oMoCode = "";
             if (iSN == "")
@@ -329,6 +337,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("查询已分配的信息")]
         public bool GetMobileAllInfo(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oBT = "";
             oMEID = "";
             oWIFI = "";
@@ -395,6 +404,8 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iUserCode"></param>
         private void InsertMakeProcess(string iSnCode, string iMakeCode, string iSourceCode, string iMPKind, string result, string iUserCode)
         {
+            iSnCode = iSnCode.ToUpper();
+            iSourceCode = iSourceCode.ToUpper();
             string CurrentStep = "";
             string LineCode = "";
             string CurrentStepName = "";
@@ -423,6 +434,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("写入SN的Wifi,BT信息")]
         public bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -442,6 +454,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("序列号跳到下一 步")]
         public bool SetStepFinish(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iErrCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iSourceCode = iSourceCode.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -518,6 +532,9 @@ namespace BenQGuru.eMES.DLLService
         [Description("设置测试结果，结果必须为NG或者OK")]
         public bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperater, string iResult, string iErrCode, string flag, out string oErrorMessage)
         {
+            iTSN = iTSN.ToUpper();
+            iSN = iSN.ToUpper();
+            iSourceCode = iSourceCode.ToUpper();
             oErrorMessage = "";
             if (iTSN == "") { oErrorMessage = "TSN不能为空"; return false; }
             if (iSN == "") { oErrorMessage = "SN不能为空"; return false; }
@@ -533,6 +550,8 @@ namespace BenQGuru.eMES.DLLService
 
         private bool CS_SetFinish(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iSourceCode = iSourceCode.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -569,6 +588,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("设置测试结果")]
         public bool SetTestDetail(string iSN, string iTestResult, string iResCode, string[] iTestDetail, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iResCode = iResCode.ToUpper();
             if (iSN == "" || iSN == null)
             {
                 oErrMessage = "SN不能为空";
@@ -610,6 +631,7 @@ namespace BenQGuru.eMES.DLLService
         [Description("设置IMEI信息")]
         public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -639,6 +661,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("设置测试结果")]
         public bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iResCode = iResCode.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -668,6 +692,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("序列号归属工单")]
         public bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
+            iResCode = iResCode.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";

UAS_MesInterface/MESHelper.cs

@@ -58,6 +58,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -173,6 +174,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool GetAddressRangeByMO(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCdoe3, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oWIFI = "";
             oBT = "";
             oCode1 = "";
@@ -221,6 +223,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool GetMEIOrNetCodeRange(string iSN, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oIMEI1 = "";
             oIMEI2 = "";
             oMEID = "";
@@ -264,6 +267,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
             oMoCode = "";
             if (iSN == "")
@@ -311,6 +315,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool GetMobileAllInfo(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             oBT = "";
             oMEID = "";
             oWIFI = "";
@@ -377,6 +382,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="iUserCode"></param>
         private void InsertMakeProcess(string iSnCode, string iMakeCode, string iSourceCode, string iMPKind, string result, string iUserCode)
         {
+            iSnCode = iSnCode.ToUpper();
             string CurrentStep = "";
             string LineCode = "";
             string CurrentStepName = "";
@@ -404,6 +410,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -422,6 +429,7 @@ namespace BenQGuru.eMES.DLLService
 
         public bool SetStepFinish(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iErrCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -497,6 +505,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperater, string iResult, string iErrCode, string flag, out string oErrorMessage)
         {
+            iSN = iSN.ToUpper();
             oErrorMessage = "";
             if (iTSN == "") { oErrorMessage = "TSN不能为空"; return false; }
             if (iSN == "") { oErrorMessage = "SN不能为空"; return false; }
@@ -512,6 +521,7 @@ namespace BenQGuru.eMES.DLLService
 
         private bool CS_SetFinish(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -547,6 +557,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool SetTestDetail(string iSN, string iTestResult, string iResCode,ref string[] iTestDetail, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "" || iSN == null)
             {
                 oErrMessage = "SN不能为空";
@@ -587,6 +598,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -615,6 +627,7 @@ namespace BenQGuru.eMES.DLLService
         /// <returns></returns>
         public bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
@@ -635,6 +648,7 @@ namespace BenQGuru.eMES.DLLService
 
         public bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage)
         {
+            iSN = iSN.ToUpper();
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";