日志修改

RC1266-AutoCountMachine/source/Common/util/LogUtil.cs

@@ -12,7 +12,7 @@ namespace OnlineStore.Common
 {
 {
     public class LogUtil
     public class LogUtil
     {
     {
-        public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOXLog");
+        public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOX");
         private static LogUtil instance = new LogUtil();
         private static LogUtil instance = new LogUtil();
         public delegate void ShowLog(string msg, Color color);
         public delegate void ShowLog(string msg, Color color);
         public static readonly ILog LOGGER = LogManager.GetLogger("RollingLogFileAppender");
         public static readonly ILog LOGGER = LogManager.GetLogger("RollingLogFileAppender");

RC1266-AutoCountMachine/source/DeviceLibrary/model/WorkParam.cs

@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
     /// </summary> 
     /// </summary> 
     public class WorkParam
     public class WorkParam
     {
     {
-        public WorkParam(int inPosType = 1, int tPosType = 0, string barcode = "", int plateH = 0, int plateW = 0, bool test = false )
+        public WorkParam(int inPosType = 1, int tPosType = 0, string barcode = "", int plateH = 0, int plateW = 0, bool test = false)
         {
         {
             this.InPosType = inPosType;
             this.InPosType = inPosType;
             this.TargetPosType = tPosType;
             this.TargetPosType = tPosType;
@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 tP = "电阻测值";
                 tP = "电阻测值";
             }
             }
-            return "  [" + WareCode + "] " + "[" + PlateW + " X " + PlateH + "] " + "[" + (InPosType.Equals(1) ? "左侧入口" : "右侧入口") + "-->" + tP+ "]";
+            return "  [" + WareCode + "] " + "[" + PlateW + " X " + PlateH + "] " + "[" + (InPosType.Equals(1) ? "左侧入口" : "右侧入口") + "-->" + tP + "]";
         }
         }
         public string OutStr()
         public string OutStr()
         {
         {
@@ -150,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
     public class ReelInfo
     public class ReelInfo
     {
     {
 
 
-        public ReelInfo(string code = "", int plateW = 0, int plateH = 0,int count=0,bool IsNg=false,string msg="")
+        public ReelInfo(string code = "", int plateW = 0, int plateH = 0, int count = 0, bool IsNg = false, string msg = "")
         {
         {
             this.WareCode = code;
             this.WareCode = code;
             this.PlateH = plateH;
             this.PlateH = plateH;
@@ -183,7 +183,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         public string ToStr()
         public string ToStr()
         {
         {
-            return "[" + WareCode + "] [" + PlateW + "X" + PlateH + "] [数量：" + WareCount+"]"+(IsNgReel?"[NG料："+NgMsg+"]":"")+"";
+            return "[" + WareCode + "] [" + PlateW + "X" + PlateH + "] [数量：" + WareCount + "]" + (IsNgReel ? "[NG料：" + NgMsg + "]" : "") + "";
 
 
         }
         }
         public ReelInfo GetReelInfo()
         public ReelInfo GetReelInfo()
@@ -202,15 +202,15 @@ namespace OnlineStore.DeviceLibrary
             if (codeArray.Length == 2)
             if (codeArray.Length == 2)
             {
             {
                 string pnStr = codeArray[0];
                 string pnStr = codeArray[0];
-                if (pnStr.Length > 3)
+                if (pnStr.Length >= 5)
                 {
                 {
-                    pn = pnStr.Substring(pnStr.Length - 3, 3);
+                    pn = pnStr.Substring(0, 2) + pnStr.Substring(pnStr.Length - 3, 3);
                 }
                 }
                 else
                 else
                 {
                 {
                     pn = pnStr;
                     pn = pnStr;
                 }
                 }
-                reald= codeArray[1];
+                reald = codeArray[1];
             }
             }
             return pn + "-" + reald + timeName;
             return pn + "-" + reald + timeName;
         }
         }