Skip to content

孙克 / ACSingleStore

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

出库修改

1 个父辈 5e93ab72
内嵌 并排
正在显示 5 个修改的文件 包含 24 行增加 和 33 行删除
source/ACSingleStore/App.config
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<add key="HumitureControllerType" value="0"/> <add key="HumitureControllerType" value="0"/>
<add key="UseAIOBOX" value="1"/> <add key="UseAIOBOX" value="1"/>
<!--流水线地址和端口配置--> <!--流水线地址和端口配置-->
<add key ="LineServerIp" value ="192.168.1.110"/> <add key ="LineServerIp" value ="192.168.1.113"/>
<add key ="LineServerPort" value ="5246"/> <add key ="LineServerPort" value ="5246"/>
<!--是否调试状态--> <!--是否调试状态-->
<add key ="IsInDebug" value ="1"/> <add key ="IsInDebug" value ="1"/>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1216,7 +1216,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1216,7 +1216,7 @@ namespace OnlineStore.DeviceLibrary
//TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器； //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
if (CanStarInOut()) if (CanStarInOut())
{ {
InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW, 0); InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
StartInStoreMove(param); StartInStoreMove(param);
//如果当前正在出入库中，需要记录下来，等待空闲时执行 //如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(LOGGER, StoreName + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 开始入库！"); LogUtil.info(LOGGER, StoreName + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 开始入库！");
...@@ -1302,7 +1302,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1302,7 +1302,7 @@ namespace OnlineStore.DeviceLibrary
//TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器； //TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
if (CanStarInOut()) if (CanStarInOut())
{ {
InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW, 0); InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
LogUtil.info(logName + " 开始入库！"); LogUtil.info(logName + " 开始入库！");
StartInStoreMove(param); StartInStoreMove(param);
//如果当前正在出入库中，需要记录下来，等待空闲时执行 //如果当前正在出入库中，需要记录下来，等待空闲时执行
...@@ -1682,7 +1682,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1682,7 +1682,7 @@ namespace OnlineStore.DeviceLibrary
FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posId, plateW, plateH); FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posId, plateW, plateH);
if (CanStarInOut() &&( LineConnect.CanStartOut()||IsDebug)) if (CanStarInOut() &&( LineConnect.CanStartOut()||IsDebug))
{ {
bool result = StartOutStoreMove(new InOutStoreParam("", posId, position)); bool result = StartOutStoreMove(new InOutStoreParam("", posId, plateW,plateH));
if (!result) if (!result)
{ {
LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列"); LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -58,12 +58,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -58,12 +58,6 @@ namespace OnlineStore.DeviceLibrary
p.Middle_P1 = Config.MiddleAxis_P1_Position; p.Middle_P1 = Config.MiddleAxis_P1_Position;
p.InOut_P2 = position.InOutAxis_DoorPosition_P2; p.InOut_P2 = position.InOutAxis_DoorPosition_P2;
//p.UpDown_P1 = position.UpDownAxis_DoorOPosition_P1;
//p.UpDown_P8 = position.UpDownAxis_DoorIBPosition_P8;
//p.UpDown_P2 = position.UpDownAxis_DoorIPosition_P2;
//p.UpDown_P7 = position.UpDownAxis_DoorOBPosition_P7;
//p.InOut_P2 = Config.InOutAxis_DoorPosition_P2;
p.UpDown_P1 = Config.UpDownAxis_DoorOPosition_P1; p.UpDown_P1 = Config.UpDownAxis_DoorOPosition_P1;
p.UpDown_P8 = Config.UpDownAxis_DoorIBPosition_P8; p.UpDown_P8 = Config.UpDownAxis_DoorIBPosition_P8;
p.UpDown_P2 = Config.UpDownAxis_DoorIPosition_P2; p.UpDown_P2 = Config.UpDownAxis_DoorIPosition_P2;
...@@ -78,6 +72,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -78,6 +72,15 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P5 = position.UpDownAxis_OHPosition_P5; p.UpDown_P5 = position.UpDownAxis_OHPosition_P5;
p.UpDown_P6 = position.UpDownAxis_OLPosition_P6; p.UpDown_P6 = position.UpDownAxis_OLPosition_P6;
param.MoveP = p; param.MoveP = p;
if (String.IsNullOrEmpty(param.PlateH))
{
param.PlateH = position.BagHigh.ToString();
}
if (string.IsNullOrEmpty(param.PlateW))
{
param.PlateW = position.BagWidth.ToString();
}
return true; return true;
} }
return true; return true;
......
source/DeviceLibrary/lineConnect/LineConnect.cs
...@@ -74,6 +74,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -74,6 +74,7 @@ namespace OnlineStore.DeviceLibrary
{ {
store.Cmd = cmd_outend; store.Cmd = cmd_outend;
string msg = ToParamStr(store); string msg = ToParamStr(store);
LogUtil.info("OutStoreEnd：" + msg);
client.send(msg); client.send(msg);
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/store/InOrOutStoreParam.cs
...@@ -45,17 +45,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -45,17 +45,7 @@ namespace OnlineStore.DeviceLibrary
this.PlateH = plateH; this.PlateH = plateH;
IsSolderPaste = false; IsSolderPaste = false;
} }
public InOutStoreParam(string wareNo, string posId, string plateH, string plateW,int trayCode)
{
ACStoreP = null;
WareNumber = wareNo;
PositionNum = posId;
MoveP = null;
this.PlateW = plateW;
this.PlateH = plateH;
this.TrayCode = trayCode;
IsSolderPaste = false;
}
public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition) public InOutStoreParam(string wareNo, string posId, LineMoveP linePosition)
{ {
...@@ -65,14 +55,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,14 +55,14 @@ namespace OnlineStore.DeviceLibrary
MoveP = linePosition; MoveP = linePosition;
IsSolderPaste = false; IsSolderPaste = false;
} }
public InOutStoreParam(string wareNo, string posId, ACStorePosition movep) //public InOutStoreParam(string wareNo, string posId, ACStorePosition movep)
{ //{
ACStoreP = movep; // ACStoreP = movep;
WareNumber = wareNo; // WareNumber = wareNo;
PositionNum = posId; // PositionNum = posId;
MoveP = null; // MoveP = null;
IsSolderPaste = false; // IsSolderPaste = false;
} //}
private ACStorePosition ACStoreP = null; private ACStorePosition ACStoreP = null;
...@@ -100,10 +90,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -100,10 +90,7 @@ namespace OnlineStore.DeviceLibrary
/// 位置坐标名（对应配置表的位置） /// 位置坐标名（对应配置表的位置）
/// </summary> /// </summary>
public string PositionNum { get; set; } public string PositionNum { get; set; }
/// <summary>
/// 托盘号
/// </summary>
public int TrayCode { get; set; }
public LineMoveP MoveP { get; set; } public LineMoveP MoveP { get; set; }
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!