From 2009dfda81b9e7f68e02ff3c5d237aa3f4fd34a7 Mon Sep 17 00:00:00 2001 From: wenjy Date: Tue, 14 Nov 2023 15:31:44 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=AE=A1=E5=88=92=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 8 + .../Page/AssemblyPlan/PlanInfoEditWindow.xaml | 6 +- .../AssemblyPlan/QuantityIssuedWindow.xaml | 112 + .../AssemblyPlan/QuantityIssuedWindow.xaml.cs | 33 + Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 228864 -> 238080 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 366080 -> 384512 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes .../bin/Debug/Log/2023-11-14/LogError.html | 80 + .../bin/Debug/Log/2023-11-14/LogInfo.txt | 13276 ++++++++++++++++ .../bin/Debug/Log/2023-11-14/PlcLog.txt | 276 + .../bin/Debug/Log/2023-11-14/SqlLog.txt | 768 + .../AssemblyPlan/PlanInfoEditViewModel.cs | 10 +- .../AssemblyPlan/QuantityIssuedViewModel.cs | 93 + .../bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes HighWayIot/bin/Debug/HighWayIot.Config.dll | Bin 13824 -> 13824 bytes HighWayIot/bin/Debug/HighWayIot.Config.pdb | Bin 60928 -> 60928 bytes 24 files changed, 14656 insertions(+), 6 deletions(-) create mode 100644 Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml create mode 100644 Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml.cs create mode 100644 Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll index bd6acd3ca15fec80612be720405f9eb615bcad94..01524b50fe88cbfe47472a101530187fca5c4c17 100644 GIT binary patch delta 1776 zcmZ{lU1(cn7{~wbIr%vGXm?z2Xj{U;lzr^k7|`FR$=a<*ct|2 z43jgpLFRM|FU~0_MOn2M!sfZ@l~%9Ti-8ouAp=p_a7LKOE@W8s$vID(^x_2Gob!AC zzw zFb`ku1ynqMr_7PO5bAd{%U!cXOS|N*U24;=x@%Y4v^95atxbz5t}Vor*4}ozYrEUD zDR*tk)&}gunRD0XE=y{Bg|2 z0iE9erx3`DTNbZ0;(T4oZIMRAR3D`j*p8Rxl|6$3p; zGgTCwXq4%5%6f5_X^FC4m`qX1Vpym$<|&L}nQ1SDeYnQ-C}n*>)+zX#Fc3$Y36#Y# z%G9eG=*MBElByG#Ob01TV1a3pvILg1RcFzQN&`F4;P8qfh{8io_9tZn*u~^k16;qb7BrY?3LMNKSze8x&uW4V>k){yIH4E0Gx3n9$9b-0~ z(Gucsq9ZmPkKWXLL`Q9^;oHC((Xo8%xeU(RRMX1TZw5Dk#WfGw}_HW&dC(9XH#~-rZ*tq5k-t`GAA~fQ*7=) zfXpK{Mb;NRx=DS_`l37EWp(EEDqDeZyuB#>^8TfFp9ow}y>pi}Sx70{6~A$=*_}ee zq%k>0L%vr`>L;?V@BdysGiqJG(6hcC$a;R&m= RbW2rA_gJ@$+z|DW|9_ObQLq32 delta 1775 zcmai#ZD?C%6vzM1y?IaD-7QO(^es&jliMUqGdJ z&vTx0!%bndF#6)8W#GH1Ps*h>RxH2yP}8=(z=NRIA>e{o4tg32Km+mk9^ei&C?wQJ zSd^92<1Ft#N@ne~o0b48&Lx0L0f4D}J-1gCA#8i%Z9(<`F4D6n88Y&nfQ{lAE$%hq ziWYCz;uzpbiD=QwVLfsdz>=LOJ^LAbq&HF}R~)w3B{KCGqvy8Ezb_Iy$HQA^op)IdWp*>*sp z@rQODxPK>opRaz?G;PVxMkq$n5ppWngauBwIwhhdPK-1kTv5Zhfixe&oSqUC_%X;S zCrCs`IGrP{1yh_Zkk*1(PCn9Fv5@B&C$SYvobDyD4KCT(aG10VqLdEmjy_D zz!pxgQq2VJ(kM?wzo2e5V+R+nQ8Sw{WRQN|B=+lMOeTp#b=s3UodAP{C6TFfj@LOS zxU&;Za+Y-3v{Lj`o%N0C^UZP3ZIx$#dw62_gTni{`AOz^06Q^=`!GcPrRco{%%flj z_SNUA)$Z+rG;Qs9ZNmF?f2F)@>?3(^s%lAu1@EN)+Q-@?1zH7K=l9T3dy^q4bY|?i zlQUlpycGNE*gL;`eqGHZM>mY{zaVmAOp80q!De<;wf0o1O{p8AFxgvOzipY7Q}+J= DJyBr( diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb index daf024eb8578bd716d43565b0eea9af478aca860..a3d06029ae7d6fc6abf82e719f6404784bf0f0ec 100644 GIT binary patch delta 1821 zcmeH{T}&KR6vyY>{f2_Owo0=@l_uRXFsZ=^HntGJfmqvY1!PMLg|g*iSz_4*3cHA9 zsoGR*0P&;*v?T>UN~I#(>4QlvVIO=X(!?~u5I#(5(ibC=nh*o^+}qmt=#x**X8!kg z@40hk_J8iZ-3x~91;f;VEh&*NljffCWzLlDEgS~zVf|~jZq|N>_d8hO+O=Z$g`sHv z5Zp*S5clsUI_(L@+{Wb+eOsy>*gXsGR(A8|u<{3cV8M~neb}9*uuThom6pz%yJ>xF z-HM3?`|wJ73ZL3_(uoV{itT|#l7N0TY%bV}DXMttpgKm=^GCFs$Ft?{feTF)A;`fq6%i=Ijfz$XVDs?^^x*38Rv5*)%7}Hw z{5VhZCrN0i@~}lSmREJL4Kw~!)dDiQPedRKXHT?(8}q9p;KNvTD?~8M+X=%M^#&k{ zJ5PT4v1+v4HU8sor#~x6-QsZ&n*~lRs8L`YSKg5E z10n}TYcw+BRE>=GT7?XW5|t8F;+a~FOo@^9i+D<%LZojuX4(XbRXVfcX z$V$D8r-@v6xn3hvR_ZlYX2zx(C+7JSa)wWMpQs1F_G#qKs!wAxW}I$tVo`$vi!>nP z^6OjhN<%WYXS(54vIqPc%d&_x)qaIM0>6yE9dzQfKasqe^=ssnqfukSk0u2h6&AJN zWYNp|Tw?|d6z#h4)-DEP=xRzOEe@&}ZW@O%eP_S`Fo>?8N?IHYz@Q!r)&N{WS4$ab zEU4<^E$;yALD%X1kcnQ>Y`jdW;XLUfe5P$Ll%Sim9M84of)~Fh^`ogh7lK$w8pd<& z`{@H?q~~#iM*1)(lu9{ohh*#y*(vWpNTs~DNi|{_jbS_G=J5=o63h>)l>Zc|SHy49 zs9(gFiGsLFkudJ)Q0YDV`PvRUy^BBp5mBE$+VN5v%d=wF=X-R+XC5nUj)93J(-JKv zCnvr?`X-#TB$_8=S`xjan&3*oZG!s+UlmMCfac5#UK1RTvFkE(nMI-;(V^P&tO3#K z5gpSgZHDK?+xfP5PSBzlYrekS`1cT1-7zWis`CVH(eXX%P^l?GrRI?+o}~^Q3nP4Fr~Y{y=AhE(^LE!*B#Rj+2aE-Hk0tA zLO*!o{;v?P)_+=|#dyPZW-0oD7w<#m-GUztgL(S>7egaUB`@g7KW7+u{eICce*s8e BYaajr delta 1876 zcmeHHZ%kWN6o2QH(iR7n4K4Jolg=?7R094%WW;PSth;;m$tQ~~{QCjHM!m6}n zBQaUJxg3_jHpq~Dm}9WQGip!_O=K|vHc5nJ3mRvJA51jC4@=B~dhUJ8KKsc}-j{dI z?|1LH=e_qk@7(CBF1o6V@7aM=_ z++^7ROr`Bj`FDX#KyCk!uFgWW=5FPUhZ{?~7SR9Io1h(L7n)Zp5p3`OK~4 zofd5-Oe^1om-4e&XwMNVuI9_8ETbR*T_)@(--6i=zUxiL#}uyq?iiM#0Ap1FQKv`I z85C`LJnn3RVq9~EVL!SL`oN1z2gA^d71cf%B)kQ`t8M`mU#{`NJbqFWHm>Q}BLo4{ z2QsjcTCkeA4tgsp-} zND)$n9dzf@UC8+#wEha+I{xv%_VA%29Uk9f!t6#FY`D}Yp@&d0#u^n8bg5Ahy?Xqs z+=@jWnN(!~M+pt$kVhd^?|Kw*UJEE~l3|SpoFue?<4p=!5WEs@YL>;qWS-?fvrO8u z$$mm^oM~1_U+^j-Y5^{0*atH~z(4)sds`v8@gb96V^oKheKokc82Ynev_u zIVkT8SubG;le)~5o2?fS3SwE8gYv&ewvVrWO0zM({u7~oT&I3Ndj_68CAu%}H1z$jP`y=5S_5R`FbX4%XW|Pl_`d8)0Cg}EgRI%j|MwzW^pnu(eJhxcff-B zXZ&pge6Ln~@ul9hK)cvjP}9HuTYPwqCT3F~Rp^#8<^Kvv)C)}S|ExkkKBmk3FzeSv iR=lT2gD1}n-Ff3&{)6M6udm!!xBgs|#On8pYWN2hCu&^) diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll index bd6acd3ca15fec80612be720405f9eb615bcad94..01524b50fe88cbfe47472a101530187fca5c4c17 100644 GIT binary patch delta 1776 zcmZ{lU1(cn7{~wbIr%vGXm?z2Xj{U;lzr^k7|`FR$=a<*ct|2 z43jgpLFRM|FU~0_MOn2M!sfZ@l~%9Ti-8ouAp=p_a7LKOE@W8s$vID(^x_2Gob!AC zzw zFb`ku1ynqMr_7PO5bAd{%U!cXOS|N*U24;=x@%Y4v^95atxbz5t}Vor*4}ozYrEUD zDR*tk)&}gunRD0XE=y{Bg|2 z0iE9erx3`DTNbZ0;(T4oZIMRAR3D`j*p8Rxl|6$3p; zGgTCwXq4%5%6f5_X^FC4m`qX1Vpym$<|&L}nQ1SDeYnQ-C}n*>)+zX#Fc3$Y36#Y# z%G9eG=*MBElByG#Ob01TV1a3pvILg1RcFzQN&`F4;P8qfh{8io_9tZn*u~^k16;qb7BrY?3LMNKSze8x&uW4V>k){yIH4E0Gx3n9$9b-0~ z(Gucsq9ZmPkKWXLL`Q9^;oHC((Xo8%xeU(RRMX1TZw5Dk#WfGw}_HW&dC(9XH#~-rZ*tq5k-t`GAA~fQ*7=) zfXpK{Mb;NRx=DS_`l37EWp(EEDqDeZyuB#>^8TfFp9ow}y>pi}Sx70{6~A$=*_}ee zq%k>0L%vr`>L;?V@BdysGiqJG(6hcC$a;R&m= RbW2rA_gJ@$+z|DW|9_ObQLq32 delta 1775 zcmai#ZD?C%6vzM1y?IaD-7QO(^es&jliMUqGdJ z&vTx0!%bndF#6)8W#GH1Ps*h>RxH2yP}8=(z=NRIA>e{o4tg32Km+mk9^ei&C?wQJ zSd^92<1Ft#N@ne~o0b48&Lx0L0f4D}J-1gCA#8i%Z9(<`F4D6n88Y&nfQ{lAE$%hq ziWYCz;uzpbiD=QwVLfsdz>=LOJ^LAbq&HF}R~)w3B{KCGqvy8Ezb_Iy$HQA^op)IdWp*>*sp z@rQODxPK>opRaz?G;PVxMkq$n5ppWngauBwIwhhdPK-1kTv5Zhfixe&oSqUC_%X;S zCrCs`IGrP{1yh_Zkk*1(PCn9Fv5@B&C$SYvobDyD4KCT(aG10VqLdEmjy_D zz!pxgQq2VJ(kM?wzo2e5V+R+nQ8Sw{WRQN|B=+lMOeTp#b=s3UodAP{C6TFfj@LOS zxU&;Za+Y-3v{Lj`o%N0C^UZP3ZIx$#dw62_gTni{`AOz^06Q^=`!GcPrRco{%%flj z_SNUA)$Z+rG;Qs9ZNmF?f2F)@>?3(^s%lAu1@EN)+Q-@?1zH7K=l9T3dy^q4bY|?i zlQUlpycGNE*gL;`eqGHZM>mY{zaVmAOp80q!De<;wf0o1O{p8AFxgvOzipY7Q}+J= DJyBr( diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb index daf024eb8578bd716d43565b0eea9af478aca860..a3d06029ae7d6fc6abf82e719f6404784bf0f0ec 100644 GIT binary patch delta 1821 zcmeH{T}&KR6vyY>{f2_Owo0=@l_uRXFsZ=^HntGJfmqvY1!PMLg|g*iSz_4*3cHA9 zsoGR*0P&;*v?T>UN~I#(>4QlvVIO=X(!?~u5I#(5(ibC=nh*o^+}qmt=#x**X8!kg z@40hk_J8iZ-3x~91;f;VEh&*NljffCWzLlDEgS~zVf|~jZq|N>_d8hO+O=Z$g`sHv z5Zp*S5clsUI_(L@+{Wb+eOsy>*gXsGR(A8|u<{3cV8M~neb}9*uuThom6pz%yJ>xF z-HM3?`|wJ73ZL3_(uoV{itT|#l7N0TY%bV}DXMttpgKm=^GCFs$Ft?{feTF)A;`fq6%i=Ijfz$XVDs?^^x*38Rv5*)%7}Hw z{5VhZCrN0i@~}lSmREJL4Kw~!)dDiQPedRKXHT?(8}q9p;KNvTD?~8M+X=%M^#&k{ zJ5PT4v1+v4HU8sor#~x6-QsZ&n*~lRs8L`YSKg5E z10n}TYcw+BRE>=GT7?XW5|t8F;+a~FOo@^9i+D<%LZojuX4(XbRXVfcX z$V$D8r-@v6xn3hvR_ZlYX2zx(C+7JSa)wWMpQs1F_G#qKs!wAxW}I$tVo`$vi!>nP z^6OjhN<%WYXS(54vIqPc%d&_x)qaIM0>6yE9dzQfKasqe^=ssnqfukSk0u2h6&AJN zWYNp|Tw?|d6z#h4)-DEP=xRzOEe@&}ZW@O%eP_S`Fo>?8N?IHYz@Q!r)&N{WS4$ab zEU4<^E$;yALD%X1kcnQ>Y`jdW;XLUfe5P$Ll%Sim9M84of)~Fh^`ogh7lK$w8pd<& z`{@H?q~~#iM*1)(lu9{ohh*#y*(vWpNTs~DNi|{_jbS_G=J5=o63h>)l>Zc|SHy49 zs9(gFiGsLFkudJ)Q0YDV`PvRUy^BBp5mBE$+VN5v%d=wF=X-R+XC5nUj)93J(-JKv zCnvr?`X-#TB$_8=S`xjan&3*oZG!s+UlmMCfac5#UK1RTvFkE(nMI-;(V^P&tO3#K z5gpSgZHDK?+xfP5PSBzlYrekS`1cT1-7zWis`CVH(eXX%P^l?GrRI?+o}~^Q3nP4Fr~Y{y=AhE(^LE!*B#Rj+2aE-Hk0tA zLO*!o{;v?P)_+=|#dyPZW-0oD7w<#m-GUztgL(S>7egaUB`@g7KW7+u{eICce*s8e BYaajr delta 1876 zcmeHHZ%kWN6o2QH(iR7n4K4Jolg=?7R094%WW;PSth;;m$tQ~~{QCjHM!m6}n zBQaUJxg3_jHpq~Dm}9WQGip!_O=K|vHc5nJ3mRvJA51jC4@=B~dhUJ8KKsc}-j{dI z?|1LH=e_qk@7(CBF1o6V@7aM=_ z++^7ROr`Bj`FDX#KyCk!uFgWW=5FPUhZ{?~7SR9Io1h(L7n)Zp5p3`OK~4 zofd5-Oe^1om-4e&XwMNVuI9_8ETbR*T_)@(--6i=zUxiL#}uyq?iiM#0Ap1FQKv`I z85C`LJnn3RVq9~EVL!SL`oN1z2gA^d71cf%B)kQ`t8M`mU#{`NJbqFWHm>Q}BLo4{ z2QsjcTCkeA4tgsp-} zND)$n9dzf@UC8+#wEha+I{xv%_VA%29Uk9f!t6#FY`D}Yp@&d0#u^n8bg5Ahy?Xqs z+=@jWnN(!~M+pt$kVhd^?|Kw*UJEE~l3|SpoFue?<4p=!5WEs@YL>;qWS-?fvrO8u z$$mm^oM~1_U+^j-Y5^{0*atH~z(4)sds`v8@gb96V^oKheKokc82Ynev_u zIVkT8SubG;le)~5o2?fS3SwE8gYv&ewvVrWO0zM({u7~oT&I3Ndj_68CAu%}H1z$jP`y=5S_5R`FbX4%XW|Pl_`d8)0Cg}EgRI%j|MwzW^pnu(eJhxcff-B zXZ&pge6Ln~@ul9hK)cvjP}9HuTYPwqCT3F~Rp^#8<^Kvv)C)}S|ExkkKBmk3FzeSv iR=lT2gD1}n-Ff3&{)6M6udm!!xBgs|#On8pYWN2hCu&^) diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 1707b17..cf12fd1 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -105,6 +105,9 @@ PlanInfoEditWindow.xaml + + QuantityIssuedWindow.xaml + SearchCriteriaWindow.xaml @@ -143,6 +146,7 @@ + @@ -163,6 +167,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml index e51bc27..30b367d 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml @@ -100,16 +100,16 @@ - + -