1

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -841,7 +841,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             string msg = "";
             string msg = "";
             int tLength = 15;
             int tLength = 15;
-            msg += "料架：" +  CurrShelfId + "\r\n";
+            msg += "料架：" +  CurrShelfId +"_"+ LastOutParam.rfid+ "\r\n";
            msg += "上个托盘：" + preTrayNum + "\n";
            msg += "上个托盘：" + preTrayNum + "\n";
             msg += "当前托盘：" + currTrayNum + "\n";
             msg += "当前托盘：" + currTrayNum + "\n";
             msg += "runS：  " + runStatus + "\n";
             msg += "runS：  " + runStatus + "\n";
@@ -851,6 +851,7 @@ namespace OnlineStore.DeviceLibrary
             msg += "MoveS ：" + MoveInfo.SLog + "\n";
             msg += "MoveS ：" + MoveInfo.SLog + "\n";
             msg += "SMoveT：" + SecondMoveInfo.MoveType + "\n";
             msg += "SMoveT：" + SecondMoveInfo.MoveType + "\n";
             msg += "SMoveS：" + SecondMoveInfo.MoveStep + "\n";
             msg += "SMoveS：" + SecondMoveInfo.MoveStep + "\n";
+        
           //  msg += "" + LastWidth + "X" + LastHeight + "="+ lastcode + "";
           //  msg += "" + LastWidth + "X" + LastHeight + "="+ lastcode + "";
             return msg;
             return msg;
         }
         }

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -602,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FO_221_UpdownAxisToP1);
                 MoveInfo.NextMoveStep(LineMoveStep.FO_221_UpdownAxisToP1);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
-                OutLog(outType + MoveInfo.SLog + "：移栽伺服上升到待机点P1，通知服务器PutShelfFinished");
+                OutLog(outType + MoveInfo.SLog + "：移栽伺服上升到待机点P1，通知服务器 afterPutCut");
                 UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
                 UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
                 Task.Factory.StartNew(delegate
                 Task.Factory.StartNew(delegate
                 {
                 {