fxSO$Bv7w%E^l
z1SH<~`K9UU(MEiZ2hf>2zYx=50me}B2yS@B8Nq7r-r#A62>rpo%w8PcmlNAA%2=$}
z?)aZtA0^}Zar+*=C-n(?36P}ll+M{_+9V#DFAv})63ga*=d0(hK88894Vc+Y!c$++
zg!lp3!KQfsW4OvT?Ewc>>L@(zxdaC5jb^s
z`LH=9EBBv#L^-OJ^6^A0S;@Jr>+JGhW5>8W#xZ7)tZ5btC`HR$DVMklv5{zoiwlp`
zFD-9?_J9YzW_mF
3gwmQ*NYC%unda*`P20M(fjuIxsK#yV8U+Onh
zSaFL_1uHbnl(1gXuAX_gdnh!xAsP3ln;`lsvG#*xW&Y9o_dpko&5_0CXzPI4R)tv$
z$SAD{K+}XT^J&=h7BCw(g#cvA_KWzJ20n8IFVL-g)r4!m+86&e+n7%CpCZcEe-|{>
z1|(-qRlrQlVTT!3<|nx-HN^`7->>8mrakX0o>)r&XcGs#-yR$7I8i#=b$+Z=o>b2OIObRiswJh5+BOY
z0SEVpUNYQd0>1L|57Ps3`wlUwp^CL(fww@+l&zxHw>0MwNbUsFiIH2Dk9$s|$$&&w
zjJFBk5oJTvBn7_wk_%{+6vBG%9yuSwwrOMv+C-+be)TqmA?ky
zDK}q$>gdpkJMAn(Xtcm=&E|KrG|+k_8>I`M59{wR=AyVreF3m4VoDB|w!PpD>xCuh
zA8w$?r_)bv7+0A{8&oLX3glM;K@VDjwVX+{KDg@K
zAq%K5lUV-OVVefVNL74?TY>bg2|?gMSoC|-V5>uz$*
zSs*H)y=wmL?q7+2`dO#%Sdj23edP7Kg6)PJb6#;BAcRBJAAA=OFI%xbA^~q=PTv+(
zYKzax@1yGR?_?f1{OW@%6KMFO;({*H>#)?}d&h__qY=Ew9
z#%{6rCttu~@&y}>3%^=tv?MXz0P*|{<`eZ*$hKaZ>TT^oalL0twYJ887(7Spm4i&r
z*k>)%5#!2>4KUESl(_OS!n5B{DyRI{KV79x*{>SzEZD?K4Tl##rZZoUP(w`;#SD?>hkt+lyP1hx^
z&ROZB@nP=4WusH>FP5BAiHS3M!BZ4eek%>21Z3Cqy=E^X`PWms@x|IqxDn3R*CYZ;
zFMQs~(Y9IBxH17XaM;sj64GDOeJ2e-li@uG+f_Jlmgq^yIUP_J)`;wSgf1&!V-#x0
zAVcvazpv23G34!*?!8pV2Z9H6<=(T7i0Xu3=<{-`ZSWz9v
z)axoj!;vfm!Z%gHYvr@$xb_+xSMq?Nixiwz7&uz}r;O#DXb1$tSnTC<
zw|+|uw6?GToX0_@611CaLMR9X%}+7@CRGDi`iy`ImX?9wmHh6EN*3~BOFv0tu?J3!
z_|7LF(9=?*kW*{Utr6TI2CR9BiePLl`I_s-a~@>i;hX~WA1S<0wy>60BVuYu@yQui
zHMN9)dqb>WM(5rue&7F?XeOQGfPV-bogj>V`v0_W=J8DUe;i+5I!J3RDU6b@N+l6;
z#n&jL134N)t{jbWt?)%zq(f$rj_(|8BDQH}gdBy4uShu;L$1au#}ty^d%xfB?>!#d
z=l%Y?kJtP8{ya8^UhK23Gqk!oJf{8nXjk7B6SUWbw%H*NmVvoCMeC;H1!{%eoA(c+
zy=p*yqEd?bHN9CuRk0xg32?>W#^og7wOnMV{oDYiPwis!a+exJ&Rer9OK9~4{28Nw
zk>qW9?idil$WYFi5`~@ZtJW^Ca%X16p5~k!oA8?2;`za>_x8Y}pB>uJUUHbX_gU)F
z)%dGV$nc3$o}k+gx_*_9hYZj0)@~Z+@V4Ho~$<{5j
z`6OZ3m%prmG0KLg6z8u~L7tK@^uqd#io)*3tggMeIPmT1jrX6WvUnSN;hIn_xW8`D
z_I`BYH?@?3XKA`Rv-a6`D)|1ue2=(25cE2d=9JPx58H3MqefLcjf(Rc1We^dHh
zZcb(Kp_w^i?7MtTf<*;1PR!xk;tXy4az1T^BYmy=o?}zDd&c=HRRgt}EbBUK2x47C
zwv$mncy>hbjQ;;1$tcAxDYb~p^Hfc)29MlI>=ph)c2bR~q~>K^2%>tCpqiSUEK4W5
znv4npZ~$KjbJPmM*2U*>w^ZSPfr6nOo%xP|OFo7j9zeISgxgEHzssK%q}{Ktz7LZ$
zsBM?22IZ14wo!l&%M0S_5_v#n(d8K$KW(E2h-=W;QxUao8f9kv@uK1TMvtX%aYM-o
zNoxQ4ZVzkC@~(X%xbx!%R?EM7EnnzJRTq_EsFOA^8m@|EVE<7ipXdXZBPhEHNwTEi
zAmKO=-|S4%uU&V8w#w^R(-s!}s=}d^mXLJR$BC3<8z-{3)fPKe?KNm>_x2!(j9G)k
zURcoBcAL$g?2uGisu(&tRDnH{9`1+W9(hW1>#VN#raVnjyyzj`W-im*bx%@y%x;-&
zbPLk`n7OhR#M(0yFG`6npjD=Wj9zPK#rZ4;U@qv;t-?rC{b&amzSP&sV?+gYVGC;i
za$SBbRARvHRBSZ8?*6q4uA|y8EvflNYhSzt?mT_3X~eJPuy^SGhfZA|sCrB)}~ZRS`!fH1`GcBz}>q3dt(-#iom
zQP>`?pWl$WmX|ZVoZS-BUN*Aszw)+GvWBYt=i|w&K#Ww_s=E>7wr!+2iUvuMbj8?Cm%?1uWX%-1gP~H>KXZ5aTj?&ORj@TuK_fPIbkmL(4(BzFNeG0R
za5*EV4R(66WO>%Ao0qSw=>8$~-9I-uqxQrT-UB+!9I`2YC@Ik^bc(S(EOBl*yh4-W
z-vl%>DsmzVa;jehLSn?@g%b~TU%Z(?am2GoK9n_s;bHROQx|^nYJ*o9KnFy)4Hxo%pOZmn6EI2<
zyONo$B~~Wv?>^di@t&bU-(}@@+u{1mlb4Cx6;6+ah6`E>QLdm&I(Z1W|K5p(p1C5m!WVplNpwHmw#4@Nl6h
z;hgQ62>)Mtaf~`DWW|;6xvC-jlt^`}534j4NAQIdWRRv56I@%zKB!w560^o8PeC`n
zNATkB!INd*o~@eX^boyiQKpjOR^NJLtf-?VCvXnCgQj2Wo&KDL5xG-1_I>^phbp~2
z0Q(I#O+?$8t36LO>Yy@#YuDb{h=
zhJ$uvvTuA?jHz`eAh4o>HnjsWwNO~s@f7n)4p^{Rwi%ToH-YYQq!Qf1?!-6Cj=t|+
zdWVd>j;Y{GDuCN+fup8R2!b}$4Ks^Y{L|sYvO4#*VC|5&u0DSaZlY#jJ*19y@Hbsa
z{HB6Z(wzLx_R-M#XSoDj$^6{wUs*b_3g=_iM2*b$s(STWOOQ?P&v(6RKNRq>Jg)we
z7^Iw*?bASZ?A<<+)GiPPG3B5X-Ut}DZ+qlphzs3lGVC#QW#jLo9Z`|bL4`dCo5??J
zQ|f_#)UaO<@he9s)thXDjdd%(fg@ZUVGm|)FElggN7@JRF6vo(v+oz%-Tfbb>bj>>
zhU^$`N+5irR{FufSn!J?3Ruo29ifj^01}byl!Dri#vtGKSpp@KfnTT|0hL=WMYp1`%jcQKWX(x=fD_bJA71vR2;(%2yeLaDis5
z@pB!~o80Z!0i1vE=Jc188RK064CSGyR|^g;C8A9*GF;Qsa!FD1^Uy03KS#LQk9iRn
zL>pLYizvt3zFywvxL3Thz)*#Ff>yNQ_LOD6XDbW*6>;}7TpT#KMtyzal9{vecrF1ZG*l!%DKW9k=FHr7kiwaA
zk?=I8f9~VX`mSrg>)=(50n?mtm|6xJ_n8s=TzpjbxR9t;Xln^OpK&k#en{ywRAn2F
znP+tG6>-7n99siVrV|37lVjY-(P
z>Hidy&f_JIocpBcCFWWbC{Cez(s_RduIKb1^xrFPXq~c%pp`+BZ%*tvkF=+s
public abstract void ResetProgram();
+ ///
+ /// 模拟订单
+ ///
+ public abstract void SimOrder();
+
public object GetError()
{
return new { data = Error };
diff --git a/BPASmartClient.Model/订单/MorksSimorderModel.cs b/BPASmartClient.Model/订单/MorksSimorderModel.cs
new file mode 100644
index 00000000..0e23f1aa
--- /dev/null
+++ b/BPASmartClient.Model/订单/MorksSimorderModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.Model
+{
+ public class MorksSimorderModel : BaseEvent
+ {
+ public int NoodleLoc { get; set; }
+ public int Bowloc { get; set; }
+ }
+}
diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 290e39d4..fa36d990 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -339,7 +339,7 @@ namespace BPASmartClient.MorkF
{
if (order.MorkOrder.GoodBatchings == null) return;
OrderCount++;
- DeviceProcessLogShow($"接收到{OrderCount}次订单");
+ DeviceProcessLogShow($"接收到{OrderCount}次订单");
foreach (var item in order.MorkOrder.GoodBatchings)
{
var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
@@ -405,7 +405,7 @@ namespace BPASmartClient.MorkF
morkF.listStirBom.RemoveAt(0);
foreach (var res in bom.StirFryActions)
{
- DeviceProcessLogShow($"执行流程{res.Time}");
+ DeviceProcessLogShow($"执行流程{res.Time}");
//机器人线程
Task taskRobot = Task.Run(new Action(() =>
{
@@ -524,7 +524,7 @@ namespace BPASmartClient.MorkF
morkF.listStirBom.RemoveAt(0);
foreach (var res in bom.StirFryActions)//遍历所有流程
{
- DeviceProcessLogShow($"执行流程{res.Time}");
+ DeviceProcessLogShow($"执行流程{res.Time}");
//机器人线程
Task taskRobot = Task.Run(new Action(() =>
{
@@ -718,7 +718,7 @@ namespace BPASmartClient.MorkF
morkF.MainOutMealComplete = false;
morkF.MinorOutMealComplete = false;
// OrderChange(morkF.CurrentOrderId, ORDER_STATUS.COOKING);
- DeviceProcessLogShow($"订单【{order.SuborderId}】执行取碗控制");
+ DeviceProcessLogShow($"订单【{order.SuborderId}】执行取碗控制");
}
}
}
@@ -745,9 +745,9 @@ namespace BPASmartClient.MorkF
WriteData("M1.5", false);//清洗模组1完成复位
WriteData("M2.0", false);//清洗模组2完成复位
if (morkF.MainProcessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
if (morkF.MinorProessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
while (!morkF.PutPotToKitchenComlete)
{
@@ -793,7 +793,7 @@ namespace BPASmartClient.MorkF
TakeBurden(loc);
TurnReset(loc);//转台复位
- DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行到转台{loc}位置取料");
+ DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行到转台{loc}位置取料");
}
//等待取料完成
while (!morkF.TakeMaterialComplete)
@@ -820,7 +820,7 @@ namespace BPASmartClient.MorkF
int loc = order.MaterialLoc;
TakeBurden(loc);
TurnReset(loc);//转台复位
- DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行取B料");
+ DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行取B料");
}
//等待取料完成
while (!morkF.TakeMaterialComplete)
@@ -851,7 +851,7 @@ namespace BPASmartClient.MorkF
int loc = order.MaterialLoc;
TakeBurden(loc);
TurnReset(loc);//转台复位
- DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行取C料");
+ DeviceProcessLogShow($"订单【{ order.SuborderId}】,执行取C料");
}
DeviceProcessLogShow($"剩余配料数量{morkF.TakeMaterialQueue.Count}");
//等待取料完成
@@ -891,9 +891,9 @@ namespace BPASmartClient.MorkF
RobotOutMeal();
WriteData("M1.2", false);//供盘复位
if (morkF.MainProcessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
if (morkF.MinorProessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
}
@@ -907,9 +907,9 @@ namespace BPASmartClient.MorkF
Task.Delay(5).Wait();
}
if (morkF.MainProcessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
if (morkF.MinorProessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
WriteData("M14.2", false);//机器人出餐完成复位
//OrderChange(morkF.CurrentOrderId, ORDER_STATUS.COMPLETED_COOK);
CleanModuleControl("Start");
@@ -962,7 +962,7 @@ namespace BPASmartClient.MorkF
Task.Delay(5).Wait();
}
WriteData("M8.3", false);//下降完成复位
- DeviceProcessLogShow($"翻转机下降完成");
+ DeviceProcessLogShow($"翻转机下降完成");
//if (morkF.MaterialCount == 3 && morkF.MainProcessStatus)
//{
// morkF.MainProcessWait = true;
@@ -1007,7 +1007,7 @@ namespace BPASmartClient.MorkF
}
morkF.MainOrderMaterialCom = true;
- DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】,配料倒料完成");
+ DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】,配料倒料完成");
}
else //辅程准备阻塞
{
@@ -1033,7 +1033,7 @@ namespace BPASmartClient.MorkF
}
morkF.MinorOrderMaterialCom = true;
- DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】,配料倒料完成");
+ DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】,配料倒料完成");
}
else //主流程准备阻塞
{
@@ -1041,7 +1041,7 @@ namespace BPASmartClient.MorkF
}
}
- DeviceProcessLogShow("翻转机上升完成");
+ DeviceProcessLogShow("翻转机上升完成");
}
private void GetStatus(string key, Action action)
@@ -1105,9 +1105,9 @@ namespace BPASmartClient.MorkF
}
if (morkF.MainProcessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MainCurrentOrderId}】执行取锅到灶台控制");
if (morkF.MinorProessStatus)
- DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
+ DeviceProcessLogShow($"订单【{ morkF.MinorCurrentOrderId}】执行取锅到灶台控制");
}
public void TurnMaterialStore(int loc)
{
@@ -1169,12 +1169,12 @@ namespace BPASmartClient.MorkF
WriteData("M2.7", true);//加油
WriteData("M0.7", true);//打开抽风机
- DeviceProcessLogShow("开始注油");
+ DeviceProcessLogShow("开始注油");
while (!morkF.FallOilComplete)
{
Task.Delay(5).Wait();
}
- DeviceProcessLogShow("注油完成");
+ DeviceProcessLogShow("注油完成");
}
///
@@ -1189,7 +1189,7 @@ namespace BPASmartClient.MorkF
// case "Middle": WriteData("", 1); break;
case "Down": WriteData("M8.2", true); break;
}
- DeviceProcessLogShow($"翻转机执行{orientation}操作");
+ DeviceProcessLogShow($"翻转机执行{orientation}操作");
}
///
/// 翻转机档位控制
@@ -1207,7 +1207,7 @@ namespace BPASmartClient.MorkF
case 2: WriteData("M7.2", true); break;//翻炒机2挡
case 3: WriteData("M7.3", true); break;//翻炒机3挡
}
- DeviceProcessLogShow($"翻转机档位调至{gear}挡");
+ DeviceProcessLogShow($"翻转机档位调至{gear}挡");
}
///
/// 取A,B,C料
@@ -1229,12 +1229,16 @@ namespace BPASmartClient.MorkF
{
WriteData("M1.4", false);
}
- DeviceProcessLogShow($"清洗模组执行【{status}】操作");
+ DeviceProcessLogShow($"清洗模组执行【{status}】操作");
}
public override void Stop()
{
}
+
+ public override void SimOrder()
+ {
+ }
}
}
\ No newline at end of file
diff --git a/BPASmartClient.MorkM/Control_MORKM.cs b/BPASmartClient.MorkM/Control_MORKM.cs
index c521ac8a..4e91572d 100644
--- a/BPASmartClient.MorkM/Control_MORKM.cs
+++ b/BPASmartClient.MorkM/Control_MORKM.cs
@@ -377,7 +377,7 @@ namespace BPASmartClient.MorkM
{
values.Add(2);//分
values.Add(0);//秒
- EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address =$"VW{ 116 + (loc * 6) }" , Value = values.ToArray() });
+ EventBus.EventBus.GetInstance().Publish(new WriteModel() { DeviceId = DeviceId, Address = $"VW{ 116 + (loc * 6) }", Value = values.ToArray() });
}
else //荤菜
{
@@ -837,8 +837,8 @@ namespace BPASmartClient.MorkM
if (o != null && o is WritePar writePar) WriteData(writePar.Address, writePar.Value);
}), "WriteBools");
ActionManage.GetInstance.Register(new Action(() => { DeviceInit(); }), "InitDevice");//设备初始化注册
- ActionManage.GetInstance.Register(new Action