Skip to content

李娜 / SO827-OutletEquip

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

紧急料放到NG箱

1 个父辈 c3202696
内嵌 并排
正在显示 4 个修改的文件 包含 28 行增加 和 6 行删除
source/DeviceLibrary/bean/EquipBean.cs
...@@ -812,6 +812,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -812,6 +812,12 @@ namespace OnlineStore.DeviceLibrary
StartMove(); StartMove();
return; return;
} }
else if (LineConnect.DoorPosInfo.urgentReel)
{
LineConnect.DoorPosInfo.urgentReel = true;
StartMove();
return;
}
string shelfRfid = ReadyShelf(); string shelfRfid = ReadyShelf();
if (String.IsNullOrEmpty(shelfRfid)) if (String.IsNullOrEmpty(shelfRfid))
{ {
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LineMoveP p = new LineMoveP(); LineMoveP p = new LineMoveP();
if (param.PosInfo.IsNg && param.PosInfo.ShelfPosId.Equals("")) if ((param.PosInfo.IsNg||param.PosInfo.urgentReel) && param.PosInfo.ShelfPosId.Equals(""))
{ {
//判断料盘尺寸 //判断料盘尺寸
if (param.PosInfo.PlateW.Equals(7)) if (param.PosInfo.PlateW.Equals(7))
...@@ -375,7 +375,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -375,7 +375,7 @@ namespace OnlineStore.DeviceLibrary
} }
private void MoveToPosition(LineMoveP moveP) private void MoveToPosition(LineMoveP moveP)
{ {
if (MoveInfo.MoveParam.PosInfo.IsNg) if (MoveInfo.MoveParam.PosInfo.IsNg||MoveInfo.MoveParam.PosInfo.urgentReel)
{ {
storeStatus = StoreStatus.OutStoreBoxEnd; storeStatus = StoreStatus.OutStoreBoxEnd;
MoveInfo.NextMoveStep(MoveStep.SO_31_MoveToNG); MoveInfo.NextMoveStep(MoveStep.SO_31_MoveToNG);
...@@ -668,6 +668,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -668,6 +668,10 @@ namespace OnlineStore.DeviceLibrary
{ {
moveStr = "->NG箱 "; moveStr = "->NG箱 ";
LogUtil.info(Name + "[" + barcode + "]" + moveStr + " : " + MoveInfo.MoveStep + " " + msg); LogUtil.info(Name + "[" + barcode + "]" + moveStr + " : " + MoveInfo.MoveStep + " " + msg);
}else if (MoveInfo.MoveParam != null && MoveInfo.MoveParam.PosInfo != null && MoveInfo.MoveParam.PosInfo.urgentReel)
{
moveStr = " ->紧急料 ";
LogUtil.info(Name + "[" + BoxPosId + "]" + moveStr + " : " + MoveInfo.MoveStep + " " + msg);
} }
else else
{ {
......
source/DeviceLibrary/lineConnect/LineConnect.cs
...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
if (cmd.Equals(cmd_startIn)) if (cmd.Equals(cmd_startIn))
{ {
LogUtil.info("[" + CID + "]收到流水线消息：" + message); LogUtil.info("[" + CID + "]收到流水线消息：" + message);
InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateW, reviceInfo.PlateH, reviceInfo.IsNg, reviceInfo.PosId, reviceInfo.rfid); InOutPosInfo inout = new InOutPosInfo(reviceInfo.WareCode, "", reviceInfo.PlateW, reviceInfo.PlateH, reviceInfo.IsNg, reviceInfo.PosId, reviceInfo.rfid,reviceInfo.urgentReel);
string logName = "收到流水线命令【 " + inout.ToStr() + "】："; string logName = "收到流水线命令【 " + inout.ToStr() + "】：";
bool needUpdate = true; bool needUpdate = true;
...@@ -255,6 +255,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -255,6 +255,7 @@ namespace OnlineStore.DeviceLibrary
public int IsDebug = 0; public int IsDebug = 0;
public string rfid = ""; public string rfid = "";
public bool IsNg = false; public bool IsNg = false;
public bool urgentReel = false;
} }
public class StoreSendBean public class StoreSendBean
{ {
......
source/DeviceLibrary/model/InOutParam.cs
...@@ -74,7 +74,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -74,7 +74,7 @@ namespace OnlineStore.DeviceLibrary
} }
public class InOutPosInfo public class InOutPosInfo
{ {
public InOutPosInfo(string barcode, string shelfPosId, int platew =0, int plateh =0,bool IsNg=false,string boxPosId="", string rfid = "" ) public InOutPosInfo(string barcode, string shelfPosId, int platew =0, int plateh =0,bool IsNg=false,string boxPosId="", string rfid = "",bool urgentReel=false )
{ {
this.barcode = barcode; this.barcode = barcode;
this.ShelfPosId = shelfPosId; this.ShelfPosId = shelfPosId;
...@@ -83,6 +83,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -83,6 +83,7 @@ namespace OnlineStore.DeviceLibrary
this.rfid = rfid; this.rfid = rfid;
this.IsNg = IsNg; this.IsNg = IsNg;
this.BoxPosId = boxPosId; this.BoxPosId = boxPosId;
this.urgentReel = urgentReel;
} }
/// <summary> /// <summary>
...@@ -114,12 +115,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -114,12 +115,22 @@ namespace OnlineStore.DeviceLibrary
/// 是否是去NG箱的料 /// 是否是去NG箱的料
/// </summary> /// </summary>
public bool IsNg { get; set; } public bool IsNg { get; set; }
/// <summary>
/// 是否是去NG箱的料
/// </summary>
public bool urgentReel { get; set; }
public string ToStr() public string ToStr()
{ {
if (IsNg) if (IsNg)
{ {
return $" 门口NG料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]"; return $" 门口NG料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
} }
else if (urgentReel)
{
return $" 门口紧急料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
}
else else
{ {
return $" 门口物料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]"; return $" 门口物料 [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
...@@ -128,7 +139,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,7 +139,7 @@ namespace OnlineStore.DeviceLibrary
internal bool IsSameWare(InOutPosInfo posInfo) internal bool IsSameWare(InOutPosInfo posInfo)
{ {
if (BoxPosId.Equals(posInfo.BoxPosId) && barcode.Equals(posInfo.barcode) && rfid.Equals(posInfo.rfid) && IsNg.Equals(posInfo.IsNg)) if (BoxPosId.Equals(posInfo.BoxPosId) && barcode.Equals(posInfo.barcode) && rfid.Equals(posInfo.rfid) && IsNg.Equals(posInfo.IsNg) && urgentReel.Equals(posInfo.urgentReel))
{ {
return true; return true;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!