Commit 13461821 刘韬

1

1 个父辈 e859fb7b
......@@ -199,13 +199,13 @@ namespace DeviceLibrary
break;
case MoveStep.StoreTS09:
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
DoorControl.Invoke(false);
if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture, Config).Equals(IO_VALUE.LOW))
{
Msg.add(string.Format(crc.GetString("Res0125", "出库时料叉{0}没有检测到物料无法继续,请检查."), Config.DIList[IO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
}
else
{
DoorControl.Invoke(false);
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
if (To.posid == BoxStorePosition.ngdoor && Setting_Init.Device_Use_Fixpos
......
......@@ -125,7 +125,7 @@ namespace DeviceLibrary
private void ServerCM_OutStoreEvent(JobInfo jobInfo)
{
AddOutStoreTask(jobInfo.WareNum, jobInfo.PosId, jobInfo.plateW, jobInfo.plateH);
AddOutStoreTask(jobInfo.WareNum, jobInfo.PosId, jobInfo.plateW, jobInfo.plateH, jobInfo.isNG, jobInfo.NgMsg);
}
private bool ServerCM_InStoreEvent1(JobInfo jobInfo, bool ng, string msg)
......
......@@ -26,9 +26,11 @@ namespace DeviceLibrary
StoreJobList OutStoreJobList = new StoreJobList("");
public void AddOutStoreTask(string warecode, string posId, int plateW, int plateH)
public void AddOutStoreTask(string warecode, string posId, int plateW, int plateH,bool isNG,string ngMsg)
{
JobInfo jobInfo = new JobInfo(warecode, posId, plateW, plateH);
jobInfo.isNG = isNG;
jobInfo.NgMsg= ngMsg;
OutStoreJobList.Enqueue(jobInfo);
LogUtil.info($"添加出库任务队列: {posId},当前任务数量: {OutStoreJobList.Count}");
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!