|
@@ -273,7 +273,7 @@ namespace BPASmartClient.MorkS |
|
|
if (order.MorkOrder.GoodBatchings == null) return; |
|
|
if (order.MorkOrder.GoodBatchings == null) return; |
|
|
OrderCount++; |
|
|
OrderCount++; |
|
|
OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT); |
|
|
OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT); |
|
|
DeviceProcessLogShow($"接收到{OrderCount}次订单"); |
|
|
|
|
|
|
|
|
DeviceProcessLogShow($"接收到{OrderCount}次订单,订单ID:{order.MorkOrder.SuborderId}"); |
|
|
foreach (var item in order.MorkOrder.GoodBatchings) |
|
|
foreach (var item in order.MorkOrder.GoodBatchings) |
|
|
{ |
|
|
{ |
|
|
var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId); |
|
|
var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId); |
|
@@ -556,7 +556,7 @@ namespace BPASmartClient.MorkS |
|
|
DeviceProcessLogShow("取餐过程中复位出餐完成信号"); |
|
|
DeviceProcessLogShow("取餐过程中复位出餐完成信号"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(mORKS.OutMealId)) OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE); |
|
|
mORKS.OutMealId = mORKS.IngredientsCompleteId; |
|
|
mORKS.OutMealId = mORKS.IngredientsCompleteId; |
|
|
mORKS.OutMealName = mORKS.IngredientsCompleteName; |
|
|
mORKS.OutMealName = mORKS.IngredientsCompleteName; |
|
|
mORKS.IngredientsCompleteId = string.Empty; |
|
|
mORKS.IngredientsCompleteId = string.Empty; |
|
@@ -596,7 +596,7 @@ namespace BPASmartClient.MorkS |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//取餐完成逻辑处理 |
|
|
//取餐完成逻辑处理 |
|
|
if (Delay.GetInstance("CompleteChange1").Start(mORKS.CookCompleteFlatBit && !mORKS.TakeMealDetect, 1)) |
|
|
|
|
|
|
|
|
if (Delay.GetInstance("CompleteChange1").Start( !mORKS.TakeMealDetect, 1)&&mORKS.CookCompleteFlatBit == true) |
|
|
{ |
|
|
{ |
|
|
OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE); |
|
|
OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE); |
|
|
DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成"); |
|
|
DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成"); |
|
@@ -802,12 +802,15 @@ namespace BPASmartClient.MorkS |
|
|
if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5) |
|
|
if (msm.NoodleLoc >= 1 && msm.NoodleLoc <= 5) |
|
|
{ |
|
|
{ |
|
|
mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid }); |
|
|
mORKS.RBTakeNoodleTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.NoodleLoc, SuborderId = guid }); |
|
|
|
|
|
MessageLog.GetInstance.Show($"添加订单:面条位置【{(ushort)msm.NoodleLoc}】"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (msm.Bowloc >= 10 && msm.Bowloc <= 11) |
|
|
if (msm.Bowloc >= 10 && msm.Bowloc <= 11) |
|
|
{ |
|
|
{ |
|
|
mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid }); |
|
|
mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() { Loc = (ushort)msm.Bowloc, SuborderId = guid }); |
|
|
|
|
|
MessageLog.GetInstance.Show($"添加订单:碗位置【{(ushort)msm.Bowloc}】"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|