diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs index 41b79d33..0ff27a13 100644 --- a/BPASmartClient.MorkF/Control_MorkF.cs +++ b/BPASmartClient.MorkF/Control_MorkF.cs @@ -319,25 +319,6 @@ namespace BPASmartClient.MorkF /// private void InitialData() { - ////模拟流程 - //if (stirFryBom.StirFryActions.Count > 0) - //{ - // stirFryBom.StirFryActions.Clear(); - //} - ////流程 - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T1, RobotActions = new List() { StirFryRobotAction.清洗槽取锅 } }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T2, PotActions = new List() { StirFryPotAction.停止火力 }, During = 3 }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T3, PotActions = new List() { StirFryPotAction.加油, StirFryPotAction.停止火力 }, During = 3 }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T4, PotActions = new List() { StirFryPotAction.搅拌臂下位, StirFryPotAction.停止火力, StirFryPotAction.低速旋转 }, During = 15 }); - - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, RobotActions = new List() { StirFryRobotAction.加入A料, }, PotActions = new List() { StirFryPotAction.停止旋转 } }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List() { StirFryPotAction.快速旋转, StirFryPotAction.停止火力 }, During = 5 }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, RobotActions = new List() { StirFryRobotAction.加入B料, }, PotActions = new List() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转 } }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T8, PotActions = new List() { StirFryPotAction.快速旋转, StirFryPotAction.停止火力 }, During = 5 }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T9, RobotActions = new List() { StirFryRobotAction.加入C料, }, PotActions = new List() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转 } }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T10, PotActions = new List() { StirFryPotAction.快速旋转, StirFryPotAction.停止火力 }, During = 3 }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T11, PotActions = new List() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } }); - //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T12, RobotActions = new List() { StirFryRobotAction.灶取锅 } }); //队列 string subId = Guid.NewGuid().ToString(); morkF.TakeMaterialQueue.Enqueue(new OrderLocInfo() { SuborderId = subId, MaterialLoc = 1 });//A料 diff --git a/BPASmartClient.MorkM/Control_MORKM.cs b/BPASmartClient.MorkM/Control_MORKM.cs index c521ac8a..1eaca3d7 100644 --- a/BPASmartClient.MorkM/Control_MORKM.cs +++ b/BPASmartClient.MorkM/Control_MORKM.cs @@ -52,6 +52,13 @@ namespace BPASmartClient.MorkM DeviceProcessLogShow($"添加订单：碗位置【{item}】"); } } + //手动供碗 调试用 + mORKS.TakeBowlTask.Enqueue(new OrderLocInfo() + { + Loc = 11, + SuborderId = subId, + MakeType = false + }) ; mORKS.DishNumber = orders.Count;//订单中配菜的数量 while (orders.Count > 0) { @@ -153,7 +160,7 @@ namespace BPASmartClient.MorkM List locs = new List(); foreach (var item in order.MorkOrder.GoodBatchings) { - var res = Json.Data.orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId); + var res =orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId); if (res != null) { if (ushort.TryParse(res.BatchingLoc, out ushort loc)) @@ -175,7 +182,8 @@ namespace BPASmartClient.MorkM { Loc = 11, SuborderId = order.MorkOrder.SuborderId, - RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0 + RecipeNumber = (index >= 1 && index <= 10) ? (ushort)index : (ushort)0, + MakeType = order.MorkOrder.MakeID == "2" }); } } @@ -293,7 +301,7 @@ namespace BPASmartClient.MorkM //正常轮询 if (mORKS.TurntableMoveInPlace && !mORKS.Feeding && mORKS.InitComplete && !mORKS.AllowTakeNoodle && mORKS.RBTakeNoodleTask.Count > 0) { - var result = Json.Data.orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList(); + var result = orderMaterialDelivery.BatchingInfo.Where(p => p.BatchingId == mORKS.RBTakeNoodleTask.ElementAt(0).BatchingId).ToList(); if (result != null) { var res = result.FirstOrDefault(P => P.BatchingLoc == mORKS.TurntableFeedbackloc.ToString()); diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config index 4e21d83c..fc532a83 100644 --- a/BPASmartClient/App.config +++ b/BPASmartClient/App.config @@ -7,14 +7,14 @@ - + - + diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml index 1f9d47ea..4fae7d09 100644 --- a/BPASmartClient/DeviceInfo.xml +++ b/BPASmartClient/DeviceInfo.xml @@ -61,7 +61,7 @@ -->--> - + diff --git a/BPASmartClient/MainWindow.xaml.cs b/BPASmartClient/MainWindow.xaml.cs index fbb18705..b03cc4ec 100644 --- a/BPASmartClient/MainWindow.xaml.cs +++ b/BPASmartClient/MainWindow.xaml.cs @@ -252,8 +252,8 @@ namespace BPASmartClient if (sender is MenuItem) { // Type type = Assembly.Load("BPASmartClient.MorkT").GetType("BPASmartClient.MorkT.View.DebugView"); - Type type = Assembly.Load("BPASmartClient.MorkF").GetType("BPASmartClient.MorkF.View.DebugView"); - //Type type = Assembly.Load("BPASmartClient.MorkM").GetType("BPASmartClient.MorkM.View.DebugView"); + // Type type = Assembly.Load("BPASmartClient.MorkF").GetType("BPASmartClient.MorkF.View.DebugView"); + Type type = Assembly.Load("BPASmartClient.MorkM").GetType("BPASmartClient.MorkM.View.DebugView"); ConstructorInfo cti = type.GetConstructor(System.Type.EmptyTypes); contentRegion.Content = (FrameworkElement)cti.Invoke(null); Title.Text = (sender as MenuItem).Header?.ToString() + "界面";