Pārlūkot izejas kodu

修改morkT参数

样式分支
pengliangyang pirms 2 gadiem
vecāks
revīzija
a86ecdd647
8 mainītis faili ar 20 papildinājumiem un 35 dzēšanām
  1. +1
    -1
      BPASmartClient.IceMaker/IceMakerMachine.cs
  2. +0
    -17
      BPASmartClient.IceMaker/IceMakerStatus.cs
  3. +1
    -4
      BPASmartClient.MorkF/Control_MorkF.cs
  4. +0
    -2
      BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs
  5. +9
    -9
      BPASmartClient.MorkT_Container/Control_MorkT_Container.cs
  6. +0
    -1
      BPASmartClient.MorkT_Container/GVL_MorkT.cs
  7. +1
    -1
      BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs
  8. +8
    -0
      BPASmartClient.ViewModel/OrderListDialogViewModel.cs

+ 1
- 1
BPASmartClient.IceMaker/IceMakerMachine.cs Parādīt failu

@@ -5,7 +5,7 @@ using BPASmartClient.Peripheral;
using BPASmartClient.SerialPort;
using static BPASmartClient.EventBus.EventBus;

namespace BPASmartClient.Icemoker
namespace BPASmartClient.IceMaker
{
public class IceMakerMachine : BasePeripheral
{


+ 0
- 17
BPASmartClient.IceMaker/IceMakerStatus.cs Parādīt failu

@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BPASmartClient.IceMaker
{
public enum IceMakerStatus
{
关机状态=0x01,
制冰状态=0x02,
电机故障=0x04,
缺水=0x08,
冰满=0x16
}
}

+ 1
- 4
BPASmartClient.MorkF/Control_MorkF.cs Parādīt failu

@@ -522,11 +522,8 @@ namespace BPASmartClient.MorkF
}
}
}
}
}
});

}

private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)


+ 0
- 2
BPASmartClient.MorkT_BarCounter/GVL_MorkT.cs Parādīt failu

@@ -7,8 +7,6 @@ using BPASmartClient.Device;
using System.Collections.Concurrent;
using BPASmartClient.LebaiRobot;
using BPASmartClient.DRCoffee;
using BPASmartClient.IceMaker;

namespace BPASmartClient.MorkT_BarCounter
{
public class GVL_MorkT : IStatus


+ 9
- 9
BPASmartClient.MorkT_Container/Control_MorkT_Container.cs Parādīt failu

@@ -198,7 +198,7 @@ namespace BPASmartClient.MorkT_Container
bFirstTrig_Coffee = true;
delayTimeOut_Coffee = DateTime.Now;
}
else if (DateTime.Now.Subtract(delayTimeOut_Coffee).TotalSeconds > 18 && bFirstTrig_Coffee == true)
else if (DateTime.Now.Subtract(delayTimeOut_Coffee).TotalSeconds > 180 && bFirstTrig_Coffee == true)
{
DeviceProcessLogShow("接咖啡超时,接咖啡结束,等待取咖啡");
bFirstTrig_Coffee = false;
@@ -231,7 +231,7 @@ namespace BPASmartClient.MorkT_Container
bFirstTrig_Juice = true;
delayTimeOut_Juice = DateTime.Now;
}
else if (DateTime.Now.Subtract(delayTimeOut_Juice).TotalSeconds > 3 && bFirstTrig_Juice == true)
else if (DateTime.Now.Subtract(delayTimeOut_Juice).TotalSeconds > 15 && bFirstTrig_Juice == true)
{
DeviceProcessLogShow("接果汁超时,接果汁结束,等待取果汁");
bFirstTrig_Juice = false;
@@ -246,7 +246,7 @@ namespace BPASmartClient.MorkT_Container
bFirstTrig_TeaWater = true;
delayTimeOut_Water = DateTime.Now;//开启接水信号后,记录当前时间
}
else if (DateTime.Now.Subtract(delayTimeOut_Water).TotalSeconds >= 5 && bFirstTrig_TeaWater == true)//接水超过50s后,启动接水完成标志,开启接水程序
else if (DateTime.Now.Subtract(delayTimeOut_Water).TotalSeconds >= 50 && bFirstTrig_TeaWater == true)//接水超过50s后,启动接水完成标志,开启接水程序
{
DeviceProcessLogShow("接茶或水延迟时间结束");
bFirstTrig_TeaWater = false;
@@ -329,7 +329,7 @@ namespace BPASmartClient.MorkT_Container
/// 判断是否有咖啡订单
/// </summary>
/// <returns></returns>
private bool IsMakeCoffee()
private bool IsMakeCoffee()
{
bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesCoffee.Count > 0 && !morkTLebaiJC.IsHaveCoffeeCup) ? true : false;
return bMake;
@@ -340,7 +340,7 @@ namespace BPASmartClient.MorkT_Container
/// <returns></returns>
private bool IsMakeJuice()
{
bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesJuicer.Count > 0 && !morkTLebaiJC.IsHaveJuiceCup) ? true : false;
bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesJuicer.Count > 0 && !morkTLebaiJC.IsHaveJuiceCup) ? true : false;
return bMake;
}
/// <summary>
@@ -490,7 +490,7 @@ namespace BPASmartClient.MorkT_Container
outCupCheck = false;
OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
int resultTakeCup = takeCup();
if (resultTakeCup == 1 || true)
if (resultTakeCup == 1)
{
new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
Sence(GVL_MorkT.机器人安全位);
@@ -549,7 +549,7 @@ namespace BPASmartClient.MorkT_Container
{
OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
int resultTakeCup = takeCup();
if (resultTakeCup == 1 || true)
if (resultTakeCup == 1)
{
new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
Sence(GVL_MorkT.接开水);
@@ -587,7 +587,7 @@ namespace BPASmartClient.MorkT_Container
{
OrderChange(morkTLebaiJC.morkOrderPushesTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
int resultTakeCup = takeCup();
if (resultTakeCup == 1 || true)
if (resultTakeCup == 1)
{
DeviceProcessLogShow("取茶杯完成");
new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
@@ -688,7 +688,7 @@ namespace BPASmartClient.MorkT_Container
OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
int resultTakeCup = takeCup();
JuiceCH = morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).Loc;
if (resultTakeCup == 1 ||true )
if (resultTakeCup == 1)
{
getIce();
new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();


+ 0
- 1
BPASmartClient.MorkT_Container/GVL_MorkT.cs Parādīt failu

@@ -7,7 +7,6 @@ using BPASmartClient.Device;
using System.Collections.Concurrent;
using BPASmartClient.LebaiRobot;
using BPASmartClient.DRCoffee;
using BPASmartClient.IceMaker;

namespace BPASmartClient.MorkT_Container
{


+ 1
- 1
BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs Parādīt failu

@@ -208,7 +208,7 @@ namespace BPASmartClient.MorkT_Container.ViewModel;
}
private void IceMaker_BtnSetIceTimeCommand()
{
new SetIceNumber{ Value= IceMaker_IceTime }.Publish();
new SetIceNumber{ Value= IceMaker_IceTime * 0.1 }.Publish();
}
#endregion
#region 咖啡机


+ 8
- 0
BPASmartClient.ViewModel/OrderListDialogViewModel.cs Parādīt failu

@@ -88,6 +88,14 @@ namespace BPASmartClient.ViewModel
IsAllSelect = item.IsAllSelect,
morkOrderPushes = morkOrders,
});
/*
foreach (var mo in morkOrders)
{
DoOrderEvent de = new DoOrderEvent();
de.DeviceId = int.Parse(item.DeviceId);
de.MorkOrder = mo.OrderPush;
EventBus.EventBus.GetInstance().Publish(de);
}*/
}
}
WeakReferenceMessenger.Default.Send("true", "Close");


Notiek ielāde…
Atcelt
Saglabāt