1

source/AssemblyLineClient/FrmLineStore.cs

@@ -413,6 +413,7 @@ namespace OnlineStore.AssemblyLine
             //{
             //{
             //    lblWarnMsg.Text = "未扫到二维码，请重新放入料盘";
             //    lblWarnMsg.Text = "未扫到二维码，请重新放入料盘";
             //}
             //}
+            lblMoveInfo.Text = LineManager.Line.GetMoveStr();
             if (lblWarnMsg.Text.Equals(""))
             if (lblWarnMsg.Text.Equals(""))
             {
             {
                 lblWarnMsg.Text = TrayManager.TrayErrorMsg;
                 lblWarnMsg.Text = TrayManager.TrayErrorMsg;

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -487,11 +487,11 @@ namespace OnlineStore.DeviceLibrary
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
             if (String.IsNullOrEmpty( posId))
             if (String.IsNullOrEmpty( posId))
             { 
             { 
-                LogUtil.info(Name   + msg);
+                LogUtil.info(Name + "  " + msg);
             }
             }
             else
             else
             { 
             { 
-                LogUtil.info(Name + "[" + posId + "]" + msg);
+                LogUtil.info(Name + "  " + "[" + posId + "]" + msg);
             }
             }
         }
         }
         protected void OutStoreLog(string msg)
         protected void OutStoreLog(string msg)
@@ -499,18 +499,18 @@ namespace OnlineStore.DeviceLibrary
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
             string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
             if (String.IsNullOrEmpty(posId))
             if (String.IsNullOrEmpty(posId))
             {
             {
-                LogUtil.info(Name + msg);
+                LogUtil.info(Name +"  "+ msg);
             }
             }
             else
             else
             {
             {
-                LogUtil.info(Name + "[" + posId + "]" + msg);
+                LogUtil.info(Name + "  " + "[" + posId + "] " + msg);
             }
             }
         }
         }
 
 
         public string GetMoveStr()
         public string GetMoveStr()
         {
         {
             string msg = "";
             string msg = "";
-            int tLength = 12;
+            int tLength = 15;
             msg += "preTrayNum：".PadRight(tLength, ' ') + preTrayNum + "\n";
             msg += "preTrayNum：".PadRight(tLength, ' ') + preTrayNum + "\n";
             msg += "currTrayNum：".PadRight(tLength, ' ') + currTrayNum + "\n";
             msg += "currTrayNum：".PadRight(tLength, ' ') + currTrayNum + "\n";
 
 
@@ -519,7 +519,7 @@ namespace OnlineStore.DeviceLibrary
             msg += "MoveType：".PadRight(tLength, ' ') + MoveInfo.MoveType+"\n";
             msg += "MoveType：".PadRight(tLength, ' ') + MoveInfo.MoveType+"\n";
             msg += "MoveStep：".PadRight(tLength, ' ') + MoveInfo.MoveStep + "\n";
             msg += "MoveStep：".PadRight(tLength, ' ') + MoveInfo.MoveStep + "\n";
             msg += "SMoveType：".PadRight(tLength, ' ') + SecondMoveInfo.MoveType + "\n";
             msg += "SMoveType：".PadRight(tLength, ' ') + SecondMoveInfo.MoveType + "\n";
-            msg += "SMoveType：".PadRight(tLength, ' ') + SecondMoveInfo.MoveStep + "";
+            msg += "SMoveStep：".PadRight(tLength, ' ') + SecondMoveInfo.MoveStep + "";
             return msg;
             return msg;
         }
         }
     }
     }

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -917,6 +917,22 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }
             }
         }
         }
-        
+
+
+        public string GetMoveStr()
+        {
+            string msg = "";
+            int tLength = 20;
+            //msg += "preTrayNum：".PadRight(tLength, ' ') + preTrayNum + "\n";
+            //msg += "currTrayNum：".PadRight(tLength, ' ') + currTrayNum + "\n";
+
+            msg += "runStatus：      "+ runStatus + "\n";
+            msg += "lineStatus：     "+ lineStatus + "\n";
+            msg += "MoveType：    " + MoveInfo.MoveType + "\n";
+            msg += "MoveStep：     " + MoveInfo.MoveStep + "\n";
+            msg += "SW41_Move： "+ SW41_MoveInfo.MoveType + "      "+ SW41_MoveInfo.MoveStep + "\n"; 
+            msg += "SW23_Move： " + SW23_MoveInfo.MoveType + "      " + SW23_MoveInfo.MoveStep + "\n"; 
+            return msg;
+        }
     }
     }
 }
 }
\ No newline at end of file

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -33,6 +33,7 @@ namespace OnlineStore.DeviceLibrary
                 IOManager.IOValue(IO_Type.DriveMotor_Run3, 0).Equals(IO_VALUE.HIGH) &&
                 IOManager.IOValue(IO_Type.DriveMotor_Run3, 0).Equals(IO_VALUE.HIGH) &&
                 IOManager.IOValue(IO_Type.DriveMotor_Run4, 0).Equals(IO_VALUE.HIGH))
                 IOManager.IOValue(IO_Type.DriveMotor_Run4, 0).Equals(IO_VALUE.HIGH))
             {
             {
+                return true;
                 if (isCheckSleep)
                 if (isCheckSleep)
                 {
                 {
                     if (runStatus >= LineRunStatus.Runing && IsSleep.Equals(false))
                     if (runStatus >= LineRunStatus.Runing && IsSleep.Equals(false))

source/DeviceLibrary/assemblymanager/StoreServerManager.cs

@@ -15,17 +15,18 @@ namespace OnlineStore.DeviceLibrary
             string msg = "";
             string msg = "";
             try
             try
             {
             {
-                string codeStr = "";
+                string codeStr = ""; 
+                List<string> list = new List<string>();
                 foreach (string str in codeList)
                 foreach (string str in codeList)
                 {
                 {
-                    if (codeStr.Equals(""))
+                    if (list.Contains(str.Trim()))
                     {
                     {
-                        codeStr = str;
-                    }
-                    else
-                    {
-                        codeStr += spiltStr + str;
+                        continue;
                     }
                     }
+                    list.Add(str.Trim());
+                    //string code = "=1+0x0-" + width + "x" + height + "=" + str.Trim();
+                    string code = width + "x" + height + "%3D" + str.Trim();
+                    codeStr = codeStr + code + spiltStr;
                 }
                 }
                 if (String.IsNullOrEmpty(codeStr))
                 if (String.IsNullOrEmpty(codeStr))
                 {
                 {