Skip to content

孙克 / RC1250-ACPackingStore

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

11

1 个父辈 179df54f
内嵌 并排
正在显示 7 个修改的文件 包含 24 行增加 和 42 行删除
source/ACPackingStore/FrmBox.cs
...@@ -38,10 +38,15 @@ namespace OnlineStore.ACPackingStore ...@@ -38,10 +38,15 @@ namespace OnlineStore.ACPackingStore
{ {
btnCMove.Tag = 0; btnCMove.Tag = 0;
cmbPlateH.Items.Clear(); cmbPlateH.Items.Clear();
for (int i = 8; i <= 48; i = i + 4) //for (int i = 8; i <= 48; i = i + 4)
//{
// cmbPlateH.Items.Add(i.ToString());
//}
foreach (var item in BoxBean.Config.GetComP2AllHeights())
{ {
cmbPlateH.Items.Add(i.ToString()); cmbPlateH.Items.Add(item);
} }
if (cmbPlateH.Items.Count > 0)
cmbPlateH.SelectedIndex = 0; cmbPlateH.SelectedIndex = 0;
LoadStore(); LoadStore();
} }
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_InStore.cs
...@@ -125,6 +125,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -125,6 +125,11 @@ namespace OnlineStore.DeviceLibrary
/// <param name="str"></param> /// <param name="str"></param>
private void StartSendTray(string str = "扫码失败", bool ok = false) private void StartSendTray(string str = "扫码失败", bool ok = false)
{ {
if(!ok)
{
int loc=ShelfPosList.FindIndex(s =>s.Equals(MoveInfo.MoveParam.CurShelfPosID));
StoreManager.LockAShelfLoc(Name, CurrShelfID,loc+1);
}
StartMoveTrayBack(str, ok); StartMoveTrayBack(str, ok);
//MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor); //MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
//InOutStoreLog("NG料，升降轴到NG门口高点P12，旋转轴到NG门口P11"); //InOutStoreLog("NG料，升降轴到NG门口高点P12，旋转轴到NG门口P11");
...@@ -377,10 +382,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -377,10 +382,6 @@ namespace OnlineStore.DeviceLibrary
{ {
StartSendTray("未检测到料盘",true); StartSendTray("未检测到料盘",true);
} }
else if (LastScanCodes.Count <= 0)
{
StartSendTray();
}
else else
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam); MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam);
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_Partial.cs
...@@ -98,15 +98,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -98,15 +98,6 @@ namespace OnlineStore.DeviceLibrary
mark = MoveInfo.MoveParam.rfid + ",pack"; mark = MoveInfo.MoveParam.rfid + ",pack";
} }
} }
else if (MoveInfo.MoveType.Equals(StoreMoveType.InStore))
{
if(isNGShelf())
mark = defualtMark;
else
{
mark = defualtMark + ",ok";
}
}
return mark; return mark;
} }
/// <summary> /// <summary>
......
source/DeviceLibrary/PackingStore/StoreManager.cs
...@@ -856,7 +856,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -856,7 +856,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
private static string Addr_lockAShelfLoc = "/service/store/lockAShelfLoc"; private static string Addr_lockAShelfLoc = "/rest/api/qisda/device/lockAShelfLoc";///rest/api/qisda/device//lockAShelfLoc
/// <summary> /// <summary>
/// 锁定包装料架NG架位 /// 锁定包装料架NG架位
......
source/DeviceLibrary/device/halcon/CodeManager.cs
...@@ -163,31 +163,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -163,31 +163,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
//foreach (string codeType in codeTypeList)
//{
// //判断是否是一维码
// if (codeType.ToLower().Equals("barcode"))
// {
// cc = HDCodeHelper.DecodeBarCode(ho_Image);
// }
// else
// {
// cc = HDCodeHelper.DecodeCode(ho_Image, codeType, GetCodeParamFilePath(codeType), codeCount, timeOut);
// }
// foreach (CodeInfo c in cc)
// {
// string str = CodeManager.ReplaceCode(c.CodeStr);
// if (!codeList.Contains(str))
// {
// codeList.Add(str);
// r = r + "##" + str;
// if (!findRightCode)
// {
// findRightCode = HasRightCode(str);
// }
// }
// }
//}
if (deviceName != "" || r != "") if (deviceName != "" || r != "")
{ {
LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】[" + findRightCode + "]" + ScanCount + " ：" + r); LogUtil.info(deviceName + " 【" + cameraName + "】扫码完成【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】[" + findRightCode + "]" + ScanCount + " ：" + r);
......
source/LoadCVSLibrary/position/CSVPositionReader.cs
...@@ -187,7 +187,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -187,7 +187,7 @@ namespace OnlineStore.LoadCSVLibrary
{ {
var result = AllPositionMap[tname][positionNum]; var result = AllPositionMap[tname][positionNum];
if (result == null) return null; if (result == null) return null;
int idx = AllPositionMap[tname].Values.ToList().FindIndex(s => s.PositionNum.Equals(positionNum));//s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh int idx = AllPositionMap[tname].Values.ToList().FindIndex(s => s.PositionNum.Equals(positionNum) && s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh);//s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh
List<T> allPos = new List<T>(); List<T> allPos = new List<T>();
for (int i = idx; i < AllPositionMap[tname].Values.Count; i++) for (int i = idx; i < AllPositionMap[tname].Values.Count; i++)
{ {
......
source/LoadCVSLibrary/storeConfig/config/AC_Box_Config.cs
...@@ -583,6 +583,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -583,6 +583,16 @@ namespace OnlineStore.LoadCSVLibrary
} }
return new ComP2Info(plateh, CompAxis_P4_Position, CompAxis_P4_Position+CompAxis_Down_Position); return new ComP2Info(plateh, CompAxis_P4_Position, CompAxis_P4_Position+CompAxis_Down_Position);
} }
public List<int> GetComP2AllHeights()
{
analysisComP2();
List<int> list = new List<int>();
foreach (var item in ComP2List)
{
list.Add(item.PlateH);
}
return list;
}
public int GetComP2PlateH(int currP) public int GetComP2PlateH(int currP)
{ {
analysisComP2(); analysisComP2();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!