Ver código fonte

调试修改

master
pry 2 anos atrás
pai
commit
d585a649fa
2 arquivos alterados com 5 adições e 6 exclusões
  1. +3
    -3
      HBLConsole.Factory/SimpleFactory.cs
  2. +2
    -3
      HBLConsole.MORKD/Control_MORKD.cs

+ 3
- 3
HBLConsole.Factory/SimpleFactory.cs Ver arquivo

@@ -15,7 +15,7 @@ namespace HBLConsole.Factory

private volatile static SimpleFactory _Instance;
public static SimpleFactory GetInstance => _Instance ?? (_Instance = new SimpleFactory());
private SimpleFactory() { }
private SimpleFactory() { ActionOperate.GetInstance.Register(new Action(() => { GetInterfaceData(); }), "ResetProgram"); }

public AbstractMessageServer GetAbsMessageServer => _GetAbsMessageServer ?? (_GetAbsMessageServer = GetAbstractMessageServer());
private AbstractMessageServer _GetAbsMessageServer;
@@ -112,11 +112,11 @@ namespace HBLConsole.Factory
{
foreach (var inters in interfaces)
{
if (inters.Name.Equals("IGvl") && GVL == null)
if (inters.Name.Equals("IGvl"))
{
GVL = (item.GetValue(control)) as IGvl;
}
else if (inters.Name.Equals("IAlarm") && Alarm == null)
else if (inters.Name.Equals("IAlarm"))
{
Alarm = (item.GetValue(control)) as IAlarm;
}


+ 2
- 3
HBLConsole.MORKD/Control_MORKD.cs Ver arquivo

@@ -56,7 +56,6 @@ namespace HBLConsole.MORKD
public void Init()
{
ActionOperate.GetInstance.Register(new Action(() => { mORKD.InitControl(); }), "InitCommand");

}

bool Initing = false;
@@ -76,6 +75,7 @@ namespace HBLConsole.MORKD
{
mORKD = null;
mORKD = new GVL_MORKD();
ActionOperate.GetInstance.Send("ResetProgram");
ReadData();
Main();
}));
@@ -141,7 +141,6 @@ namespace HBLConsole.MORKD
mORKD.TakeSoupComplete = bools[27];
mORKD.PutNoodleTakeMealComplete = bools[28];
Initing = bools[29];
if (Initing) MessageLog.GetInstance.Show("初始化中.....");
}));


@@ -346,7 +345,7 @@ namespace HBLConsole.MORKD
{
if (mORKD.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
{
mORKD.RBTakeNoodleStart((ushort)(loc + 1), orderLocInfo.Loc);
//mORKD.RBTakeNoodleStart((ushort)(loc + 1), orderLocInfo.Loc);
mORKD.CookNodelId[loc] = orderLocInfo.SuborderId;
SimpleFactory.GetInstance.OrderChanged(orderLocInfo.SuborderId, ORDER_STATUS.COOKING);
MessageLog.GetInstance.Show($"订单【{orderLocInfo.SuborderId}】,煮面栏:[{loc + 1}]");


Carregando…
Cancelar
Salvar