Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4b0d141b 由 LN
选项

日志修改

1 个父辈 bd54bfe6
内嵌 并排
正在显示 8 个修改的文件 包含 17 行增加 和 15 行删除
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -311,7 +311,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -311,7 +311,7 @@ namespace OnlineStore.DeviceLibrary
//此处先对托盘号进行验证 //此处先对托盘号进行验证
preTrayNum = currTrayNum; preTrayNum = currTrayNum;
currTrayNum = RFIDManager.GetTrayNum(DeviceID, true); currTrayNum = RFIDManager.GetTrayNum(DeviceID, true);
LogInfo(" 编号【" + trayCount + "】IP【" + RFIDManager.GetRFIP(DeviceID) + "】上个托盘 【" + preTrayNum + "】 当前托盘 【" + currTrayNum + "】"); LogInfo(" [" + trayCount + "] IP [" + RFIDManager.GetRFIP(DeviceID) + "] [" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]");
return true; return true;
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -551,7 +551,7 @@ namespace OnlineStore.DeviceLibrary
lastOkTime = DateTime.Now; lastOkTime = DateTime.Now;
if (IOValue(TargetIoType).Equals(TargetIoValue)) if (IOValue(TargetIoType).Equals(TargetIoValue))
{ {
LogUtil.info(Name + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，可以停止运动"); LogUtil.debug(Name + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，可以停止运动");
BatchAxis.SuddenStop(); BatchAxis.SuddenStop();
BatchAxisStopCheck(); BatchAxisStopCheck();
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -18,7 +18,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,7 +18,7 @@ namespace OnlineStore.DeviceLibrary
//等待信号亮或者走到绝对位置才停止 //等待信号亮或者走到绝对位置才停止
if (IOValue(TargetIoType).Equals(TargetIoValue)) if (IOValue(TargetIoType).Equals(TargetIoValue))
{ {
LogInfo("CheckWaitResult 检测到" + TargetIoType + "=" + TargetIoValue + ",停止运行"); LogUtil.debug(Name+"CheckWaitResult 检测到" + TargetIoType + "=" + TargetIoValue + ",停止运行");
BatchAxis.SuddenStop(); BatchAxis.SuddenStop();
BatchAxisStopCheck(); BatchAxisStopCheck();
return true; return true;
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -360,7 +360,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -360,7 +360,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (isFull.Equals(false)) if (isFull.Equals(false))
{ {
LogInfo(" 托盘号【" + preTrayNum + "】，当前托盘号【(isFull=" + isFull + ")：" + currTrayNum + "】出库中，拦截 托盘~"); LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
return true; return true;
} }
} }
......
source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs
...@@ -57,13 +57,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -57,13 +57,13 @@ namespace OnlineStore.DeviceLibrary
Line3CanRun = true; Line3CanRun = true;
} }
#region 出库处理 #region 出库处理
private string posId = ""; // private string posId = "";
public bool StartOut(InOutParam moveParam) public bool StartOut(InOutParam moveParam)
{ {
if (LineTurnIsStop() && MoveInfo.MoveType.Equals(LineMoveType.None) && (equipBean.runStatus .Equals(LineRunStatus.Runing)|| equipBean.runStatus.Equals(LineRunStatus.Busy))) if (LineTurnIsStop() && MoveInfo.MoveType.Equals(LineMoveType.None) && (equipBean.runStatus .Equals(LineRunStatus.Runing)|| equipBean.runStatus.Equals(LineRunStatus.Busy)))
{ {
MoveInfo.MoveParam = moveParam; //MoveInfo.MoveParam = moveParam;
MoveInfo.NewMove(LineMoveType.OutStore); MoveInfo.NewMove(LineMoveType.OutStore,moveParam);
posId = moveParam.PosId; posId = moveParam.PosId;
MoveInfo.NextMoveStep(LineMoveStep.DLO_01_WaitEntryNoTray); MoveInfo.NextMoveStep(LineMoveStep.DLO_01_WaitEntryNoTray);
LogUtil.info(Name + "开始出料【" + moveParam.ToStr() + "】：" + MoveInfo.SLog + "等待出口无料盘，NG气缸后退"); LogUtil.info(Name + "开始出料【" + moveParam.ToStr() + "】：" + MoveInfo.SLog + "等待出口无料盘，NG气缸后退");
...@@ -81,7 +81,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -81,7 +81,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
string posId = "";
internal void OutStoreProcess() internal void OutStoreProcess()
{ {
if (MoveInfo.IsInWait) if (MoveInfo.IsInWait)
...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
string posId = MoveInfo.MoveParam == null ? "" : MoveInfo.MoveParam.PosId;
if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_01_WaitEntryNoTray)) if (MoveInfo.MoveStep.Equals(LineMoveStep.DLO_01_WaitEntryNoTray))
{ {
if (IsInTurn().Equals(false) && equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.LOW)) if (IsInTurn().Equals(false) && equipBean.IOValue(ExitTray_Check).Equals(IO_VALUE.LOW))
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -197,6 +197,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -197,6 +197,7 @@ namespace OnlineStore.DeviceLibrary
HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap); HalconDotNet.HObject ho_Image = HDCodeHelper.Bitmap2HObjectBpp24(bitmap);
LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码"); LogUtil.debug(" 摄像机【" + cameraName + "】转换图片完成，开始扫码");
List<CodeInfo> cc = new List<CodeInfo>(); List<CodeInfo> cc = new List<CodeInfo>();
string r = "";
foreach (string codeType in codeTypeList) foreach (string codeType in codeTypeList)
{ {
//判断是否是一维码 //判断是否是一维码
...@@ -210,16 +211,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -210,16 +211,17 @@ namespace OnlineStore.DeviceLibrary
} }
//if (cc.Count > 0) //if (cc.Count > 0)
//{ //{
string r = "";
foreach (CodeInfo c in cc) foreach (CodeInfo c in cc)
{ {
codeList.Add(c.CodeStr); codeList.Add(c.CodeStr);
r = r + "##" + c.CodeStr; r = r + "##" + c.CodeStr;
} }
LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r); LogUtil.debug(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
//} //}
} }
LogUtil.info(" [" + cameraName + "] 扫码完成：" + r);
bitmap.Dispose(); bitmap.Dispose();
} }
} }
......
source/DeviceLibrary/model/InOutParam.cs
...@@ -63,8 +63,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -63,8 +63,8 @@ namespace OnlineStore.DeviceLibrary
public string ToStr() public string ToStr()
{ {
return "TrayNumber[" + TrayNumber + "],WareCode[" + WareCode + "],PosId[" + PosId + "],plateW[" + PlateW + "],plateH[" + PlateH + "]，InStoreNg[" + InStoreNg + return " [" + TrayNumber + "] [" + WareCode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]，InStoreNg [" + InStoreNg +
"]urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]"; "],urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
} }
/// <summary> /// <summary>
/// 根据PosId获取对应的料仓ID，若PosId=="",返回-1 /// 根据PosId获取对应的料仓ID，若PosId=="",返回-1
......
source/DeviceLibrary/model/TrayInfo.cs
...@@ -30,11 +30,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,11 +30,11 @@ namespace OnlineStore.DeviceLibrary
if (InOrOutStore.Equals(1)) if (InOrOutStore.Equals(1))
{ {
type = inoutPar.InStoreNg ? "[入料失败：" + ShowMsg + "]" : "入料" + "[" + inoutPar.ToStr() + "]"; type = inoutPar.InStoreNg ? "入料失败：" + ShowMsg + "" : "入料：" + "" + inoutPar.ToStr() + "";
} }
else if (InOrOutStore.Equals(2)) else if (InOrOutStore.Equals(2))
{ {
type = inoutPar.urgentReel ? "[紧急出料][ " + inoutPar.ToStr() + " ]" : "出料[ " + inoutPar.ToStr() + " ]"; type = inoutPar.urgentReel ? "紧急出料：" + inoutPar.ToStr() + "" : "出料：" + inoutPar.ToStr() + " ";
} }
//return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type + //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type +
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!