料串门兼容

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -702,7 +702,7 @@ namespace DeviceLibrary
                 string server = GetAddr(Addr_cancelPutInTask, paramMap);
                 string server = GetAddr(Addr_cancelPutInTask, paramMap);
                 DateTime startTime = DateTime.Now;
                 DateTime startTime = DateTime.Now;
                 string resultStr = HttpHelper.Post(server, "");
                 string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info(deviceName + "cancelPutInTask    " + FormUtil.GetSpanStr(DateTime.Now - startTime) + "  【" + server + "】【" + resultStr + "】");
+                LogUtil.info(deviceName + " cancelPutInTask    " + FormUtil.GetSpanStr(DateTime.Now - startTime) + "  【" + server + "】【" + resultStr + "】");
 
 
                 CanelResultData data = JsonHelper.DeserializeJsonToObject<CanelResultData>(resultStr);
                 CanelResultData data = JsonHelper.DeserializeJsonToObject<CanelResultData>(resultStr);
 
 

DeviceLibrary/theMachine/BoxTransport.cs

@@ -452,14 +452,14 @@ namespace DeviceLibrary
                     break;
                     break;
                 case MoveStep.StoreTS14:
                 case MoveStep.StoreTS14:
                     MoveInfo.NextMoveStep(MoveStep.StoreTS15);
                     MoveInfo.NextMoveStep(MoveStep.StoreTS15);
-                    if (Common.IsInstore(storeMoveType) && !(mainMachine?.StoreMoveInfo?.MoveParam.IsNg ?? false))
-                    {
-                        if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
-                        {
-                            Msg.add(crc.GetString("Res0008", "服务器连接异常"), MsgLevel.warning);
-                            return false;
-                        }
-                    }
+                    //if (Common.IsInstore(storeMoveType) && !(mainMachine?.StoreMoveInfo?.MoveParam.IsNg ?? false))
+                    //{
+                    //    if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
+                    //    {
+                    //        Msg.add(crc.GetString("Res0008", "服务器连接异常"), MsgLevel.warning);
+                    //        return false;
+                    //    }
+                    //}
                     InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed);
                     InOut_Axis.AbsMove(MoveInfo, Config.InOut_P1, Config.InOut_P1_speed);
                     MoveInfo.log($"{storeMoveType}:进出轴去待机点P1[{Config.InOut_P1}]");
                     MoveInfo.log($"{storeMoveType}:进出轴去待机点P1[{Config.InOut_P1}]");
                     break;
                     break;

DeviceLibrary/theMachine/MainMachine.cs

@@ -707,7 +707,7 @@ namespace DeviceLibrary
                 AxisBean.StopMultiAxis(AxisBean.List);
                 AxisBean.StopMultiAxis(AxisBean.List);
                 MoveInfo.List.ForEach((m) => { m.CanWhileCount = 5; });
                 MoveInfo.List.ForEach((m) => { m.CanWhileCount = 5; });
                 SafetyDevice.PauseAll();
                 SafetyDevice.PauseAll();
-                StringDoor.Pause();
+                StringDoor?.Pause();
 
 
                 if (runStatus == RunStatus.HomeReset)
                 if (runStatus == RunStatus.HomeReset)
                 {
                 {
@@ -722,7 +722,7 @@ namespace DeviceLibrary
             {
             {
                 AxisBean axis = StringDoor.axisBean;
                 AxisBean axis = StringDoor.axisBean;
                 AxisBean.StopMultiAxis(new List<AxisBean> { axis });
                 AxisBean.StopMultiAxis(new List<AxisBean> { axis });
-                StringDoor.Pause();
+                StringDoor?.Pause();
 
 
                 if (runStatus == RunStatus.HomeReset)
                 if (runStatus == RunStatus.HomeReset)
                 {
                 {