Skip to content

张东亮 / DoubleLineClient_3D

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a94baefa 由 张东亮
选项

1227

1 个父辈 3186e992
内嵌 并排
正在显示 5 个修改的文件 包含 19 行增加 和 38 行删除
source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs
...@@ -333,7 +333,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -333,7 +333,7 @@ namespace OnlineStore.DeviceLibrary
{ {
S1_LeftShelfId = ""; S1_LeftShelfId = "";
SOneMoveInfo.NextMoveStep(MoveStep.S1_C07_ToS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_C07_ToS1);
S1Log(" S1正阻挡上升，其他组的下降，下层线体停止，S1正转， 等待料架到达S1"); S1Log(" S1正阻挡上升，其他阻挡下降，下层线体停止，S1正转， 等待料架到达S1");
SOneMoveInfo.TimeOutSeconds = 15; SOneMoveInfo.TimeOutSeconds = 15;
S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH); S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH);
...@@ -925,7 +925,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -925,7 +925,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW)); //SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
...@@ -947,11 +947,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -947,11 +947,11 @@ namespace OnlineStore.DeviceLibrary
{ {
S2CanGetShelf = false; S2CanGetShelf = false;
} }
CylinderMove(null, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.LOW)); //SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.LOW));
} }
private void Start_S1ShelfToRight(MoveStep nextStep, string movetype, bool ShelfIsCanGo = false) private void Start_S1ShelfToRight(MoveStep nextStep, string movetype, bool ShelfIsCanGo = false)
...@@ -969,9 +969,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -969,9 +969,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
S1LineRun(); S1LineRun();
//S2LineRun();
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
} }
private void Start_LeftShelfToS1(MoveStep nextStep, string movetype) private void Start_LeftShelfToS1(MoveStep nextStep, string movetype)
......
source/DeviceLibrary/manager/HttpServer.cs
...@@ -397,7 +397,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -397,7 +397,7 @@ namespace OnlineStore.DeviceLibrary
public string ToStr() public string ToStr()
{ {
return " " + rfid + "剩余位置： 小料=" + smallEmpty + "，大料=" + bigEmpty + "，包装料=" + packageEmpty + "，已使用料架=" + usedRfidList + " "; return " " + rfid + "剩余位置： 小料=" + smallEmpty + "，大料=" + bigEmpty + "，已使用料架=" + usedRfidList + " ";//"，包装料=" + packageEmpty +
} }
} }
public class AllTaskInfo public class AllTaskInfo
...@@ -407,7 +407,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -407,7 +407,7 @@ namespace OnlineStore.DeviceLibrary
public int packageTask = -1; public int packageTask = -1;
public string ToStr() public string ToStr()
{ {
return " 剩余任务： 小料=" + smallTask + "，大料=" + bigTask + "，包装料=" + packageTask + " "; return " 剩余任务： 小料=" + smallTask + "，大料=" + bigTask + " ";//+ "，包装料=" + packageTask
} }
public bool IsValid() public bool IsValid()
{ {
......
source/DeviceLibrary/packageLine/PackageLine_S1RightMove.cs
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -27,25 +28,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,25 +28,29 @@ namespace OnlineStore.DeviceLibrary
public StepInfo<S1_R_LEAVE_SHELF_STEP> s1RLeaveStep = new StepInfo<S1_R_LEAVE_SHELF_STEP>(S1_R_LEAVE_SHELF_STEP.NONE); public StepInfo<S1_R_LEAVE_SHELF_STEP> s1RLeaveStep = new StepInfo<S1_R_LEAVE_SHELF_STEP>(S1_R_LEAVE_SHELF_STEP.NONE);
private Stopwatch stopwatch = new Stopwatch();
private void S1_R_CanMoveProcess() private void S1_R_CanMoveProcess()
{ {
if (s1RLeaveStep.IsStep(S1_R_LEAVE_SHELF_STEP.NONE)) if (s1RLeaveStep.IsStep(S1_R_LEAVE_SHELF_STEP.NONE))
{ {
bool hasWaitShelf = IOValue(IO_Type.AftS1_StopCheck).Equals(IO_VALUE.HIGH); bool hasWaitShelf = IOValue(IO_Type.AftS1_StopCheck).Equals(IO_VALUE.HIGH);
//有等待的料架 //有等待的料架
if (hasWaitShelf) if (hasWaitShelf)//&& LineManager.checkWatch(stopwatch,5000)
{ {
//验证料架是否可用 //验证料架是否可用
if (LineManager.Line.S2CanGetShelf) if (LineManager.Line.S2CanGetShelf && LineManager.checkWatch(stopwatch, 5000))
{ {
s1RLeaveStep.Msg = "S1工位右侧发现料架,AftS1_StopCylinder(2秒),打开S1工位链条, 将其送出"; s1RLeaveStep.Msg = "S1工位右侧发现料架,AftS1_StopCylinder(2秒),打开S1工位链条, 将其送出";
s1RLeaveStep.ToNextStep(S1_R_LEAVE_SHELF_STEP.WAIT_LEAVE); s1RLeaveStep.ToNextStep(S1_R_LEAVE_SHELF_STEP.WAIT_LEAVE);
CheckAndMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
IOMove(IO_Type.AftS1_StopCylinder, IO_VALUE.HIGH, 2000); IOMove(IO_Type.AftS1_StopCylinder, IO_VALUE.HIGH, 3000);
s1RLeaveStep.AddIoWait(IO_Type.AftS1_StopCheck,IO_VALUE.LOW,1000); s1RLeaveStep.AddIoWait(IO_Type.AftS1_StopCheck,IO_VALUE.LOW,1000);
} }
} }
else
{
stopwatch.Stop();
}
} }
else if(s1RLeaveStep.IsStep(S1_R_LEAVE_SHELF_STEP.WAIT_LEAVE)) else if(s1RLeaveStep.IsStep(S1_R_LEAVE_SHELF_STEP.WAIT_LEAVE))
{ {
...@@ -81,28 +86,3 @@ namespace OnlineStore.DeviceLibrary ...@@ -81,28 +86,3 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
\ No newline at end of file \ No newline at end of file
// if (s2StationStep.IsFinished())
// {
// if (outShelfStep.IsStep(SHELF_TO_LEAVE_STATION.WAIT_OUT_IO))
// {
// //上一个料架流出未完成
// s2StationStep.Msg = "料架流出工位2完成,但上一个料架未到出口";
// }
// else
// {
// s2StationStep.Msg = "工位2放行料架完成,停止工位2线体";
// s2StationStep.ToNextStep(S2_STATION_STEP.NONE);
// IOMove(IO_Type.S2_LineRun, IO_VALUE.LOW);
// //右侧下方线体是否停止，要根据情况来
// outShelfStep.ToNextStep(SHELF_TO_LEAVE_STATION.SHELF_OUT_S2);
// }
// }
// else
// {
// KeepLineRun(IO_Type.R_LineRun);
// if (s2StationStep.IsTimeOut(15000))
// {
// s2StationStep.Msg = "工位2放行料架15秒仍未完成，重新放行";
// s2StationStep.ToNextStep(S2_STATION_STEP.OUT_SHELF);
// }
// }
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/packageLine/PackageLine_S2Station.cs
...@@ -379,7 +379,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -379,7 +379,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (outShelfStep.IsFinished()) if (outShelfStep.IsFinished())
{ {
outShelfStep.Msg = "料架流出工位2完成，停止下层线体"; outShelfStep.Msg = "料架流出工位1完成，停止下层线体";
IOMove(IO_Type.R_LineRun, IO_VALUE.LOW); IOMove(IO_Type.R_LineRun, IO_VALUE.LOW);
outShelfStep.ToNextStep(SHELF_TO_LEAVE_STATION.NONE); outShelfStep.ToNextStep(SHELF_TO_LEAVE_STATION.NONE);
} }
......
source/DoubleLineClient_3D/App.config
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<file type="log4net.Util.PatternString" value="logs/DoubleLine.log" /> <file type="log4net.Util.PatternString" value="logs/DoubleLine.log" />
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8" />
<appendToFile value="true" /> <appendToFile value="true" />
<param name="MaxSizeRollBackups" value="60"/>
<rollingStyle value="Date" /> <rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" /> <datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender"> <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID-dbline.log"/> <file value="logs/TheRFID-dbline.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8" />
<param name="MaxSizeRollBackups" value="10"/>
<appendToFile value="true"/> <appendToFile value="true"/>
<rollingStyle value="Date"/> <rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/> <datePattern value="yyyy-MM-dd"/>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!