1

Common/util/HumitureController.cs

@@ -313,6 +313,8 @@ namespace OnlineStore.Common
                     string hum = String.Format("{0:X2}", dataArray[5]) + String.Format("{0:X2}", dataArray[6]);
                     string hum = String.Format("{0:X2}", dataArray[5]) + String.Format("{0:X2}", dataArray[6]);
                     double tempV = (double)Convert.ToInt32(temp, 16)/10;
                     double tempV = (double)Convert.ToInt32(temp, 16)/10;
                     double humV =(double) Convert.ToInt32(hum, 16)/10;
                     double humV =(double) Convert.ToInt32(hum, 16)/10;
+                    if (humV < 0.1)
+                        humV = 0.1;
                     list.Add(tempV);
                     list.Add(tempV);
                     list.Add(humV);
                     list.Add(humV);
                 }
                 }

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -172,7 +172,7 @@ namespace DeviceLibrary
                         StringMoveInfo.NextMoveStep(MoveStep.StringLoad_04);
                         StringMoveInfo.NextMoveStep(MoveStep.StringLoad_04);
                         StringMoveInfo.log($"批量轴到顶部检测点");
                         StringMoveInfo.log($"批量轴到顶部检测点");
                         //CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
                         //CylinderMove(StringMoveInfo, IO_Type.StringDoor_Close, IO_Type.StringDoor_Open, IO_VALUE.LOW);
-                        BatchAxisToP2(StringMoveInfo);
+                        BatchAxisToP2(StringMoveInfo, StringState == StringStateE.OutStore);
                         StringMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg(crc.GetString("Res0009","料串正在上升"), MsgLevel.warning));
                         StringMoveInfo.WaitList.Add(WaitResultInfo.WaitMsg(crc.GetString("Res0009","料串正在上升"), MsgLevel.warning));
                     }
                     }
                     else if (StringMoveInfo.IsTimeOut(10))
                     else if (StringMoveInfo.IsTimeOut(10))
@@ -340,7 +340,7 @@ namespace DeviceLibrary
                 case MoveStep.StringReelPut_02:
                 case MoveStep.StringReelPut_02:
                     StringMoveInfo.NextMoveStep(MoveStep.StringLoad_04b);
                     StringMoveInfo.NextMoveStep(MoveStep.StringLoad_04b);
                     StringMoveInfo.log($"批量轴到顶部检测点");
                     StringMoveInfo.log($"批量轴到顶部检测点");
-                    BatchAxisToP2(StringMoveInfo);
+                    BatchAxisToP2(StringMoveInfo,true);
                     break;
                     break;
                 case MoveStep.StringReelPut_03:
                 case MoveStep.StringReelPut_03:
                     StringMoveInfo.NextMoveStep(MoveStep.StringReelPut_04);
                     StringMoveInfo.NextMoveStep(MoveStep.StringReelPut_04);