From f94bcb740ab2b8bb5f84d5982c6d7b0a254bbd40 Mon Sep 17 00:00:00 2001 From: wenjy Date: Thu, 28 Sep 2023 17:14:43 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=87=BA=E5=BA=93=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v16/.suo | Bin 435712 -> 453120 bytes .../Aucma.Scada.Business.csproj | 1 + Aucma.Scada.Business/OutStoreBusiness.cs | 175 + .../bin/Debug/Aucma.Scada.Business.dll | Bin 9216 -> 11776 bytes .../bin/Debug/Aucma.Scada.Business.pdb | Bin 28160 -> 36352 bytes ...da.Business.csproj.AssemblyReference.cache | Bin 11 -> 6305 bytes ...da.Business.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/Aucma.Scada.Business.dll | Bin 9216 -> 11776 bytes .../obj/Debug/Aucma.Scada.Business.pdb | Bin 28160 -> 36352 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 1 + .../AssemblyPlan/AssemblyPlanControl.xaml | 299 +- .../Page/InStoreInfo/InStoreInfoControl.xaml | 166 +- .../OutStoreInfo/OutStoreInfoControl.xaml | 147 +- .../OutStoreInfo/OutStoreInfoControl.xaml.cs | 7 +- .../bin/Debug/Aucma.Scada.Business.dll | Bin 9216 -> 11776 bytes .../bin/Debug/Aucma.Scada.Business.pdb | Bin 28160 -> 36352 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 108544 -> 120320 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 222720 -> 237056 bytes .../bin/Debug/Log/2023-09-28/LogError.html | 325 + .../bin/Debug/Log/2023-09-28/LogInfo.txt | 10648 ++++++++++++++++ ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 11 -> 1713 bytes ...ma.Scada.UI.csproj.CoreCompileInputs.cache | 2 +- Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe | Bin 108544 -> 120320 bytes .../obj/Debug/Aucma.Scada.UI.g.resources | Bin 71292 -> 80727 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb | Bin 222720 -> 237056 bytes .../Debug/Aucma.Scada.UI_MarkupCompile.cache | 2 +- .../Aucma.Scada.UI_MarkupCompile.i.cache | 2 +- .../Debug/Aucma.Scada.UI_MarkupCompile.lref | 2 +- .../Debug/GeneratedInternalTypeHelper.g.cs | 62 +- .../AssemblyPlan/AssemblyPlanControl.baml | Bin 8047 -> 10548 bytes .../AssemblyPlan/AssemblyPlanControl.g.cs | 2 +- .../AssemblyPlan/AssemblyPlanControl.g.i.cs | 2 +- .../Page/InStoreInfo/InStoreInfoControl.baml | Bin 7251 -> 8547 bytes .../Page/InStoreInfo/InStoreInfoControl.g.cs | 6 +- .../InStoreInfo/InStoreInfoControl.g.i.cs | 6 +- .../OutStoreInfo/OutStoreInfoControl.baml | Bin 1036 -> 6674 bytes .../OutStoreInfo/OutStoreInfoControl.g.cs | 27 +- .../OutStoreInfo/OutStoreInfoControl.g.i.cs | 27 +- .../AssemblyPlan/AssemblyPlanViewModel.cs | 99 + .../OutStoreInfo/OutStoreInfoViewModel.cs | 185 + ...yIot.Common.csproj.AssemblyReference.cache | Bin 3411 -> 3411 bytes ...yIot.Config.csproj.AssemblyReference.cache | Bin 1529 -> 2421 bytes ...hWayIot.Plc.csproj.AssemblyReference.cache | Bin 6768 -> 6768 bytes ....Repository.csproj.AssemblyReference.cache | Bin 5355 -> 5637 bytes ...WayIot.Rfid.csproj.AssemblyReference.cache | Bin 2554 -> 2554 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 1420 -> 1160 bytes HighWayIot/bin/Debug/HighWayIot.Config.dll | Bin 6144 -> 6144 bytes HighWayIot/bin/Debug/HighWayIot.Config.pdb | Bin 24064 -> 24064 bytes .../HighWayIot.csproj.AssemblyReference.cache | Bin 12290 -> 12290 bytes 49 files changed, 11943 insertions(+), 252 deletions(-) create mode 100644 Aucma.Scada.Business/OutStoreBusiness.cs create mode 100644 Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index ea83a7da0652ebc29777c7bc03b90f21fdf4d163..61ed3bab2feaa964395b53b2244dd3f81b536ed2 100644 GIT binary patch delta 20126 zcmeHv349bqzW-EDS0|H9!jOazLI_C+hmeFx2qD}P2#TCR5F(2#IY}^(kOK(U42Q@f za-@|)bP)rBvMxfx(ukes)juKIP=w`#iMI2`IY*>XipQ*VREVKEr`tnA&q*$l|aftf%N5D9ctS*O5i%PR|6 zg;ZcFI#Dct{?*^uY_&`pruH8f&t6q8A+}G7SH?j5Zf|v_@oqnM6-PYM6spJHi&nmq z42G?#>J?-7N{4JuLDo-{=RDdV?F+Ou8VoHFrUJu(-artL3gf#jb9u5?! zdw5IB9K>FfsErH;2T&nR_WoD&bDyEpC!y2rY;U~|4>Q$uIIhy`Lmh5UL+fp&esl_{ zG!x=fGIg5|&>C>L!VttK0BwNAxWahoku8@ikbRdcAZowb2^An=PbiWvP~7DU3erwr z(Ea5jRGnObbX=}LadHI;JzZfCWO=}iT;V?b8vE6&|KE#M^OubkRRoegCHgm?Aj=3cUQ`cZl`3sc_|ytOIn zqoK>6n9_36#TL8APJdT?u%ERO(th6Bs2IY8^{;%zsw3PcY_Ie2#tJD*Y`b5H6sI3z zq18RZ53s61(NcAE)M;N%r7G&m?SU);=ZQlj;VaY+Z4gEScL42x_J9>NNkrHYNJBgU zh($aO@I%~+Fdj$%x&Xb^H&a{3kTp8`K++em0Vx2<`y)&R1^{;gYRF&0f?OBSMI#`* zhcX8KC9&%SL^6O(APdL_a)4Z5B9I5<1CxLU0P_1X+*O-S(-4~u%mB)PnE(|t8{r&a zE?@^7MuR$UQA)MVy5FeEELaOh4(Yb@Y(aOh^-yFfD8ik7nXnS1DMv*ux`=3QDpLzun`zEAM`DcvjN@-={~e zc>IM2pZ;WS%ozLP9tD4|=oBOw?iPIy@L;w>oj0;?MW58`bzho3G|{|3ZAk?yvrsj? zKVMf=<_2KHpY7AFW#j#S>M=d*MS4)qDsg~o}teIMN{9!fa-WJs@GC$^35z&$w-Qy|U zLofCi?#IeuZnj4$YH81<6)oCTw<|cs#Mj|UoQT@S12o%{+{Q#g7bQYmh*m-dzG-du z`0-Ef|FZkww~k+qoY2bg_?D0EeSXg3L1&h1_|7MfsDZndM5m%W($oGvjLjHls4o0+ z;uDocQsrDpotM;7Yq^@YWvmK~nHqbY&N20c2&E9qJy z9F*rmkTb20N?aX8T+Wq2p$+MZt^?JOM6J79f1c8K*QIi;?~Vumo7@%zFgkGGIBd0$2%D z04ne(KsUPzp#W9`j{|FfCx9n`KLTrkr+{@5NbS>zR08XP4Zt(NMqm^0Ebtt#8Tb?M zJn&~=3-AK44WNovA*=?r17IG7s%?2hi_^|bQlR5~XZr6%v(=@`y(5VaMB(8)kDO0{ ze>S+{8#UvfZTPp4GMbVq@=BF{P!A4PXXXtuFUQs78)Tb&O6qJ>zsZ}+cB^Ii!)mDv zl-=2W)G|ox$6__*p&SvOt3<1V)+S1Za;;`9o-Zol9E!U^3G8k4Ql8Va=g`J96giT{ zXm@Gq#W$_h(d$n0s^I?2&w#m2&vMljY%9%74o;5l67t8?gf%~e~9Y+eSjH{iOSFGuArs^vpFv*cQ(zKMK2WHo5}&gz->!qolm z^+Fh-!z#&?7R9TS0#Q)OM~Rv$p38?D$_%9KNLgy2Ggm=DpIhsA}Ep z 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 delta 19748 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 + diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs new file mode 100644 index 00000000..634736e1 --- /dev/null +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -0,0 +1,175 @@ +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using HighWayIot.Repository.service; +using HighWayIot.Repository.service.Impl; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Scada.Business +{ + public class OutStoreBusiness + { + private static readonly Lazy lazy = new Lazy(() => new OutStoreBusiness()); + public static OutStoreBusiness Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper logHelper = LogHelper.Instance; + + private IBaseSpaceInfoService _spaceInfoService = new BaseSpaceInfoServiceImpl(); + + private IRealTaskInfoService _taskInfoService = new RealTaskInfoServiceImpl(); + + /// + /// 初始化出库任务 + /// + /// + public delegate void RefreshOutStoreTask(RealTaskInfo taskInfos); + public event RefreshOutStoreTask RefreshOutStoreTaskEvent; + + /// + /// 扫码信息刷新 + /// + /// + /// + /// + /// + public delegate void RefreshScanMateriaCode(string materialCode, string materialName, string spaceName, string materialType); + public event RefreshScanMateriaCode RefreshScanMateriaCodeEvent; + + /// + /// 日志信息刷新 + /// + /// + public delegate void RefreshLogMessage(string message); + public event RefreshLogMessage RefreshLogMessageEvent; + + public OutStoreBusiness() + { + System.Timers.Timer timer = new System.Timers.Timer(interval: 3000); + timer.Elapsed += (sender, e) => HandleTimer(); + timer.Start(); + } + + private void HandleTimer() + { + OutStore("X-001", "SC232"); + } + + private void OutStore(string storeCode, string materiaclCode) + { + try + { + PrintLogInfoMessage($"扫码成功，物料码：{materiaclCode}"); + string materialType = materiaclCode; + BaseSpaceInfo spaceInfo = _spaceInfoService.OutStoreGetSpaceInfoByMaterialType(storeCode, materialType); + if (spaceInfo != null) + { + PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}"); + RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 + CreateOutStoreTask(spaceInfo,materiaclCode); //创建出库任务 + } + else + { + //报警停线 + } + } + catch (Exception ex) + { + PrintLogErrorMessage("出库业务异常", ex); + } + } + + /// + /// 创建出库任务 + /// + /// + private void CreateOutStoreTask(BaseSpaceInfo spaceInfo, string materialCode) + { + //生成入库任务依次下发至PLC + RealTaskInfo realTaskInfo = new RealTaskInfo(); + realTaskInfo.taskType = 2; + realTaskInfo.taskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); + realTaskInfo.storeCode = spaceInfo.storeCode; + realTaskInfo.spaceCode = spaceInfo.spaceCode; + realTaskInfo.materialType = spaceInfo.materialType; + realTaskInfo.materialCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); ; + realTaskInfo.planAmount = 1; + realTaskInfo.taskStatus = 1; + realTaskInfo.createTime = DateTime.Now; + bool result = _taskInfoService.AddTaskInfo(realTaskInfo); + if (result) + { + PrintLogInfoMessage("出库任务创建成功"); + + RefreshOutStoreTaskEvent?.Invoke(realTaskInfo); + } + else + { + PrintLogInfoMessage("出库任务创建失败"); + } + } + + /// + /// 出库完成 + /// + /// + /// + /// + private void OutStoreFinish(string taskCode) + { + try + { + var taskInfo = _taskInfoService.GetTaskInfoByTaskCode(taskCode); + if (taskInfo != null) + { + var spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(taskInfo.storeCode, taskInfo.spaceCode); + + if (spaceInfo != null) + { + //读取PLC获取货道信息：存放数量、在途数量 + spaceInfo.materialType = taskInfo.materialType; + _spaceInfoService.UpdateSpaceInfo(spaceInfo); + + //读取PLC获取物料类型进行绑定 + } + //清除任务信息 + _taskInfoService.DeleteTaskInfo(taskCode); + } + + } + catch (Exception ex) + { + PrintLogErrorMessage("出库完成逻辑处理异常", ex); + } + } + + /// + /// 日志输出，界面刷新同时记录文件 + /// + /// + private void PrintLogInfoMessage(string message) + { + RefreshLogMessageEvent?.Invoke(message); + logHelper.Info(message); + } + + /// + /// 异常日志输出 + /// + /// + /// + private void PrintLogErrorMessage(string message, Exception ex = null) + { + RefreshLogMessageEvent?.Invoke(message); + logHelper.Error(message, ex); + } + } +} diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index a5b88e8f5486563d680e98270ce275ef1c0c9777..5de9bf274d2affdfc55b8b61cf40fcb7222afdc5 100644 GIT binary patch delta 4833 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 delta 2783 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 Z6+EYbc#ekegj_cFKgv;8$6dY>_s>39GD delta 2400 zcmeH|Urbwd6vuzR+uM#p3oX=9#-Dao7~6E~U|^>>ZJ43cQJRGTGDctmscv(NE@mbO zJnYFB(|eDLKCtM+9x%g5dtI^z5+PBeW-o3Jvc#BeVaYV=+?yt_`aR`$U9w02#Rm`l z^xX63_villJBO)hZR%T@Y4koSgjfbFt=2~0CFy!k%-xk!mS4LqDXbNnx>Me@t&*H8 zp<9XIMVa#i^pf==pVu)mpLbaD#p}}a1WGFJ^W};X8b&NQ^ngPM@`s+LiNgVFw5DCs z`@@f0RM#nMdo&^XFwq5Q3H=l`X(&%I~ zAWvoE=cU=|ar1O6J=S9MNok~J%~;qK5yIthP(!RogPMr7Ix|R_%f>sT*%o%yBV3Mf z+kOpdB34K5wgsJEAmvsz{;bUH&UicdHEO_4kN`tq9J~!?!KYvutbic49tGXtD9C^r zumG08ue2C_(A-xv`3sgf0mn@Y!bj`{tg}jAMU3q#rC(G29m@Vq=@#X0QS;O){h@8E zxS{mo+PFz^KuvH)B^t{9UM0d^*nm{=VP$`y^1f8|UKM}c&Qp3->Ccotrp5_ePEFw2 z>9m*(mK7{awI)+WJV3rKH!TnP$eS#|ZK|SFa-)$7L6y?2K@Wuw>3qS8FoN&7ptH$s zMyecfFa40bu`2;zHy8q^z-hq0`81dTAA<#O2`qtSumS?K+Es0|XUzQ`dZ;HO9rROA zsLCOttx-r*lMr>H-jBq>vO3lGhTOUxwK{tpGB>VkR(Ibl?q165_iU&THE#t(#mNV7 zkbCg@GdPNeF@9cBLw}nrr|0{R%Tl`1e?sWW~PZLd8o5j|ALRZ#m->mgn1Hamosj#~; zI-9O^`e6C#Lb}<_8?6K3Y&<08CbYp0w7ZuUWHFx_OOSix&+=byTK`x6f4cJjTFqAH z#v|I_UAKH&d-)5(`aIYo?f=;oG+)zA1H<20#^K|rLKLvRVJsY*MxBY(rP7Sv?&)~r z@|&BFjolvnlZ8FWh0RU!pD652n70}11l-`ZfhgDk&~XLIyy1^J-wMYTz(vfh-w8GY WyYjdCxnDd2wu5^epasRAm%jr8{*+h% diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index f5e894aea93a73e58fa9d4feab241bc197ee1a40..10b08d28111e2b77454782fea7614f2339c37452 100644 GIT binary patch literal 6305 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 delta 2783 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 Z6+EYbc#ekegj_cFKgv;8$6dY>_s>39GD delta 2400 zcmeH|Urbwd6vuzR+uM#p3oX=9#-Dao7~6E~U|^>>ZJ43cQJRGTGDctmscv(NE@mbO zJnYFB(|eDLKCtM+9x%g5dtI^z5+PBeW-o3Jvc#BeVaYV=+?yt_`aR`$U9w02#Rm`l z^xX63_villJBO)hZR%T@Y4koSgjfbFt=2~0CFy!k%-xk!mS4LqDXbNnx>Me@t&*H8 zp<9XIMVa#i^pf==pVu)mpLbaD#p}}a1WGFJ^W};X8b&NQ^ngPM@`s+LiNgVFw5DCs z`@@f0RM#nMdo&^XFwq5Q3H=l`X(&%I~ zAWvoE=cU=|ar1O6J=S9MNok~J%~;qK5yIthP(!RogPMr7Ix|R_%f>sT*%o%yBV3Mf z+kOpdB34K5wgsJEAmvsz{;bUH&UicdHEO_4kN`tq9J~!?!KYvutbic49tGXtD9C^r zumG08ue2C_(A-xv`3sgf0mn@Y!bj`{tg}jAMU3q#rC(G29m@Vq=@#X0QS;O){h@8E zxS{mo+PFz^KuvH)B^t{9UM0d^*nm{=VP$`y^1f8|UKM}c&Qp3->Ccotrp5_ePEFw2 z>9m*(mK7{awI)+WJV3rKH!TnP$eS#|ZK|SFa-)$7L6y?2K@Wuw>3qS8FoN&7ptH$s zMyecfFa40bu`2;zHy8q^z-hq0`81dTAA<#O2`qtSumS?K+Es0|XUzQ`dZ;HO9rROA zsLCOttx-r*lMr>H-jBq>vO3lGhTOUxwK{tpGB>VkR(Ibl?q165_iU&THE#t(#mNV7 zkbCg@GdPNeF@9cBLw}nrr|0{R%Tl`1e?sWW~PZLd8o5j|ALRZ#m->mgn1Hamosj#~; zI-9O^`e6C#Lb}<_8?6K3Y&<08CbYp0w7ZuUWHFx_OOSix&+=byTK`x6f4cJjTFqAH z#v|I_UAKH&d-)5(`aIYo?f=;oG+)zA1H<20#^K|rLKLvRVJsY*MxBY(rP7Sv?&)~r z@|&BFjolvnlZ8FWh0RU!pD652n70}11l-`ZfhgDk&~XLIyy1^J-wMYTz(vfh-w8GY WyYjdCxnDd2wu5^epasRAm%jr8{*+h% diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 3c6fbc07..dc63c7b5 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -129,6 +129,7 @@ + diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index f627657d..dad01840 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -17,95 +17,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + - - - - - - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,63 +128,127 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - - - - - - - - - - - -