Skip to content

李娜 / SO827-OutletEquip

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

多料架放料bug修改。报警显示修改

1 个父辈 8e3f0ffb
内嵌 并排
正在显示 7 个修改的文件 包含 122 行增加 和 94 行删除
source/DeviceLibrary/StoreConfig/StoreConfig.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位 类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,100,1000,1000,20,100,3000,10,100,0,0 AXIS,0,（轴一）旋转轴,Middle_Axis,0,HC,,1000,1000,1000,50,400,3000,10,100,0,0
AXIS,0,（轴二）升降轴,UpDown_Axis,1,HC,,100,1000,1000,20,150,3000,10,100,0,0 AXIS,0,（轴二）升降轴,UpDown_Axis,1,HC,,100,1000,1000,20,150,3000,10,100,0,0
AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,3000,3000,3000,100,400,3000,10,100,0,0 AXIS,0,（轴三）进出轴,InOut_Axis,2,HC,,3000,3000,3000,100,400,3000,10,100,0,0
AXIS,0,（轴四）压紧轴,Comp_Axis,3,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0 AXIS,0,（轴四）压紧轴,Comp_Axis,3,HC,,30000,15000,15000,3000,5000,10000,10,100,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料低点 P1,UpDownAxis_DoorL_P1,2914,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料低点 P1,UpDownAxis_DoorL_P1,2914,,,,,,,,,,,,
PRO,0,升降轴（轴2）进料口取料高点 P2,UpDownAxis_DoorH_P2,3200,,,,,,,,,,,, PRO,0,升降轴（轴2）进料口取料高点 P2,UpDownAxis_DoorH_P2,3200,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料高点 P5,UpDownAxis_DoorH_P5,4900,,,,,,,,,,,, PRO,0,升降轴（轴2）NG口放料高点 P5,UpDownAxis_DoorH_P5,4760,,,,,,,,,,,,
PRO,0,升降轴（轴2）NG口放料低点 P6,UpDownAxis_DoorH_P6,4900,,,,,,,,,,,, PRO,0,升降轴（轴2）NG口放料低点 P6,UpDownAxis_DoorH_P6,4760,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1/取料点/待机原位点,MiddleAxis_P1,4760,,,,,,,,,,,, PRO,0,旋转轴（轴1）P1/取料点/待机原位点,MiddleAxis_P1,4760,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P3/NG口放料点,MiddleAxis_P3,2450,,,,,,,,,,,, PRO,0,旋转轴（轴1）P3/NG口放料点,MiddleAxis_P3,4760,,,,,,,,,,,,
PRO,0,进出轴（轴3）P1/待机原位点,InOutAxis_P1,200,,,,,,,,,,,, PRO,0,进出轴（轴3）P1/待机原位点,InOutAxis_P1,200,,,,,,,,,,,,
PRO,0,进出轴（轴3）P4/NG口放料点,InOutAxis_P4,100,,,,,,,,,,,, PRO,0,进出轴（轴3）P4/NG口放料点,InOutAxis_P4,4760,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1,4760,,,,,,,,,,,, PRO,0,压紧轴（轴4）P1待机原位点,CompressAxis_P1,4760,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=74800,12=71300,28=59300,36=46800,48=40400,,,,,,,, PRO,0,压紧轴（轴4）P2压紧点列表,CompAxis_P2_List,8=74800,12=71300,28=59300,36=46800,48=40400,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
...@@ -21,9 +21,9 @@ PRO,0,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,1000,,,,,,,,,,,, ...@@ -21,9 +21,9 @@ PRO,0,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,500,,,,,,,,,,,, PRO,0,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,500,,,,,,,,,,,,
PRO,0,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,, PRO,0,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,500,,,,,,,,,,,, PRO,0,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,500,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,300,,,,,,,,,,,, PRO,0,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,3000,,,,,,,,,,,,
PRO,0,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,300,,,,,,,,,,,, PRO,0,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,3000,,,,,,,,,,,,
PRO,1,旋转轴（轴1）P3速度,MiddleAxis_P3_Speed,301,,,,,,,,,,,, PRO,1,旋转轴（轴1）P3速度,MiddleAxis_P3_Speed,3000,,,,,,,,,,,,
PRO,0,进出轴（轴3）P1速度,InOutAxis_P1_Speed,6000,,,,,,,,,,,, PRO,0,进出轴（轴3）P1速度,InOutAxis_P1_Speed,6000,,,,,,,,,,,,
PRO,0,进出轴（轴3）P2速度,InOutAxis_P2_Speed,6000,,,,,,,,,,,, PRO,0,进出轴（轴3）P2速度,InOutAxis_P2_Speed,6000,,,,,,,,,,,,
PRO,0,进出轴（轴3）P3速度,InOutAxis_P3_Speed,6000,,,,,,,,,,,, PRO,0,进出轴（轴3）P3速度,InOutAxis_P3_Speed,6000,,,,,,,,,,,,
......
source/DeviceLibrary/bean/EquipBean.cs
...@@ -822,7 +822,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -822,7 +822,6 @@ namespace OnlineStore.DeviceLibrary
CurrTray = HttpServer.GetLocation(LineConnect.DoorPosInfo.barcode, shelfRfid, out outMsg); CurrTray = HttpServer.GetLocation(LineConnect.DoorPosInfo.barcode, shelfRfid, out outMsg);
//需要取放料，且料架已准备好 //需要取放料，且料架已准备好
if (outMsg.Equals("")) if (outMsg.Equals(""))
//if (String.IsNullOrEmpty(CurrTray.getP).Equals(false) && outMsg.Equals(""))
{ {
ClearWarnMsg("getLocation"); ClearWarnMsg("getLocation");
string targetP = GetShelfPosId(); string targetP = GetShelfPosId();
...@@ -833,7 +832,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -833,7 +832,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
WarnMsg = " getLocation " + outMsg; WarnMsg = "未找到可用料架 getLocation " + CurrTray.ToStr();
} }
} }
else if (!outMsg.Equals("")) else if (!outMsg.Equals(""))
...@@ -890,15 +889,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -890,15 +889,15 @@ namespace OnlineStore.DeviceLibrary
} }
private void StartMove() private void StartMove()
{ {
LogInfo("开始移栽【" + LineConnect.DoorPosInfo.ToStr() + "】"); LogUtil.debug(Name+ "开始移栽【" + LineConnect.DoorPosInfo.ToStr() + "】");
bool result = StartOutMove(new InOutParam(LineConnect.DoorPosInfo)); bool result = StartOutMove(new InOutParam(LineConnect.DoorPosInfo));
if (!result) if (!result)
{ {
LogInfo(" 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】失败"); LogUtil.debug(Name + " 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】失败");
} }
else else
{ {
LogInfo(" 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】成功，清理门口数据"); LogUtil.debug(Name + " 移栽【" + LineConnect.DoorPosInfo.ToStr() + "】成功，清理门口数据");
LineConnect.DoorPosInfo = null; LineConnect.DoorPosInfo = null;
} }
} }
...@@ -1007,7 +1006,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1007,7 +1006,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
msg += shelf.Name + ": " + shelf.CurrShelf.ToStr() + "\r\n"; msg += shelf.Name + ": " + shelf.CurrShelf.ToStr() + " "+shelf.MoveInfo.MoveType+"_"+shelf.MoveInfo.MoveStep+"_"+shelf.alarmType+"\r\n";
} }
} }
if (alarmType.Equals(StoreAlarmType.None)) if (alarmType.Equals(StoreAlarmType.None))
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
...@@ -273,15 +273,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -273,15 +273,15 @@ namespace OnlineStore.DeviceLibrary
{ {
if (!LoadParamPosition(param)) if (!LoadParamPosition(param))
{ {
LogUtil.error(Name + " 启动出料【" + param.PosInfo.ToStr() + "】出错，找不到库位"); LogUtil.error(Name + " 启动出料移栽【" + param.PosInfo.ToStr() + "】出错，找不到库位");
return false ; return false ;
} }
if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
LogUtil.error(Name + " 启动出料【" + param.PosInfo.ToStr() + "】出错，叉子料盘检测有料"); LogUtil.error(Name + " 启动出料移栽【" + param.PosInfo.ToStr() + "】出错，叉子料盘检测有料");
return false ; return false ;
} }
LogInfo( " 启动出料【" + param.PosInfo.ToStr() + "】"); LogInfo(" 启动出料移栽【" + param.PosInfo.ToStr() + "】成功");
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.OutStoreExecute; storeStatus = StoreStatus.OutStoreExecute;
MoveInfo.NewMove(StoreMoveType.OutStore, param); MoveInfo.NewMove(StoreMoveType.OutStore, param);
...@@ -630,6 +630,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -630,6 +630,7 @@ namespace OnlineStore.DeviceLibrary
{ {
string moveStr = "->料架 "; string moveStr = "->料架 ";
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.ShelfPosId : "";
string BoxPosId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.BoxPosId : "";
string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : ""; string barcode = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosInfo.barcode : "";
if (MoveInfo.MoveParam != null && MoveInfo.MoveParam.PosInfo != null && MoveInfo.MoveParam.PosInfo.IsNg) if (MoveInfo.MoveParam != null && MoveInfo.MoveParam.PosInfo != null && MoveInfo.MoveParam.PosInfo.IsNg)
{ {
...@@ -638,7 +639,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -638,7 +639,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LogUtil.info(Name + "["+ barcode + "]"+ moveStr + "[" + posId + "] : " + MoveInfo.MoveStep + " " +msg); LogUtil.info(Name + "["+ BoxPosId + "]"+ moveStr + "[" + posId + "] : " + MoveInfo.MoveStep + " " +msg);
} }
} }
} }
......
source/DeviceLibrary/bean/WorkStation.cs
...@@ -55,10 +55,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,10 +55,18 @@ namespace OnlineStore.DeviceLibrary
} }
if (CheckShelf(IO_VALUE.HIGH)) if (CheckShelf(IO_VALUE.HIGH))
{ {
if (!CurrShelf.IsNeedLeave && (!String.IsNullOrEmpty(CurrShelf.RealShelf)) && LocationIsUp()) if (!CurrShelf.IsNeedLeave && (!String.IsNullOrEmpty(CurrShelf.RealShelf)) )
{
if (LocationIsUp())
{ {
return true; return true;
} }
else
{
WarnMsg = Name+"定位气缸上升不到位";
}
}
} }
//料架准备好可以放料 //料架准备好可以放料
return false; return false;
...@@ -92,6 +100,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -92,6 +100,7 @@ namespace OnlineStore.DeviceLibrary
{ {
string rfid = RFIDManager.ReadRFID(rfidIp).NumStr(); string rfid = RFIDManager.ReadRFID(rfidIp).NumStr();
CurrShelf = new ShelfInfo(rfid); CurrShelf = new ShelfInfo(rfid);
LogUtil.info(Name + "读取料架号：" + CurrShelf.ToStr());
return CurrShelf.RealShelf; return CurrShelf.RealShelf;
} }
...@@ -191,13 +200,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,13 +200,26 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(MoveStep.SR_04_LocationUp)) else if (MoveInfo.IsStep(MoveStep.SR_04_LocationUp))
{ {
LogUtil.info(Name + "复位："+ CurrShelf.ToStr() + "准备完成，可以放料 "); if (LocationIsUp())
{
LogUtil.info(Name + "复位：" + CurrShelf.ToStr() + "准备完成，可以放料 ");
MoveInfo.EndMove(); MoveInfo.EndMove();
} }
else
{
MoveInfo.NextMoveStep(MoveStep.SR_04_LocationUp);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
LocationUp(MoveInfo);
LogUtil.info(Name + "复位：料架" + CurrShelf.ToStr() + "定位气缸不到位，再次顶升上升 ");
}
}
} }
private void SR_04_LocationUp() private void SR_04_LocationUp()
{ {
MoveInfo.NewMove(StoreMoveType.StoreReset); //MoveInfo.NewMove(StoreMoveType.StoreReset);
MoveInfo.NextMoveStep(MoveStep.SR_04_LocationUp);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
ReadShelfId(); ReadShelfId();
if (CheckNeedLeave(false )) if (CheckNeedLeave(false ))
...@@ -208,7 +230,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -208,7 +230,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
MoveInfo.NextMoveStep(MoveStep.SR_04_LocationUp); //MoveInfo.NextMoveStep(MoveStep.SR_04_LocationUp);
LocationUp(MoveInfo); LocationUp(MoveInfo);
LogUtil.info(Name + "复位：读取到新料架：" + CurrShelf.ToStr() + "，顶升上升 "); LogUtil.info(Name + "复位：读取到新料架：" + CurrShelf.ToStr() + "，顶升上升 ");
} }
...@@ -271,7 +293,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -271,7 +293,11 @@ namespace OnlineStore.DeviceLibrary
if (IsReady()) if (IsReady())
{ {
if (CurrShelf.RealShelf.Equals(CurrTray.realRFID)) if (CurrShelf.RealShelf.Equals(CurrTray.realRFID))
{if (String.IsNullOrEmpty(CurrShelf.XNShelf))
{ {
CurrShelf.XNShelf = CurrTray.rfid;
LogUtil.info(Name + "增加虚拟料架号绑定：" + CurrShelf.ToStr());
}
ShelfPosId = Name + CurrTray.shelfP; ShelfPosId = Name + CurrTray.shelfP;
return true ; return true ;
} }
...@@ -287,14 +313,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,14 +313,16 @@ namespace OnlineStore.DeviceLibrary
{ {
string[] array = CurrTray.usedRfidList.Split(','); string[] array = CurrTray.usedRfidList.Split(',');
//若料架已使用过，直接返回false //若料架已使用过，直接返回false
if (array.Contains(CurrShelf.XNShelf)) if (array.Contains(CurrShelf.RealShelf))
{ {
return false ; return false ;
} }
} }
if (CurrShelf.XNShelf.Equals("")) if (CurrShelf.XNShelf.Equals(""))
{ {
CurrShelf.XNShelf = CurrTray.rfid;
CurrTray.realRFID = CurrShelf.RealShelf; CurrTray.realRFID = CurrShelf.RealShelf;
LogUtil.info(Name + "增加虚拟料架号绑定：" + CurrShelf.ToStr());
ShelfPosId = Name + CurrTray.shelfP; ShelfPosId = Name + CurrTray.shelfP;
return true; return true;
} }
...@@ -335,18 +363,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -335,18 +363,13 @@ namespace OnlineStore.DeviceLibrary
} }
else if (wait.WaitType == 2) else if (wait.WaitType == 2)
{ {
wait.IsEnd = EquipManager.Equip.IOValue(wait.IoType).Equals(wait.IoValue); wait.IsEnd = IOManager.IOValue(wait.IoType).Equals(wait.IoValue);
int timeOutMs = EquipManager.Equip.Config.IOSingle_TimerOut; int timeOutMs = EquipManager.Equip.Config.IOSingle_TimerOut;
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs) if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{ {
ConfigIO io = EquipManager.Equip.Config.getWaitIO(wait.IoType); ConfigIO io = EquipManager.Equip.Config.getWaitIO(wait.IoType);
WarnMsg = Name + "[" + checkmove.MoveType + "][" + checkmove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 "; WarnMsg = Name + "[" + checkmove.MoveType + "][" + checkmove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 ";
if (WarnMsg.Contains("Check_Pos") || WarnMsg.Contains("X03_点检"))
{
WarnMsg = "";
break;
}
alarmType = StoreAlarmType.IoSingleTimeOut; alarmType = StoreAlarmType.IoSingleTimeOut;
LogUtil.error(Name + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14); LogUtil.error(Name + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
...@@ -408,11 +431,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -408,11 +431,6 @@ namespace OnlineStore.DeviceLibrary
{ {
WarnMsg = Name + "[" + checkmove.MoveType + "][" + checkmove.MoveStep + "] 等待超时 [" + NotOkMsg WarnMsg = Name + "[" + checkmove.MoveType + "][" + checkmove.MoveStep + "] 等待超时 [" + NotOkMsg
+ "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
if (WarnMsg.Contains("Check_Pos") || WarnMsg.Contains("X03_点检"))
{
WarnMsg = "";
return;
}
LogUtil.error(WarnMsg, 100); LogUtil.error(WarnMsg, 100);
alarmType = StoreAlarmType.IoSingleTimeOut; alarmType = StoreAlarmType.IoSingleTimeOut;
...@@ -596,7 +614,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -596,7 +614,7 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
CurrShelf = new ShelfInfo(); CurrShelf = new ShelfInfo();
LogUtil.info(logName + " 开始，设置状态=MayEnter"); LogUtil.info(logName + " 开始，清空料架信息，设置状态=MayEnter");
AgvClient.SetStatus(AgvName, "", ClientAction.MayEnter, ClientLevel.High, true); AgvClient.SetStatus(AgvName, "", ClientAction.MayEnter, ClientLevel.High, true);
ProcessShelfEnter = true; ProcessShelfEnter = true;
...@@ -719,7 +737,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -719,7 +737,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
public bool LocationIsDown(StoreMoveInfo moveInfo = null) public bool LocationIsDown()
{ {
if (IOManager.IOValue(DI_LocationCylinder_Up1).Equals(IO_VALUE.LOW) && if (IOManager.IOValue(DI_LocationCylinder_Up1).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(DI_LocationCylinder_Down1).Equals(IO_VALUE.HIGH) && IOManager.IOValue(DI_LocationCylinder_Down1).Equals(IO_VALUE.HIGH) &&
...@@ -731,7 +749,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -731,7 +749,7 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
public bool LocationIsUp(StoreMoveInfo moveInfo = null) public bool LocationIsUp()
{ {
if (IOManager.IOValue(DI_LocationCylinder_Down1).Equals(IO_VALUE.LOW) && if (IOManager.IOValue(DI_LocationCylinder_Down1).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(DI_LocationCylinder_Up1).Equals(IO_VALUE.HIGH) && IOManager.IOValue(DI_LocationCylinder_Up1).Equals(IO_VALUE.HIGH) &&
......
source/DeviceLibrary/mananger/HttpServer.cs
...@@ -179,13 +179,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -179,13 +179,13 @@ namespace OnlineStore.DeviceLibrary
{ {
//getLocation这个接口传入barcode和rfid列表会分配料架 //getLocation这个接口传入barcode和rfid列表会分配料架
TrayInfo tray = new TrayInfo(); TrayInfo tray = new TrayInfo();
string api = "getLocation";
msg = ""; msg = "";
try try
{ {
string url = httpAddr + api + "?barcode=" + barcode + "&rfid=" + currRFID; string api = "getLocation" + "?barcode=" + barcode + "&rfid=" + currRFID;
string url = httpAddr + api;
string logName = "http :URL:" + url + ""; string logName = "http :URL:" + api;
DateTime startTime = DateTime.Now; DateTime startTime = DateTime.Now;
string json = HttpHelper.Post(url, "", 10000); string json = HttpHelper.Post(url, "", 10000);
LogUtil.info(logName + "： Response:" + json + "，耗时【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】"); LogUtil.info(logName + "： Response:" + json + "，耗时【" + FormUtil.GetSpanStr(DateTime.Now - startTime) + "】");
...@@ -213,16 +213,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -213,16 +213,6 @@ namespace OnlineStore.DeviceLibrary
return tray; return tray;
} }
//if (dict.TryGetValue("w", out value))
//{
// switch (value)
// {
// case "7": tray.getP = "p1"; break;
// case "11": tray.getP = "p2"; break;
// case "13": tray.getP = "p3"; break;
// case "15": tray.getP = "p4"; break;
// }
//}
if (dict.TryGetValue("rfidLoc", out value)) if (dict.TryGetValue("rfidLoc", out value))
int.TryParse(value.ToString(), out tray.shelfP); int.TryParse(value.ToString(), out tray.shelfP);
if (dict.TryGetValue("rfid", out value)) if (dict.TryGetValue("rfid", out value))
...@@ -247,12 +237,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -247,12 +237,26 @@ namespace OnlineStore.DeviceLibrary
} }
public class TrayInfo public class TrayInfo
{ {
//public int robotNum = 0; //Response:{"code":0,"msg":"ok","data":{"w":"7","realRfid":"","h":"8","rfid":"1-2F","usedRfidList":"F102","rfidLoc":"11","barcode":"985022*35030377*0822*3000*08220350"}}
//public string getP = ""; /// <summary>
/// 料架位置，1-31
/// </summary>
public int shelfP = 0; public int shelfP = 0;
/// <summary>
/// 虚拟料架号
/// </summary>
public string rfid = ""; public string rfid = "";
/// <summary>
/// 真实料架号
/// </summary>
public string realRFID = ""; public string realRFID = "";
/// <summary>
/// 条码信息
/// </summary>
public string barcode = ""; public string barcode = "";
/// <summary>
/// 已使用的真实料架号
/// </summary>
public string usedRfidList = ""; public string usedRfidList = "";
public string ToStr() public string ToStr()
{ {
......
source/HCSingleStore/FrmEquip.Designer.cs
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.checkBox3 = new System.Windows.Forms.CheckBox(); this.checkBox3 = new System.Windows.Forms.CheckBox();
this.checkBox2 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox();
this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox1 = new System.Windows.Forms.CheckBox();
...@@ -46,7 +48,6 @@ ...@@ -46,7 +48,6 @@
this.button5 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button();
this.lblThisSta = new System.Windows.Forms.Label(); this.lblThisSta = new System.Windows.Forms.Label();
this.chbDebug = new System.Windows.Forms.CheckBox(); this.chbDebug = new System.Windows.Forms.CheckBox();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.AutoCountClient.AxisMoveControl();
this.btnAxisP = new System.Windows.Forms.Button(); this.btnAxisP = new System.Windows.Forms.Button();
...@@ -136,7 +137,6 @@ ...@@ -136,7 +137,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components);
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -198,12 +198,37 @@ ...@@ -198,12 +198,37 @@
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
// //
// lblWarnMsg
//
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(7, 171);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(713, 60);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// chbMoveStop
//
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(886, 204);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 288;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// checkBox3 // checkBox3
// //
this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox3.AutoSize = true; this.checkBox3.AutoSize = true;
this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox3.Location = new System.Drawing.Point(886, 116); this.checkBox3.Location = new System.Drawing.Point(886, 147);
this.checkBox3.Name = "checkBox3"; this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(89, 21); this.checkBox3.Size = new System.Drawing.Size(89, 21);
this.checkBox3.TabIndex = 286; this.checkBox3.TabIndex = 286;
...@@ -216,7 +241,7 @@ ...@@ -216,7 +241,7 @@
this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox2.AutoSize = true; this.checkBox2.AutoSize = true;
this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox2.Location = new System.Drawing.Point(886, 82); this.checkBox2.Location = new System.Drawing.Point(886, 113);
this.checkBox2.Name = "checkBox2"; this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(89, 21); this.checkBox2.Size = new System.Drawing.Size(89, 21);
this.checkBox2.TabIndex = 285; this.checkBox2.TabIndex = 285;
...@@ -229,7 +254,7 @@ ...@@ -229,7 +254,7 @@
this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(886, 48); this.checkBox1.Location = new System.Drawing.Point(886, 79);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(89, 21); this.checkBox1.Size = new System.Drawing.Size(89, 21);
this.checkBox1.TabIndex = 284; this.checkBox1.TabIndex = 284;
...@@ -243,7 +268,7 @@ ...@@ -243,7 +268,7 @@
this.lblMoveEquipInfo.AutoSize = true; this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(687, 18); this.lblMoveEquipInfo.Location = new System.Drawing.Point(834, 11);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17); this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
this.lblMoveEquipInfo.TabIndex = 283; this.lblMoveEquipInfo.TabIndex = 283;
...@@ -251,10 +276,11 @@ ...@@ -251,10 +276,11 @@
// //
// btnS3Reset // btnS3Reset
// //
this.btnS3Reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnS3Reset.BackColor = System.Drawing.Color.White; this.btnS3Reset.BackColor = System.Drawing.Color.White;
this.btnS3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS3Reset.Location = new System.Drawing.Point(549, 185); this.btnS3Reset.Location = new System.Drawing.Point(727, 183);
this.btnS3Reset.Name = "btnS3Reset"; this.btnS3Reset.Name = "btnS3Reset";
this.btnS3Reset.Size = new System.Drawing.Size(132, 39); this.btnS3Reset.Size = new System.Drawing.Size(132, 39);
this.btnS3Reset.TabIndex = 282; this.btnS3Reset.TabIndex = 282;
...@@ -264,10 +290,11 @@ ...@@ -264,10 +290,11 @@
// //
// btnS2Reset // btnS2Reset
// //
this.btnS2Reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnS2Reset.BackColor = System.Drawing.Color.White; this.btnS2Reset.BackColor = System.Drawing.Color.White;
this.btnS2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS2Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS2Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS2Reset.Location = new System.Drawing.Point(411, 185); this.btnS2Reset.Location = new System.Drawing.Point(727, 138);
this.btnS2Reset.Name = "btnS2Reset"; this.btnS2Reset.Name = "btnS2Reset";
this.btnS2Reset.Size = new System.Drawing.Size(132, 39); this.btnS2Reset.Size = new System.Drawing.Size(132, 39);
this.btnS2Reset.TabIndex = 281; this.btnS2Reset.TabIndex = 281;
...@@ -277,10 +304,11 @@ ...@@ -277,10 +304,11 @@
// //
// btnS1Reset // btnS1Reset
// //
this.btnS1Reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnS1Reset.BackColor = System.Drawing.Color.White; this.btnS1Reset.BackColor = System.Drawing.Color.White;
this.btnS1Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS1Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS1Reset.Location = new System.Drawing.Point(273, 185); this.btnS1Reset.Location = new System.Drawing.Point(727, 93);
this.btnS1Reset.Name = "btnS1Reset"; this.btnS1Reset.Name = "btnS1Reset";
this.btnS1Reset.Size = new System.Drawing.Size(132, 39); this.btnS1Reset.Size = new System.Drawing.Size(132, 39);
this.btnS1Reset.TabIndex = 280; this.btnS1Reset.TabIndex = 280;
...@@ -290,10 +318,11 @@ ...@@ -290,10 +318,11 @@
// //
// btnClearDoor // btnClearDoor
// //
this.btnClearDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearDoor.BackColor = System.Drawing.Color.White; this.btnClearDoor.BackColor = System.Drawing.Color.White;
this.btnClearDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClearDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearDoor.Location = new System.Drawing.Point(135, 185); this.btnClearDoor.Location = new System.Drawing.Point(727, 48);
this.btnClearDoor.Name = "btnClearDoor"; this.btnClearDoor.Name = "btnClearDoor";
this.btnClearDoor.Size = new System.Drawing.Size(132, 39); this.btnClearDoor.Size = new System.Drawing.Size(132, 39);
this.btnClearDoor.TabIndex = 279; this.btnClearDoor.TabIndex = 279;
...@@ -307,9 +336,9 @@ ...@@ -307,9 +336,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(4, 232); this.logBox.Location = new System.Drawing.Point(4, 236);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(978, 356); this.logBox.Size = new System.Drawing.Size(978, 343);
this.logBox.TabIndex = 278; this.logBox.TabIndex = 278;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -335,7 +364,7 @@ ...@@ -335,7 +364,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(6, 448); this.groupBox2.Location = new System.Drawing.Point(6, 439);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(972, 78); this.groupBox2.Size = new System.Drawing.Size(972, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -419,7 +448,7 @@ ...@@ -419,7 +448,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(886, 11); this.chbDebug.Location = new System.Drawing.Point(886, 42);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -427,18 +456,6 @@ ...@@ -427,18 +456,6 @@
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged); this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
// //
// lblWarnMsg
//
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(343, 48);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(534, 125);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// tabPage3 // tabPage3
// //
this.tabPage3.Controls.Add(this.axisMoveControl1); this.tabPage3.Controls.Add(this.axisMoveControl1);
...@@ -447,9 +464,9 @@ ...@@ -447,9 +464,9 @@
this.tabPage3.Controls.Add(this.btnUpdown); this.tabPage3.Controls.Add(this.btnUpdown);
this.tabPage3.Controls.Add(this.btnAxisOn); this.tabPage3.Controls.Add(this.btnAxisOn);
this.tabPage3.Controls.Add(this.btnAxisOff); this.tabPage3.Controls.Add(this.btnAxisOff);
this.tabPage3.Location = new System.Drawing.Point(4, 29); this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(988, 594); this.tabPage3.Size = new System.Drawing.Size(988, 597);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位调试 "; this.tabPage3.Text = " 库位调试 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -1508,18 +1525,6 @@ ...@@ -1508,18 +1525,6 @@
// //
this.timer2.Interval = 1000; this.timer2.Interval = 1000;
// //
// chbMoveStop
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(29, 192);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 288;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
//
// FrmEquip // FrmEquip
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
......
source/HCSingleStore/FrmEquip.cs
...@@ -345,10 +345,11 @@ namespace OnlineStore.ACSingleStore ...@@ -345,10 +345,11 @@ namespace OnlineStore.ACSingleStore
private int GetV(int currV, TextBox text, ref bool needUpdate) private int GetV(int currV, TextBox text, ref bool needUpdate)
{ {
if (currV != FormUtil.GetIntValue(text)) int targetV = FormUtil.GetIntValue(text);
if (currV != targetV)
{ {
needUpdate = true; needUpdate = true;
return FormUtil.GetIntValue(txtMiddleP1); return targetV;
} }
return currV; return currV;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!