Skip to content

孙克 / RC1250-ACPackingStore

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

1

1 个父辈 5229fc72
内嵌 并排
正在显示 7 个修改的文件 包含 39 行增加 和 20 行删除
source/ACPackingStore/FrmBox.Designer.cs
此文件的差异太大，无法显示。
source/Common/Setting_Init.cs
...@@ -94,6 +94,6 @@ namespace OnlineStore.Common ...@@ -94,6 +94,6 @@ namespace OnlineStore.Common
[MyConfigComment("是否检测到料架自动入库")] [MyConfigComment("是否检测到料架自动入库")]
public static MyConfig<bool> AutoShelfInstore = true; public static MyConfig<bool> AutoShelfInstore = true;
[MyConfigComment("是否启用入料口移门")] [MyConfigComment("是否启用入料口移门")]
public static MyConfig<bool> UseDoor = true; public static MyConfig<bool> UseDoor = false;
} }
} }
source/DeviceLibrary/PackingStore/AC_BOX_Bean.cs
...@@ -885,10 +885,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -885,10 +885,8 @@ namespace OnlineStore.DeviceLibrary
{ {
string msg = ""; string msg = "";
msg += "状态： " + storeRunStatus + " " + storeStatus + "\n"; msg += "状态： " + storeRunStatus + " " + storeStatus + "\n";
// msg += "lineS： " + storeStatus + "\n";
msg += "报警： " + alarmType + "\n"; msg += "报警： " + alarmType + "\n";
msg += MoveInfo.MoveType + " " + MoveInfo.SLog + "\n"; msg += MoveInfo.MoveType + " " + MoveInfo.SLog + "\n";
// msg += "MoveS： " + MoveInfo.SLog + "\n";
msg += "料架： " + CurrShelfID + " " + LastOutParam.rfid + "\n"; msg += "料架： " + CurrShelfID + " " + LastOutParam.rfid + "\n";
msg += Config.AgvNodeName + "：" + AgvClient.GetAction(Config.AgvNodeName); msg += Config.AgvNodeName + "：" + AgvClient.GetAction(Config.AgvNodeName);
return msg; return msg;
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_InStore.cs
...@@ -334,13 +334,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -334,13 +334,13 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_ScanCode)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_ScanCode))
{ {
if (LastScanCodes.Count <= 0 && LastWidth.Equals(0) && LastHeight.Equals(8)) //if (LastScanCodes.Count <= 0 && LastWidth.Equals(0) && LastHeight.Equals(8))
{ //{
storeStatus = StoreStatus.InStoreExecute; // storeStatus = StoreStatus.InStoreExecute;
MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray); // MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
InOutStoreLog("扫码，扫码失败，尺寸" + LastWidth + "*" + LastHeight + "，认为没拿到料盘，继续循环料架取料盘"); // InOutStoreLog("扫码，扫码失败，尺寸" + LastWidth + "*" + LastHeight + "，认为没拿到料盘，继续循环料架取料盘");
} //}
else //else
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2); MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2);
InOutStoreLog("扫码，进出轴到P2"); InOutStoreLog("扫码，进出轴到P2");
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_OutStore.cs
...@@ -197,6 +197,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -197,6 +197,7 @@ namespace OnlineStore.DeviceLibrary
//恢复当前需要出库的位置 //恢复当前需要出库的位置
MoveInfo.MoveParam.RestoreShelfPosId(); MoveInfo.MoveParam.RestoreShelfPosId();
SO_03_ToBagPosition(); SO_03_ToBagPosition();
return;
} }
} }
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_PreCheck_02_InoutToP1)) else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_PreCheck_02_InoutToP1))
...@@ -414,10 +415,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -414,10 +415,25 @@ namespace OnlineStore.DeviceLibrary
// if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid)) // if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid))
if (MoveInfo.MoveParam.rfid.Equals(LastRfidID)) if (MoveInfo.MoveParam.rfid.Equals(LastRfidID))
{ {
if(MoveInfo.MoveParam.cutReel || MoveInfo.MoveParam.urgentReel)
{
//重新记录
LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，紧急料或者分盘料只放一个位置，送出当前料架，稍后重新出库");
waitOutStoreList.Enqueue(MoveInfo.MoveParam);
// MoveInfo.MoveParam.rfid = LastRfidID;
MoveInfo.NewMove(StoreMoveType.OutStore, LastOutParam);
//送出料架，并且记录出库信息，等会重新出库
StartShelfOut();
return;
}
else
{
LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料"); LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料");
SO_03_ToBagPosition(); SO_03_ToBagPosition();
return; return;
} }
}
else else
{ {
//重新记录 //重新记录
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_Partial.cs
...@@ -57,13 +57,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -57,13 +57,13 @@ namespace OnlineStore.DeviceLibrary
//如果料架号是空，需要送到VMI线 //如果料架号是空，需要送到VMI线
if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore)) if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
{ {
if (CurrShelfID.EndsWith("00")) if (CurrShelfID.EndsWith("00")|| string.IsNullOrEmpty(CurrShelfID))
{ {
mark = defualtMark; mark = defualtMark;
} }
else if(isNGShelf()) else if(isNGShelf())
{ {
mark = MoveInfo.MoveParam.rfid + ",ng"; mark = defualtMark; ;
} }
//包装料会发往分盘区, 紧急料区, 包装线区 //包装料会发往分盘区, 紧急料区, 包装线区
// urgentReel 这个为true是紧急料 出到紧急料区 // urgentReel 这个为true是紧急料 出到紧急料区
...@@ -85,9 +85,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,9 +85,14 @@ namespace OnlineStore.DeviceLibrary
mark = MoveInfo.MoveParam.rfid + ",pack"; mark = MoveInfo.MoveParam.rfid + ",pack";
} }
} }
else if (MoveInfo.MoveType.Equals(StoreMoveType.InStore) && isNGShelf()) else if (MoveInfo.MoveType.Equals(StoreMoveType.InStore))
{ {
mark = MoveInfo.MoveParam.rfid + ",ng"; if(isNGShelf())
mark = defualtMark;
else
{
mark = defualtMark + ",ok";
}
} }
return mark; return mark;
} }
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_Shelf.cs
...@@ -207,12 +207,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -207,12 +207,12 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid))) //if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid)))
{ //{
//新料架，检查料架上是否有治具 // //新料架，检查料架上是否有治具
MoveInfo.NextMoveStep(StoreMoveStep.SO_PreCheck_01_StartGetTray); // MoveInfo.NextMoveStep(StoreMoveStep.SO_PreCheck_01_StartGetTray);
} //}
else //else
{ {
SO_03_ToBagPosition(); SO_03_ToBagPosition();
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!