Skip to content

李娜 / SO908-XLRStore

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

存储机构-出入库完成添加barcode字段发给服务端

1 个父辈 050b231d
内嵌 并排
正在显示 5 个修改的文件 包含 16 行增加 和 8 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -69,6 +69,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -69,6 +69,7 @@ namespace OnlineStore.DeviceLibrary
//温湿度 //温湿度
public HumitureBean humBean = null; public HumitureBean humBean = null;
public string lastPosId = ""; public string lastPosId = "";
public string lastBarcode = "";
public string executeTime = ""; public string executeTime = "";
public DeviceStatus deviceStatus = DeviceStatus.ResetMove; public DeviceStatus deviceStatus = DeviceStatus.ResetMove;
public string CID = ""; public string CID = "";
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs
...@@ -103,18 +103,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,18 +103,21 @@ namespace OnlineStore.DeviceLibrary
else if (runStatus.Equals(DeviceStatus.OutStoreBoxEnd) || runStatus.Equals(DeviceStatus.InStoreEnd)) else if (runStatus.Equals(DeviceStatus.OutStoreBoxEnd) || runStatus.Equals(DeviceStatus.InStoreEnd))
{ {
boxStatus.data.Add(ParamDefine.posId, lastPosId); boxStatus.data.Add(ParamDefine.posId, lastPosId);
boxStatus.data.Add(ParamDefine.barcode,lastBarcode);
boxStatus.data.Add(ParamDefine.executeTime, executeTime); boxStatus.data.Add(ParamDefine.executeTime, executeTime);
} }
else if (!lastPosId.Equals("")) else if (!lastPosId.Equals(""))
{ {
boxStatus.data.Add(ParamDefine.posId, lastPosId); boxStatus.data.Add(ParamDefine.posId, lastPosId);
boxStatus.data.Add(ParamDefine.barcode, lastBarcode);
boxStatus.data.Add(ParamDefine.executeTime,executeTime); boxStatus.data.Add(ParamDefine.executeTime,executeTime);
boxStatus.status = (int)deviceStatus; boxStatus.status = (int)deviceStatus;
if (lastPosId != "") if (lastPosId != "")
{ {
LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】"); LogUtil.info("给服务器发送出入库消息：" + Name + ",status【" + deviceStatus + "】posId【" + lastPosId + "】barcode【"+lastBarcode+"】");
} }
lastPosId = ""; lastPosId = "";
lastBarcode = "";
} }
//温湿度 //温湿度
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs
...@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -136,7 +136,7 @@ namespace OnlineStore.DeviceLibrary
PullAxisToP1("入库"); PullAxisToP1("入库");
break; break;
case StepEnum.SI_01_PullAxis_Ready: case StepEnum.SI_01_PullAxis_Ready:
SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId,MoveInfo.MoveParam.PosInfo.barcode);
MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition); MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition);
if (!IsMoveAxisInSafePos()) if (!IsMoveAxisInSafePos())
{ {
...@@ -302,7 +302,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -302,7 +302,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack); MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack);
LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]"); LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
//入库完成 //入库完成
SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
executeTime = (DateTime.Now - startTime).TotalSeconds.ToString("f2"); executeTime = (DateTime.Now - startTime).TotalSeconds.ToString("f2");
UpdownAxisTo_P6_P12(); UpdownAxisTo_P6_P12();
break; break;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
...@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary
break; break;
case StepEnum.SO_01_PullAxis_Ready: case StepEnum.SO_01_PullAxis_Ready:
SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
MoveInfo.NextMoveStep(StepEnum.SO_01_MoveAxis_Ready); MoveInfo.NextMoveStep(StepEnum.SO_01_MoveAxis_Ready);
if(!IsMoveAxisInSafePos()) if(!IsMoveAxisInSafePos())
{ {
...@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -254,7 +254,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.SO_18_PutReel); MoveInfo.NextMoveStep(StepEnum.SO_18_PutReel);
LogInfo($"出库 {MoveInfo.SLog}：放料盘，移栽升降轴到下暂存区放料低点P5/P11"); LogInfo($"出库 {MoveInfo.SLog}：放料盘，移栽升降轴到下暂存区放料低点P5/P11");
executeTime = (DateTime.Now - startTime).TotalSeconds.ToString("f2"); executeTime = (DateTime.Now - startTime).TotalSeconds.ToString("f2");
SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId); SetBoxStatus(DeviceStatus.OutStoreBoxEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId, MoveInfo.MoveParam.PosInfo.barcode);
UpdownAxisTo_P5_P11(); UpdownAxisTo_P5_P11();
break; break;
case StepEnum.SO_18_PutReel: case StepEnum.SO_18_PutReel:
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -708,10 +708,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -708,10 +708,14 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
/// <param name="deviceStatus">设备上报服务端的状态</param> /// <param name="deviceStatus">设备上报服务端的状态</param>
/// <param name="runStatus">设备显示的状态</param> /// <param name="runStatus">设备显示的状态</param>
private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus, string lastPosId = "") private void SetBoxStatus(DeviceStatus deviceStatus, RunStatus runStatus, string lastPosId = "",string lastBarcode="")
{ {
if (!string.IsNullOrEmpty(lastPosId)) if (!string.IsNullOrEmpty(lastPosId))
{
this.lastPosId = lastPosId; this.lastPosId = lastPosId;
this.lastBarcode = lastBarcode;
}
this.deviceStatus = deviceStatus; this.deviceStatus = deviceStatus;
this.runStatus = runStatus; this.runStatus = runStatus;
} }
...@@ -886,7 +890,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -886,7 +890,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP)); LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
MoveInfo.NewMove(MoveType.InStore, param); MoveInfo.NewMove(MoveType.InStore, param);
IgnoreCamDect = false; IgnoreCamDect = false;
SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, param.PosInfo.PosId); SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, param.PosInfo.PosId,param.PosInfo.barcode);
MoveInfo.NextMoveStep(StepEnum.SI_00_StartInstore); MoveInfo.NextMoveStep(StepEnum.SI_00_StartInstore);
return true; return true;
} }
...@@ -1056,7 +1060,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1056,7 +1060,7 @@ namespace OnlineStore.DeviceLibrary
} }
startOutStoreTime = DateTime.Now; startOutStoreTime = DateTime.Now;
param.MoveP = new LineMoveP(Config, param.PosInfo.PosId); param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfo.PosId); SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfo.PosId,param.PosInfo.barcode);
MoveInfo.NewMove(MoveType.OutStore, param); MoveInfo.NewMove(MoveType.OutStore, param);
LogInfo("启动出库【" + param.PosInfo.ToStr() + "】 "); LogInfo("启动出库【" + param.PosInfo.ToStr() + "】 ");
LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP)); LogInfo("LoadInoutParam:" + JsonHelper.SerializeObject(param.MoveP));
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!