From 58ce09bb5ffe1da4ae0b847527a402affa0956b3 Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 20 Sep 2023 16:20:33 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E7=AE=B1=E5=A3=B3=E9=9B=86=E5=AD=98?= =?UTF-8?q?=E5=BA=93=E7=95=8C=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v16/.suo | Bin 253440 -> 320512 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 36 +++ Aucma.Scada.UI/MainWindow.xaml | 81 +++++- .../AssemblyPlan/AssemblyPlanControl.xaml | 12 + .../AssemblyPlan/AssemblyPlanControl.xaml.cs | 28 ++ .../Page/InStoreInfo/InStoreInfoControl.xaml | 138 ++++++++++ .../InStoreInfo/InStoreInfoControl.xaml.cs | 32 +++ .../InventoryInfo/InventoryInfoControl.xaml | 12 + .../InventoryInfoControl.xaml.cs | 28 ++ .../OutStoreInfo/OutStoreInfoControl.xaml | 12 + .../OutStoreInfo/OutStoreInfoControl.xaml.cs | 28 ++ .../Page/TaskInfo/TaskInfoControl.xaml | 12 + .../Page/TaskInfo/TaskInfoControl.xaml.cs | 28 ++ Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 44544 -> 64512 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 89600 -> 146944 bytes .../bin/Debug/Log/2023-09-20/LogError.html | 51 ++++ .../bin/Debug/Log/2023-09-20/LogInfo.txt | 224 ++++++++++++++++ .../obj/Debug/AssemblyPlanControl.g.i.cs | 75 ++++++ ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 27145 -> 1725 bytes ...ma.Scada.UI.csproj.CoreCompileInputs.cache | 2 +- ...Aucma.Scada.UI.csproj.FileListAbsolute.txt | 10 + Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe | Bin 44544 -> 64512 bytes .../obj/Debug/Aucma.Scada.UI.g.resources | Bin 27103 -> 40597 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb | Bin 89600 -> 146944 bytes .../Debug/Aucma.Scada.UI_MarkupCompile.cache | 6 +- .../Aucma.Scada.UI_MarkupCompile.i.cache | 8 +- .../Debug/Aucma.Scada.UI_MarkupCompile.i.lref | 4 + .../Debug/Aucma.Scada.UI_MarkupCompile.lref | 5 + .../Debug/InStoreInfoControl - 复制.g.i.cs | 75 ++++++ .../obj/Debug/InStoreInfoControl.g.i.cs | 75 ++++++ .../obj/Debug/InventoryInfoControl.g.i.cs | 75 ++++++ Aucma.Scada.UI/obj/Debug/MainWindow.baml | Bin 4684 -> 7025 bytes Aucma.Scada.UI/obj/Debug/MainWindow.g.cs | 51 +++- Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs | 51 +++- .../obj/Debug/OutStoreInfoControl.g.i.cs | 75 ++++++ .../AssemblyPlan/AssemblyPlanControl.baml | Bin 0 -> 1036 bytes .../AssemblyPlan/AssemblyPlanControl.g.cs | 75 ++++++ .../AssemblyPlan/AssemblyPlanControl.g.i.cs | 75 ++++++ .../Page/InStoreInfo/InStoreInfoControl.baml | Bin 0 -> 6530 bytes .../Page/InStoreInfo/InStoreInfoControl.g.cs | 89 +++++++ .../InStoreInfo/InStoreInfoControl.g.i.cs | 89 +++++++ .../InventoryInfo/InventoryInfoControl.baml | Bin 0 -> 1041 bytes .../InventoryInfo/InventoryInfoControl.g.cs | 75 ++++++ .../InventoryInfo/InventoryInfoControl.g.i.cs | 75 ++++++ .../OutStoreInfo/OutStoreInfoControl.baml | Bin 0 -> 1036 bytes .../OutStoreInfo/OutStoreInfoControl.g.cs | 75 ++++++ .../OutStoreInfo/OutStoreInfoControl.g.i.cs | 75 ++++++ .../Debug/Page/TaskInfo/TaskInfoControl.baml | Bin 0 -> 1016 bytes .../Debug/Page/TaskInfo/TaskInfoControl.g.cs | 75 ++++++ .../Page/TaskInfo/TaskInfoControl.g.i.cs | 75 ++++++ .../obj/Debug/TaskInfoControl.g.i.cs | 75 ++++++ .../Properties.Resources.Designer.cs.dll | Bin 0 -> 3584 bytes .../Debug/templates/style/resourceStyle.baml | Bin 13477 -> 13477 bytes .../templates/style/resourceStyle.xaml | 9 +- .../viewModel/InStoreInfoViewModel.cs | 250 ++++++++++++++++++ Aucma.Scada.UI/viewModel/MainViewModel.cs | 66 ++++- ...yIot.Common.csproj.AssemblyReference.cache | Bin 4854 -> 1831 bytes ...Iot.Log4net.csproj.AssemblyReference.cache | Bin 0 -> 1091 bytes ...WayIot.Log4net.csproj.FileListAbsolute.txt | 1 + ...hWayIot.Plc.csproj.AssemblyReference.cache | Bin 4616 -> 1469 bytes ....Repository.csproj.AssemblyReference.cache | Bin 13122 -> 5824 bytes ...WayIot.Rfid.csproj.AssemblyReference.cache | Bin 1469 -> 1408 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 2603 -> 1160 bytes .../HighWayIot.csproj.AssemblyReference.cache | Bin 4795 -> 4795 bytes 64 files changed, 2364 insertions(+), 49 deletions(-) create mode 100644 Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml create mode 100644 Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs create mode 100644 Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml create mode 100644 Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs create mode 100644 Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml create mode 100644 Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs create mode 100644 Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml create mode 100644 Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs create mode 100644 Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml create mode 100644 Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs create mode 100644 Aucma.Scada.UI/obj/Debug/AssemblyPlanControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref create mode 100644 Aucma.Scada.UI/obj/Debug/InStoreInfoControl - 复制.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/InStoreInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/InventoryInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/OutStoreInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml create mode 100644 Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.baml create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.g.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/InventoryInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml create mode 100644 Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml create mode 100644 Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs create mode 100644 Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/TaskInfoControl.g.i.cs create mode 100644 Aucma.Scada.UI/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll create mode 100644 Aucma.Scada.UI/viewModel/InStoreInfoViewModel.cs create mode 100644 HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index 3a0cb03af9a3771b4b18d68a56643ab72f7c8880..f51bb4f115dbf533c66b1aeed524684dcc264242 100644 GIT binary patch delta 21780 zcmeHP2V7KF)_?cTFbptARjN2cSE&OCHl(T`O$J*+j3bQ7N|R!bV2Le>0#CWNB$%Sn zWDSCG+>M){X+}3HiK~g`OEifw#WgW%qNezr^XAPkgBXdM-Tihy9>4#)?c8(kJNMpm z%eh1CeuvsaE_D&1obhqwxW3?*0)Dx5>lQ{6z)-+2zz~2xzgX(GyS$b((BfX@4=zpE z{PhQ9I3%i0duo=S$KRLEyDABT;E7#}zw6 z3_KoypE0xeI6*iL3$1YgpF02vv3kA0g&K3|kQ<2~1a|<0V*yx;90>OT7t{KQE`C}d zz!Ojm>G-pag^fFppYv-N1$N>IY+TNmz z?PUZ0C;g$k4d?@K1MqEru6%idYi0xl`~d!d000&i1a7eC9{}z^(H{zK znCM5kNbsuxQGjSb4BwvM<~|gB!vMnp@qiJ41VF9O z2QU_p3&2u-sn@RcoeP0^Vg$sQo(&LJ1E?kZF9T;2o7QUAY@$Hv8+$X3#ThFh0!5Bb zk62A&^}oAVq21J1W!@m-a9jSS`ljLxc(U6-F-U8SiitI(yDPAfA7*trvQ9lLgdIyoMj;NIHe{xRF0;uHAR&?0xHI!RUh z10M0JveLmbs;bI|gojra%+Qr+D{muhKS{mVx2LF-f6KkTkiht-00}?}umZ>cUhtW6 za9sel06TyJU=Qd8Z~!<0oB+-M{7PTQ;|6|Xhjs^lBA{N|L=>nkJ+jPFkt!R)D##UN z(4|`%)c%r4ZZNN+9(>y%Ie*ACM6no}$QG0Jb2cL3CPL#Y=pQ?V*D0x9|t@khMU0M3V2EkKLhTw zfNf&GgaFqLHw>FkwN5MX4=nTCeZL|0xhW>^f1^c5^ zfy)779fkfj2Z;Au5SusLw~%tkELF{Q2oTp|NdROguv%on>W~~)NybETofQsa#;CK{ z?o%|GOlMn9(BYnU(HtsmNpX02g|1RpTBWTj0!7hTHSkm1`wNndcssWGKjwxT|;{D)iIB-sq?5i`{)QAqAFclN3RC1T{-T|_)q8L ze^T=7*BgCa9x^Ly;o(u2+e)`|JTYb%vs%*?Mj`qjb)#s7#o9mq7xoV`4nr~LKPwy*mSdb(xz8TrQB>z2k$DbjH}@0u|F=MDph3q zsqjxTme{=X&Gr1=b2H!Barz0LtIo0Bo}_;5T6(cu;3na?MIEfH^Pnb`+)M+5L#%%J z#Jtbk-YWh66Y2G}7u_HKz=d6o&Gg=S?A+g{-}i;UpkbsOSE3xZtfNXYKIvQ_yL60t z@(VAhRg)gPkruV%(&dKJ(ilZ+{>kyNZ|nMBS@ZT!xnIwWEnw%O_9wd-6x$`e)u~+?P{5{_QUsCLjEHG4WbdnkD4sm&FXDb>=m| zRq1g*DZ(4qYbbAX*o$#|obML3c>?NlRMW;S8}7_d^WbD;q)Xy>nblr?KbBz?A*_J^ zMP)T8ToqW06=H38rQ$>Wr(xbwjO4xTYxyn1mA$S&>Se%pfN;Vewhxm#K_AAg=)E$q z78x+@JnEsVg6>wrl|!G^LZ{O~pUDSQaq}QX2mT5nu8gY&Ujg_vrnE55*xT37cd1&R z8t}FKD+$(TFS~!4a;DeTUA9+_Oxq;0^R%<)9fy_9Fe>&x^}=JdAKkhxNz%0}cmH8s=%shtz3TRzdi1l@ zBT4G!CV_3kNGV-y-j&OjQl)D68=*1neJ_PfJLB5V=bJ}2XaBJ5g_~P02YfC+vHrc) zS^b5qbW=waWOR8)K*_#$A-$q=1fiF5$?(NE;w!*Km2iHg_xWt+^dW~Aw!i0e<+;3l zgI^20f7knL?8PerUuTe;Wv(j2z;8QBhp9e4+S~f@DA}RJ{EWSaSHz_*omanc7Rf%a zq0cYDSEk%NDzM-q$GDM&9qNLuSx$Y}nk7`OI{IN)%R`a3i$(}j}$?b1tkT|g$ffN<3c*k(5LtZ&wKFCeD2H&=g~f~9qoOa zo-=Ft+tLh;rAjI5Cq1WZ*fFu;oiFWgX4%fvj$G?+drr3Oa^b5Vof#uk%c=-P3Cj#O zi{_8&D7jNdFe|rHilJ2dHQKrMSEKKDoJI#t2|1vAwy5U7#;PT6UAUT%{gU0jSA|kx zHdN7m7Oh>c&8z7H3k(l{K{B^)d4k^y;0@>t@B#D#C;=*fFTfAr4+sDR0)ha+fc}61 zfPsJzKqw##fVv_A+(>{L5Cw<^#89q=8w8$MKpbE&UkVo)Ykv0?Gj809V5@$h)Oi3c-U9 z;n)Yi2_EqIbCSQ-vZaU^*C~M0=f4ZxqEE$8%=_ICI zK!Y0F>0pL>fhm_!nQByCW81jX(}SMqBM&&g;*{N0wMTCJq`IbUvo<|jw!rNJft@o{ z&2l36&H9BcK1SUd{HtVdfxwgO`T73o3UBb@F{M%dWEFpHh=xBD5JHyo)k7cQYXfDx z%)j)md1?&w4S~t_Tm&%0Gf*Q_zA7-=p5QSbu4Rm|vP1~1vEy$B&L;_cbx@5AH>0Ns ze={KMo_UbC)@wm_R9LEacP>+@9(n9k<%{EeomWY1FSwIM56A9#{?Pb0_qeSn3tN#9 zoUvSJ0ho07Wm3lub;h@OM3c4rHUAp&7+)O#vI4yOdw z12l5uxuXze$6p&zV}<9WA^g073lw?a+mCxVcnqs^;kZCtMF&EH*-jqT*d2!jBO%9V zfUz`12oUc^KJXx`DAQhEsz`-6T(lX9t$cy_6XsMV8Kb~B@73P zXgpyGT|lh)>aZFjE#+ufbOIxM+Ki#|Baq;<|Dt9YE?);6e zCFF{yNcdn&;IRdsB-Cpk z*CiwnJUG@!@j#dlPV^^vd}iVZX`zss=q<(5ta@$EQzJ<>@W?Ccvk zY+Pc}i3i?45_`}(?LP2lUfVk1@)e(wS>OjUZjW=~QH)1FUpvZ`&l?qDgA)WY;`mjg zVjD(}<{j_z70rmp)0RBVI2=Y2_?-edRj==;krQ!qdoCXM+h+?l0`2}O3$;)-j zHxNKh--3G?@Eza^;40u6;CsLifa`!8fSZ6H0Y3qL2K)lJ1>h*h&Xq`dvn&VV-WpPR zg8VZZB7y(plepHn@vgJ>Jl&#~wjP|lgy?h5(C?+Z;~ZPQ?y^k3Yc#P1vH~fC&sd~)olY*wSyHiN zdF%0oQo@&4@6yXYp@(eviaE{t=5mrlSjFdbADjFY_0%_Aq*L71e=8Zpyd{!8`V5(5 zi9JuxY~joQ>aL$Mf$XKcvb~Z2Zl<&Ttc&E56F+sbx88dgEmZW3KGTWGfAi?m!|2N( zzvF-tM(+RNVYdBffTUxbH3wS`4lnlIKuNmZeSl=I6RYr%9Mx~}m8c0*$4chwM-P)M zw_;DlNKUhy_0*L$`$?qwHh;;Y2v)3w2?^#WA1h%#;J^9Nk3W0U5Y?p)ZHmOe%}n*&cAjILF))XzcvT1cP952TJVUIlM+bSQDFwOessrh+{nlWivBePAOv#wj=>dlcrk$bxqp$XCWJct_{cJoXQX9~PtAhwm?V6MMaY5|?#jq#MqX&{ zvJh%sY9`brFIAJT$(xjsnxC7h$sU)RoGOG2LPhf!IcMacgwSrY+6)(K(;?HeER)}& zCfMTSBO@O_2yHgw(>FIYIXgGSB8NZFNO5=Qjca}vb}^mWu&=XeV@(r8+S+0R+u$uH z8(iQJyv~Ev7stkpm;?)Ckst^Of{_6C7DfWJNr(jfkzfE4VE-`^AUBZ!FE82P`j23@ z0D>B!3^NMc{M+CXjbJY@vcRf|EW(ih7l8yD*GOQ-ArcAHNPsQY1p!`EvJtjfKCmb= zQS5_gu?#d}+n`yTps0;3tU4rt_H`RPbRj5NBS9kgMGk1Ju|df=V%71;KsFR!vjq!k zU%@7ur>&eR+~hENlFLe~D$0sk=veA*o1vRlB^w4=N`x$~X{EElLR(fb53}4(iRTFm z1WG@FxoD#m_?!97GJ0E~@u)z^!yXw+1FdAZnP=@;G=Md?QIGC266=}(nTvnDuHIHC zp{b@KeQol}%4N7~trp_$E*Gyt$3P%QdCFy3C4bOtj$fQ$?rVy?wPD?^@;15b`kznz z< z5=R`_-K}UCl;4S|4w+8t%oMdjcbTHnu&ih)@&pxN{`JHW6^J#I-z|}%qOoK;2XoGa zmzhY3BPyNlRupwpjV04sh_YD>FAJuqr@G4&)tM#FRmgL-B~Q)~RU6RNbnEL;1zIv~ zK&HIFv_19Xc(IeBI_z#mQEOV`jopr(zZscs5ty2KDN#JmJTx>P7Id>URBih>B;z9; z!&)@-{u=DrIAZW2*u!z;NVboieO}h?wB|2d)7uV#UlHu8CMxW*NJTqSVc#=RVIS<0 z3VV}@ss_7Nmt@#KOk~(kx}>T#r^1Hsk_wy9#A~%kC46L!`B!42n8>hkx@3k@Hc_Fp zyP~oiJ~cL08&eQ7C~|OAv@RlUuodP}YUWi|=}N*T6qOd1&8Z9<$yRHqk84Mx0F9l2 zX755tk_}s;q0l)D2b3H;q@i(gDbV1<DMZ(9?uCuy1Biug2pNDNe<3 z-%_RVV0BrNL+p5p#Fo91EOFK!PLfCoAz;FEVL8WXNW>aDIP`LFyQFOkAWoGFrkNWbH3f4g0o|D*ejw(q&O8XyyuC5#G5p z^B0Jd_3l?_D0$hGX@Ipz!^-Bs?WNr%a46t4i}oV-!dD{UQVc9!Xr(Ut=~c9X_Q?@s zgs-qRExd6qOu179Jl)JDf1JiL%L;YHVFi^Wf?aB*9v;7*Y`p5FkJv|}sjW8@h0|}! zy?jiKc~!)9NZ4GseMVvvs|!lBVVVMMp*Cz>n&GaiS;g|r{P&(wCN@}oJxvjer_d*a zhb8Q#c&W;TIjpC$fjh)#_|&#n!QT&%a*(79iGaTa(NU4=sMLt0(6g6r-D11zz!KT^ z2kIIkd_kq~1=U6Qzus{gXVTv6z$>(`kEKXvLya7S(xG?TaIP$|5jMPqGwBwV)d=hL zh-iAxF^SK#t;y4}NbHLs^5Bz0d|I7z} zHC%Wp0XGaTI~0IhDEO;^B44nO{@S&fp`1|8xPL}DL)qndv@cyGlrZKWEukE~%5V$E zz*n-8{61AT9^{so9poB{V9z(w)r}izLIM}j=?`1;Zn8IH%xW1O&wLmi(71^vY}-Hy zTeJZ@1U)^sDOw0P%u|ilMTCtpIfP|yO|!i zjl|>jYfaH>$_uv7x%lui>-H>4irGmQzNr6b)gPaAX_+y1$Ahz6+%{qBz%E*N-mvAk zK_E~5oV!26((a`D1o=Ehn}z!c@$wNn9j67n=Ofs;*|{S$An>l^->}QWiNoTn%~hLD z`0D=M*vbhi)Ii>?4I8Sz-ne}?sz2CqcJPQ9h!bl!l`sQdy>a>x9=5BV2058?P6|zm zN@BH#;n->MBI-s8SR4A=PEdE@yb5WHgb(!=Kh$iC3rb%M2|sYK(j3m#Gzq zEbf_tgq*Rghsg^pahzmQq*1fn;YbfgdZ!fO(hC%T2N5m&;<9X3`ws16x_}BPsP7w0 z^*cy}Pnpo=1wWw1W12@z)UFIK?-7pOI!s5f2qp1h*Z)cfkS#)ORmR$OI#GmLn%zdk z&&O-Ss|BuixUmZ~sA-x7zA;9=cRUG&5^hT~O2QNPEEme^)D(C#7zFOf`n^N9ljnq@ zLd}c1?TA(^#uRTX!UKxBMcxI2Y? z3NpFt=NzM}2vd%icnVj6*(>i-8Hydc*_hws1}Ypbz(?%5MaJwmiT!apoNsrJcE6LZ!r>cDU+B2bbx&8vf>h(D`_^k(numS% z)9lE8Rv)+z-Zb%x=DuF>>HD8p-8%Ke89@Vkn103}ds`P59wiJ@e5_OW2q>@FWYhM!_xJw=bRr&1&lEMknrm3gO0Z1vuwCBF9m-wYNcoo4c@(&iXV z6;VBg3$VMG+bS#q76r{jK|km>DU03>QXYhz2`ykKw|?9MEI9 zfSpQ@;lj+k@gHconE1~!T(DXBG>9FYK-Jx|KsZ@gAVA$1eo*ZrtosuyD|IDPi|6GO zYfJOZ1H7F_9sCQ06NaB(59@5Wz#q@UZ;QLKPYjCH7V2VSqC%$?=%$567sP^nLS0Z0 z8aJ(QaI|h}oGz+xaF2b$!hCV3GrAu8#J|%%q2gz`k0;}VlRZV}v0>b5GuUc3v4lpN z(PPcHvt8!D)|#Pz{{(H5nE#5{r;7tY)rI_#O^KgxjBIz0oNXI8R$4s#)kEiX2j?~f z%*xA4Rc{dvePo9JV8ITYqyr8AsA8~GC%0Q#dQ2xh zrjs7iiSQ2^drT+yVmbkniyQvv_Zy}xlkEJjGKlP#+|}Okp7_tEe$(FQuK$|qcmAh# F{|kkn{uTfL delta 12795 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 IndexControl.xaml + + AssemblyPlanControl.xaml + + + InStoreInfoControl.xaml + LogInfoControl.xaml + + InventoryInfoControl.xaml + + + OutStoreInfoControl.xaml + + + TaskInfoControl.xaml + RecordControl.xaml + @@ -101,6 +117,14 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -117,6 +141,18 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 4ebc72e4..9a04aaca 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -31,13 +31,17 @@ - + -