Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0399105c 由 刘韬
选项

1

1 个父辈 413b0ee4
内嵌 并排
正在显示 4 个修改的文件 包含 40 行增加 和 18 行删除
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 9271efd95f69f82cbe1d3a623766be8cb61e7974")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 413b0ee4261e11a49b88fd1c49b2cd7507d75209")]
[assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -562,7 +562,7 @@ namespace OnlineStore.DeviceLibrary
ComMoveToPosition(Config.CompressAxis_P1_Position, Config.CompAxis_P1_Speed);
break;
case StoreMoveStep.BOX_H_OtherAxisBack_03:
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_04);
LogUtil.info(LOGGER, StoreName + " 舱门口无盘, 执行往舱门口放盘");
......@@ -582,7 +582,7 @@ namespace OnlineStore.DeviceLibrary
OpenDoor();
break;
case StoreMoveStep.BOX_H_OtherAxisBack_05:
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_06);
LogUtil.info(LOGGER, StoreName + " 进出轴到p2");
......@@ -1216,7 +1216,7 @@ namespace OnlineStore.DeviceLibrary
//判断是否需要出入库
if (StoreMove.MoveType.Equals(StoreMoveType.None) && alarmType.Equals(StoreAlarmType.None))
{
IO_VALUE checkIO = IOManager.IOValue(IO_Type.TrayCheck_Door);
IO_VALUE checkIO = TrayCheck_Door;
var IsServerAccess = CodeManager.IsServerAccess();
int height = GetHeight();
......@@ -1548,7 +1548,7 @@ namespace OnlineStore.DeviceLibrary
//发送扫码内容到服务器进行入库操作
Operation operationT = getLineBoxStatus();
operationT.op = 1;
int dInfo = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int dInfo = (int)TrayCheck_Door;
operationT.data = new Dictionary<string, string>() { { "code", message }, { "boxId", StoreID.ToString() }, { ParamDefine.doorReelSignal, dInfo.ToString() } };
HttpHelper.Post(StoreManager.GetPostApi(server), operationT, false);
}
......@@ -1573,7 +1573,7 @@ namespace OnlineStore.DeviceLibrary
//发送扫码内容到服务器进行入库操作
Operation operation = getLineBoxStatus();
operation.op = 1;
int doorReelSignal = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int doorReelSignal = (int)TrayCheck_Door;
operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", StoreID.ToString() }, { ParamDefine.doorReelSignal, doorReelSignal.ToString() } };
// string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
......@@ -1815,7 +1815,7 @@ namespace OnlineStore.DeviceLibrary
return 0;
}
int result = 0;
if (Config.Default_TrayWidth.Equals(Width_7).Equals(false)&&IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (Config.Default_TrayWidth.Equals(Width_7).Equals(false) && TrayCheck_Door.Equals(IO_VALUE.LOW))
{
return result;
}
......@@ -1841,13 +1841,13 @@ namespace OnlineStore.DeviceLibrary
return 0;
}
int result = 0;
if (Config.Default_TrayWidth.Equals(size).Equals(false) && IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (Config.Default_TrayWidth.Equals(size).Equals(false) && TrayCheck_Door.Equals(IO_VALUE.LOW))
{
return result;
}
double Value;
double ai3Value = ConvertAI(IOManager.GetADIOValue(Config.AIDI3_Addr), Config.AIDI3_DefaultPosition);
double ai4Value = ConvertAI(IOManager.GetADIOValue(Config.AIDI4_Addr), Config.AIDI4_DefaultPosition);
double ai3Value = ConvertAI(GetADIO(3), Config.AIDI3_DefaultPosition);
double ai4Value = ConvertAI(GetADIO(4), Config.AIDI4_DefaultPosition);
if (size == 13)
{
Value = Math.Round(ai3Value, 1);
......@@ -1953,14 +1953,14 @@ namespace OnlineStore.DeviceLibrary
IsInBlowing = IOManager.IOValue(IO_Type.StartOrStopBlow).Equals(IO_VALUE.HIGH);
if (DoorOpenAirBlow == 1)
{
if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) || IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) || TrayCheck_Door.Equals(IO_VALUE.HIGH))
{
IOManager.IOMove(IO_Type.StartOrStopBlow, IO_VALUE.HIGH);
doorAndTrayLastrunTime = DateTime.Now;
//IsInBlowing = true;
return;
}
if (!IsInBlowing && doorAndTrayLastrunTime != new DateTime(1997, 1, 1) && IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (!IsInBlowing && doorAndTrayLastrunTime != new DateTime(1997, 1, 1) && IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.HIGH) && TrayCheck_Door.Equals(IO_VALUE.LOW))
{
if ((DateTime.Now - doorAndTrayLastrunTime).TotalSeconds > 2)
{
......@@ -2244,7 +2244,7 @@ namespace OnlineStore.DeviceLibrary
{
lineOperation.alarmList.Add(alarmInfo);
}
int doorReelSignal = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int doorReelSignal = (int)TrayCheck_Door;
lineOperation.data = new Dictionary<string, string> { { ParamDefine.doorReelSignal, doorReelSignal.ToString() } };
return lineOperation;
}
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_ADIO.cs
using System;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
......@@ -26,5 +27,17 @@ namespace OnlineStore.DeviceLibrary
return -1;
}
}
IO_VALUE TrayCheck_Door
{
get
{
if (Ultrasonic1.IsRunning)
return Ultrasonic1.Distance > 5 ? IO_VALUE.HIGH : IO_VALUE.LOW;
else
return IOManager.IOValue(IO_Type.TrayCheck_Door);
}
}
}
}
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
wait.IsEnd = (wait.HeightValue.Equals(GetHeight()));
if (wait.IsEnd && (StoreMove.MoveStep == StoreMoveStep.SO_15_WaitTake) && wait.HeightValue.Equals(0))
{
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
LogUtil.info(StoreMove.MoveStep + " 等待height=" + wait.HeightValue + "完成，且当前TrayCheck_Door=LOW");
}
......@@ -281,7 +281,7 @@ namespace OnlineStore.DeviceLibrary
//料盘检测
InStoreLog(" 入库：SI_00 检测料盘信号");
StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
//StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
}
else
{
......@@ -344,6 +344,15 @@ namespace OnlineStore.DeviceLibrary
}
if (StoreMove.MoveStep == StoreMoveStep.SI_00_TrayCheck)
{
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
if (StoreMove.IsTimeOut(out _, 20))
{
SetWarnMsg(ResourceControl.CustAlarm, "Wait TrayCheck_Door=HIGH Timeout");
}
return;
}
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{
SI_02_OpenDoor(moveP);
......@@ -395,7 +404,7 @@ namespace OnlineStore.DeviceLibrary
{
NeedCheckSafetyLight = 0;
HIKCamera.Current.CameraGrabOne(HIKCamera.Current.GetFixtureStateFilename(StoreMove.MoveParam, StoreMove.MoveType, FixtureState.DoorIn));
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
InStoreLog("入库：SI_06 未检测到料盘,任务取消 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray);
......@@ -820,7 +829,7 @@ namespace OnlineStore.DeviceLibrary
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = posId;
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
if (TrayCheck_Door.Equals(IO_VALUE.HIGH))
{
StoreMove.NextMoveStep(StoreMoveStep.SO_13_CheckTray);
OutStoreLog($"出库：检测到料盘 SO_13 等待TrayCheck_Fixture= LOW && TrayCheck_Door=high");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!