Skip to content

孙克 / RC1250-ACPackingStore

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

扫码按钮修改

1 个父辈 3f22a0a2
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 61 行增加 和 18 行删除
source/ACPackingStore/FrmBox.cs
...@@ -153,7 +153,16 @@ namespace OnlineStore.ACPackingStore ...@@ -153,7 +153,16 @@ namespace OnlineStore.ACPackingStore
lblTemp.Text = BoxBean.humBean.currTempStr; lblTemp.Text = BoxBean.humBean.currTempStr;
lblWarnMsg.Text = BoxBean.GetWarnMsg(); lblWarnMsg.Text = BoxBean.GetWarnMsg();
lblMoveInfo.Text = BoxBean.GetMoveStr(); lblMoveInfo.Text = BoxBean.GetMoveStr();
lblMoveEquipInfo.Text="当前出入库信息：" if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.OutStore) || BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.InStore))
{
lblMoveEquipInfo.Text ="入库："+ BoxBean.MoveInfo.MoveParam.ToShortStr();
}
else
{
lblMoveEquipInfo.Text ="";
// lblMoveEquipInfo.Text = "";
}
//ReadPosistion(); //ReadPosistion();
if (BoxBean.storeRunStatus > StoreRunStatus.Wait) if (BoxBean.storeRunStatus > StoreRunStatus.Wait)
{ {
...@@ -793,7 +802,9 @@ namespace OnlineStore.ACPackingStore ...@@ -793,7 +802,9 @@ namespace OnlineStore.ACPackingStore
private void btnScanTest_Click(object sender, EventArgs e) private void btnScanTest_Click(object sender, EventArgs e)
{ {
List<string> codes = CodeManager.CameraScan(BoxBean.Config.GetCameraList()); BoxBean. IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
List<string> codes = CodeManager.CameraScan(BoxBean.Config.GetCameraList());
BoxBean.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
string result = ""; string result = "";
if (codes.Count > 0) if (codes.Count > 0)
{ {
...@@ -804,6 +815,11 @@ namespace OnlineStore.ACPackingStore ...@@ -804,6 +815,11 @@ namespace OnlineStore.ACPackingStore
MessageBox.Show("扫到二维码：" + result); MessageBox.Show("扫到二维码：" + result);
LogUtil.info("扫到二维码：" + result); LogUtil.info("扫到二维码：" + result);
} }
else
{
MessageBox.Show("未扫到二维码" );
}
} }
private void cmbShelfPosition_SelectedIndexChanged(object sender, EventArgs e) private void cmbShelfPosition_SelectedIndexChanged(object sender, EventArgs e)
...@@ -1005,5 +1021,40 @@ namespace OnlineStore.ACPackingStore ...@@ -1005,5 +1021,40 @@ namespace OnlineStore.ACPackingStore
} }
} }
} }
private void btnUpdownP101_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP101);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P101_Speed);
}
}
private void btnUpdownP102_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpdownP102);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P102_Speed);
}
}
private void button5_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtMP101);
AxisABSMove(BoxBean.Config.Middle_Axis, value, BoxBean.Config.MiddleAxis_P101_Speed);
}
}
private void btnInoutP101_Click(object sender, EventArgs e)
{
int value = FormUtil.GetIntValue(txtInoutP101);
AxisABSMove(BoxBean.Config.InOut_Axis, value, BoxBean.Config.InOutAxis_P101_Speed );
}
} }
} }
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -298,6 +298,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -298,6 +298,8 @@ namespace OnlineStore.DeviceLibrary
// return usable; // return usable;
//} //}
//else //else
//Arrive收到后打开门
if (action.Equals(ClientAction.Arrive)) if (action.Equals(ClientAction.Arrive))
{ {
//出库处理中不处理 //出库处理中不处理
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -46,13 +46,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,13 +46,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error("初始化agvClient " + ServerIp + " 出错："+ ex.ToString()); LogUtil.error("初始化agvClient " + ServerIp + " 出错："+ ex.ToString());
} }
} }
//private static void AgvClient_GetRFID(string name, byte[] content)
//{
// RFIDData data = new RFIDData(content);
// LogUtil.info("收到 AgvClient_GetRFID [" + name + "] [" + data.ToData() + "] ");
//}
public static void SetStatus(string id,string mark="", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low) public static void SetStatus(string id,string mark="", string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
{ {
ClientAction currA = GetAction(id); ClientAction currA = GetAction(id);
...@@ -72,15 +66,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -72,15 +66,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] "); LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] ");
StoreManager.Store.AGVProcess(id, ClientAction.Ready); StoreManager.Store.AGVProcess(id, ClientAction.Ready);
} }
//private static void AgvClient_CanEnter(string id, byte[] content)
//{
// UpdateAction(id, ClientAction.CanEnter);
// RFIDData data = new RFIDData(content);
// LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] ");
// StoreManager.Store.AGVProcess(id, ClientAction.CanEnter);
//}
private static void AgvClient_Arrive(string id, byte[] content) private static void AgvClient_Arrive(string id, byte[] content)
{ {
......
source/DeviceLibrary/store/InOutParam.cs
...@@ -144,6 +144,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -144,6 +144,10 @@ namespace OnlineStore.DeviceLibrary
"NeedEnterShelf【" + NeedEnterShelf + "】NeedOutShelf【" + NeedOutShelf + "】"+ "NeedEnterShelf【" + NeedEnterShelf + "】NeedOutShelf【" + NeedOutShelf + "】"+
"urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]"; "urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
} }
public string ToShortStr()
{
return " [" + ShelfPosID + "] [" + PosID + "] [" + WareCode + "], [" + PlateW + "x" + PlateH + "]";
}
internal void UpdateShelfPosId(string pId) internal void UpdateShelfPosId(string pId)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!