Merge branch 'master' of http://1.13.177.47:3000/liuwf/JHRL.WCS

SlnMesnac.WCS/WCS/CreateTaskByRecord.cs

@@ -85,7 +85,7 @@ namespace SlnMesnac.WCS.WCS
                         string rfidS = workShop3Plc.readStringByAddress(StaticData.GetPlcAddress("3#四宫格下料点RFID号"), 12).Replace("\0", "");
                         int amount = workShop3Plc.readInt16ByAddress(StaticData.GetPlcAddress("3#四宫格下料点数量"));
 
-                        if (getBigFlag && machineCodeS != "0" && rfidS.Contains("SH"))
+                        if (getBigFlag && machineCodeS != "0" && rfidS.Contains("SHS"))
                         {
                             CreatDeliverWorkShop3Task(machineCodeS, rfidS, amount);
                         }
@@ -99,7 +99,7 @@ namespace SlnMesnac.WCS.WCS
                         string machineCodeX = workShop3Plc.readInt16ByAddress(StaticData.GetPlcAddress("3#小料箱下料点机台号")).ToString();
                         string rfidX = workShop3Plc.readStringByAddress(StaticData.GetPlcAddress("3#小料箱下料点RFID号"), 12).Replace("\0", "");
 
-                        if (getSmallFlag && machineCodeX != "0" && rfidX.Contains("SH"))
+                        if (getSmallFlag && machineCodeX != "0" && rfidX.Contains("SHX"))
                         {
                             if (machineCodeX == "1")
                             {