Skip to content

孙克 / RC1250-ACPackingStore

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

1

1 个父辈 16f8bb9c
内嵌 并排
正在显示 7 个修改的文件 包含 42 行增加 和 37 行删除
source/ACPackingStore/FrmBox.cs
......@@ -235,8 +235,11 @@ namespace OnlineStore.ACPackingStore
if (BoxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
{
string selectPositionNum = cmbPosition.Text;
string sleShelfNum = cmbShelfPosition.Text;
LineMoveP ktk = LoadPostion();
BoxBean.StartOutStoreMove(new InOutParam("", selectPositionNum, ktk));
InOutParam param = new InOutParam("", selectPositionNum,sleShelfNum, ktk);
BoxBean.StartOutStoreMove(param);
}
else
{
......@@ -249,8 +252,9 @@ namespace OnlineStore.ACPackingStore
if (BoxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
{
string selectPositionNum = cmbPosition.Text;
string sleShelfNum = cmbShelfPosition.Text;
LineMoveP ktk = LoadPostion();
BoxBean.StartInStoreMove(new InOutParam("", selectPositionNum, ktk));
BoxBean.StartInStoreMove(new InOutParam("", selectPositionNum, sleShelfNum, ktk));
}
else
{
......
source/Common/util/LogUtil.cs
......@@ -32,7 +32,7 @@ namespace OnlineStore.Common
return;
}
log.Info(log.Logger.Name + " - " + msg);
log.Info( " - " + msg);
if (logBox == null)
{
return;
......@@ -42,7 +42,7 @@ namespace OnlineStore.Common
}
public static void info(ILog log,string msg, Color color)
{
log.Info(log.Logger.Name + " - " + msg);
log.Info( " - " + msg);
if (logBox == null)
{
return;
......@@ -51,7 +51,7 @@ namespace OnlineStore.Common
}
public static void debug(ILog log, string msg, Color color)
{
log.Debug(log.Logger.Name + " - " + msg);
log.Debug( " - " + msg);
if (debug_opened)
{
if (logBox == null)
......@@ -63,7 +63,7 @@ namespace OnlineStore.Common
}
public static void debug(ILog log, string msg)
{
log.Debug(log.Logger.Name + " - " + msg);
log.Debug( " - " + msg);
if (debug_opened)
{
if (logBox == null)
......@@ -103,7 +103,7 @@ namespace OnlineStore.Common
{
//if (!lasErrorLogList.Contains(errorMsg))
{
log.Error(log.Logger.Name + " - " + errorMsg);
log.Error( " - " + errorMsg);
if (logBox == null)
{
return;
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
......@@ -186,11 +186,11 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " 启动入库【" + posId + "】出错，找不到库位信息");
return;
}
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
LogUtil.error(Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
return;
}
//if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
//{
// LogUtil.error(Name + " 启动入库【" + posId + "】出错，叉子料盘检测有料");
// return;
//}
param.NeedEnterShelf = false;
param.NeedOutShelf = false;
LogInfo(" 启动入库【" + posId + "】");
......@@ -232,7 +232,7 @@ namespace OnlineStore.DeviceLibrary
else
{
LogUtil.error(Name + "检测到入料口有料架，读取RFID数据错误：" + data.ToStr());
return;
// return;
}
storeRunStatus = StoreRunStatus.Busy;
......@@ -976,15 +976,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " 启动出库【" + posId + "】出错，找不到库位信息");
return false;
}
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
LogUtil.error(Name + " 启动出库【" + posId + "】出错，叉子料盘检测有料");
return false;
}
//if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
//{
// LogUtil.error(Name + " 启动出库【" + posId + "】出错，叉子料盘检测有料");
// return false;
//}
storeStatus = StoreStatus.OutStoreExecute;
LogInfo("启动出库【" + posId + "】 NeedEnterShelf【" + MoveInfo.MoveParam.NeedEnterShelf + "】NeedOutShelf【" + MoveInfo.MoveParam.NeedOutShelf + "】 ");
storeRunStatus = StoreRunStatus.Busy;
MoveInfo.NewMove(StoreMoveType.OutStore, param);
LogInfo("启动出库【" + posId + "】 NeedEnterShelf【" + MoveInfo.MoveParam.NeedEnterShelf + "】NeedOutShelf【" + MoveInfo.MoveParam.NeedOutShelf + "】 ");
//当前无料架，或料架位置为空
if ((IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveParam.NeedEnterShelf) || MoveInfo.MoveParam.ShelfPosID.Equals(""))
{
......@@ -1061,12 +1061,12 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
{
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料盘有料";
LogUtil.error(CodeMsg);
}
//if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
//{
// string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
// CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料盘有料";
// LogUtil.error(CodeMsg);
//}
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102, ");
......
source/DeviceLibrary/StoreConfig/shelfPosition_2.csv
位置,优先级,高度,宽度,料仓ID,旋转轴位置P101,升降轴低点P101,升降轴高点P102,进出轴位置P101
1#S_1_1,1,8,7,1,311800,83300,98000,81000
1#S_1_2,2,8,7,1,311800,114000,128700,81000
1#S_1_3,3,8,7,1,311800,144700,159400,81000
1#S_1_4,4,8,7,1,311800,175400,190100,81000
1#S_1_5,5,8,7,1,311800,206100,220800,81000
1#S_1_6,6,8,7,1,311800,236800,251500,81000
1#S_1_7,7,8,7,1,311800,267500,282200,81000
1#S_1_8,8,8,7,1,311800,298200,312900,81000
1#S_1_9,9,8,7,1,311800,328900,343600,81000
2#S_1_1,1,8,7,2,311800,83300,98000,81000
2#S_1_2,2,8,7,2,311800,114000,128700,81000
2#S_1_3,3,8,7,2,311800,144700,159400,81000
2#S_1_4,4,8,7,2,311800,175400,190100,81000
2#S_1_5,5,8,7,2,311800,206100,220800,81000
2#S_1_6,6,8,7,2,311800,236800,251500,81000
2#S_1_7,7,8,7,2,311800,267500,282200,81000
2#S_1_8,8,8,7,2,311800,298200,312900,81000
2#S_1_9,9,8,7,2,311800,328900,343600,81000
source/DeviceLibrary/agvClient/AgvClient.cs
......@@ -12,7 +12,7 @@ namespace OnlineStore.DeviceLibrary
{
private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
//private string NodeName = "";
private static Client agvClient = null;
private static Client agvClient = new Client(ServerIp);
public static Dictionary<string, Asa.Actions> actionMap = new Dictionary<string, Asa.Actions>();
public static List<string> NodeList = new List<string>();
public static void Init( )
......
source/DeviceLibrary/store/InOutParam.cs
......@@ -44,9 +44,10 @@ namespace OnlineStore.DeviceLibrary
this.PlateH = plateH;
IsSolderPaste = false;
}
public InOutParam(string wareNo, string posId, LineMoveP linePosition )
public InOutParam(string wareNo, string posId, string ShelfPosID,LineMoveP linePosition )
{
WareCode = wareNo;
this.ShelfPosID = ShelfPosID;
PosID = posId;
MoveP = linePosition;
IsSolderPaste = false;
......
source/DeviceLibrary/store/KTK_Store.cs
......@@ -484,7 +484,7 @@ namespace OnlineStore.DeviceLibrary
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosID : "";
string shelfId = MoveInfo.MoveParam != null ? "_" + MoveInfo.MoveParam.ShelfPosID : "_";
LogInfo("[" + posId + shelfId + "]" + MoveInfo.MoveStep + ":" + msg);
LogInfo(" [" + posId +"] ["+ shelfId + "] :" + msg);
}
protected int GetAlarmCodeByAxis(ConfigMoveAxis axis)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!