Commit 05bc49c6 LN

有入库信息时发入库状态给客户端

1 个父辈 07604b40
...@@ -259,6 +259,19 @@ namespace OnlineStore.ACSingleStore ...@@ -259,6 +259,19 @@ namespace OnlineStore.ACSingleStore
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]"; lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]";
} }
if (lblWarnMsg.Text.Equals(""))
{
List<string> list = new List<string>(LineConnect.WaitInStoreList);
if (list.Count > 0)
{
string msg = "等待入库:";
foreach (string s in list)
{
msg += s + "\t";
}
lblWarnMsg.Text = msg;
}
}
if (store.autoNext) if (store.autoNext)
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
......
...@@ -1561,9 +1561,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1561,9 +1561,9 @@ namespace OnlineStore.DeviceLibrary
if (boxStatus.status.Equals((int)StoreStatus.StoreOnline)) if (boxStatus.status.Equals((int)StoreStatus.StoreOnline))
{ {
List<string> list = new List<string>(LineConnect.WaitInStoreList); List<string> list = new List<string>(LineConnect.WaitInStoreList);
if (list.Count > 0) if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false)))
{ {
boxStatus.status=(int)StoreStatus.InStoreExecute; boxStatus.status = (int)StoreStatus.InStoreExecute;
} }
} }
......
...@@ -57,6 +57,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -57,6 +57,7 @@ namespace OnlineStore.DeviceLibrary
{ {
store.Cmd = cmd_heart; store.Cmd = cmd_heart;
string heartMsg = ToParamStr(store); string heartMsg = ToParamStr(store);
client.send(heartMsg); client.send(heartMsg);
} catch (Exception ex) } catch (Exception ex)
{ {
...@@ -133,10 +134,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -133,10 +134,15 @@ namespace OnlineStore.DeviceLibrary
else if (cmd.Equals(cmd_checStartIn)) else if (cmd.Equals(cmd_checStartIn))
{ {
LogUtil.info("收到流水线入库库位验证消息:" + message); LogUtil.info("收到流水线入库库位验证消息:" + message);
if (LineConnect.WaitInStoreList.Contains(reviceInfo.PosId))
{
LogUtil.error(" LineConnect.WaitInStoreList已存在库位【" + reviceInfo.PosId + "】先移除在验证");
LineConnect.WaitInStoreList.Remove(reviceInfo.PosId);
}
bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode); bool result = StoreManager.Store.ReviceLineCheckInStoreCMD(reviceInfo.PosId, reviceInfo.PlateH, reviceInfo.PlateW, reviceInfo.WareCode);
if (result) if (result)
{ {
LineConnect.WaitInStoreList.Add(reviceInfo.PosId); LineConnect.WaitInStoreList.Add(reviceInfo.PosId);
} }
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!