From 92b2481201bb5eadf88d96d70d27e203e319a9b2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 4 Jan 2017 17:40:55 +0100 Subject: [PATCH] fix calcolo differenza oraria x MP-IO --- .vs/MP-IO/v14/.suo | Bin 226816 -> 271360 bytes MapoDb/DataLayer.cs | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.vs/MP-IO/v14/.suo b/.vs/MP-IO/v14/.suo index 65b75d9057b9d8628acaca797cd0f8fac8f9fddd..ae07729971f454f10ba05c32b460455eab7878c0 100644 GIT binary patch delta 19115 zcmeHP4O~=J+P~-AVHiFgzEP1c5l{gK1pHP&Ff|iIQ!^_ts5B6i!Ia!UYt57lIp(8Q zez2yk)uv!hTWzAUX4IORxvpELZuRz7niiE(%KJZeW?)pbwrsa|*O}k{-t+OCkLNk( zJkN8^+&dMYdsOT(R+-|sV*3~sWf+1w;6h7Fi%eC4u|P+_8(>_7=7er3p3kcFg&r;I zU4DPp0d@m2Qf7!UUd9^4*Sv)_i?7v?j;KQWBqLh}WS#vHHi}dyALAffs?3Q)SY#Oj z!(`JRGDYcvduN~@&;#&7AER+Mp=dz)aZvO`EDiVv!lAf#0=z+$i2Dhookz72DTpTl zF+d+67?4d4#y!LqmUJ!%y8>>&5Fi#93Szc=o(+;BzlP`aUkkw~}^5HS;ijN@#% z<8615;xtY?=Tz@m#ZI_O5#5XoM-i1bBjGk@T=0?g%8wpl*_QlBVfotf0&$md`N0^W z1B&7V1OQ$@UmyyQWu++nfgr#W=mvBE?De`sMv!i~CSI*ZTsqjr3qmOX$*cj003rbw zVX}$v|YCQ zg{8S)RD0@#&UNj-zFnhPKM%Y==_1OEW%~K(($<-x*;vNTiBhj}*R#lz1A%FFp~Eak z(x)#W)muqLvriez5T)Mb%v*fzooSF_m%}KsZi!}|qSWs}&KpG8;2t78G)Sb3NOaqb zn%n_N)Kb`0)J)ITzlit+MI);jqLJzUh@{ijr0}IdqJFGFmu0J0|0m?>m}vI8dfPtb zZX-~HH^{co*r0}uyUZ#RyM_!h$dO(oQw@R9xo0u z)_v0XR$ezWc?)xT0HiP0o$LN4)5+y4M%@x4nlfWVXlR6C3=*^@3f}9?p_QzrnCoTv zFh%HRr*#pid>QaKupA&@B>;++m&Ll7W0w}2oa8k6A8TZC{wIk1FYqbw8Spu95;z5X z0h|WT0AB)M0ZqWyz&F6Rz**oN&|0T4$~4I3FV&hHZqa1Q(#hp4 zg`&?w_1lMtviK1$Y!niua*If^tQA|YyT%`je_oo;_T#RHh*Xc~XnYd^c$qTiGtmFvKG+&7QUJ^h_5f^`&0Jl_vYs8Rf{5;RxMm!$iQ_dBbw6q? zg~$<-_zn$!4|vN_!(B7`OrdhF`qAh}RqqvhB)GDwy7BOko1N{g z6&e(I?$P!YS?!)s?x@$L4sz7%QUOVQjy`K2sdO&Y>pPJq^?C#FXFy8!bzl$h2G9t+ z3A_dT1=tI`4eSHgmTVc>7T5#aB@d%*j^QQ!mM7$Bt?4heP# z{D6;;_A$^4^163vaSHRPJMJFBmKHx*Jt|a$Rz>Ruf=W({I&)Peqn#`GNZM=Wp>@-y zEm!Sp`fbtRZPMR}dhDw=6Q!gZqfMx$`yXmuxLK%mR96?xZ;?dS88-@(GaE7K$;g!W zQq*+{5&211hAY`hKBil~GF>qvo{wuThOPjECxR9DzYsnr8<46i{^D` z`Wqc=(>&=8n#bKi^C;EBXG_gfxsi#`tZ3b6S+6F?^_5JdJLQO+1d~qFLCX?`JM~3t z{lxKvA#A+}>uq5xppT-eM-A86b)Ya`BO%of*6F18C7HZt($ZU{C7Q#^+7wjRa=le2 ziRLlT=u-XJm08_o>d#42f8tzbrh}-mDp~dT#2_gp=^z>b=}gMF5AIgkjIY-SWTM1y z8^K82HOm?^p~`5_oQcE|K)f{}C_pC8wNcA(Il>jN>Mc*Tyd9lANFLpUQ= zJ=>-{ucl`)?3n%|KNPx-K_c|VwN7Wy$ah$JQ7jPS?W3(Z|7e@~Kd4J-?L$DOi{`OP zH(K_}y&vX_FCahv4iVj&s=|j$y<^Do1+1c`*0=V#2_pqCkEbOjE zD48}ZSFFs0!kDIftb4kDzuOM5scp0_t+e9#{EjZuo_W?rab_wj(z>`In|V@p3R|z$ zEfQMdL`BVf8tKQU3?MQ*+z|ZEtw2+k{tg;7L&k4Z*)2r zEXb})7V{C7p+sE!;42xE_bCY7g?j?N@eoulO6F<`K+OCS%~qM=WR#%ZHs|SQjim{lO@HI1V=`(5toD4xplNKu-)7w7t&b7 zDRC6GgGFh%a^TM7#A{(V@*2~2DPT0uOfKvmHoJYo+_fD=!ruZ#-dTToPsf7T6V{c!){MRC>|@?T zteg}pqtRnC>Ysr76ljZFxDi$!*p(ftI*Z%O1KB<8@<3w-vnbl^3g>?FLQhe) zqReKQSfYr3!tZi3^%JXeFmzt42U+dbeeL#0Y?+_SmbY3PZCv|ZYSOYXi_0{pQW~)z zFlH{T)M89|H@5NOy067>b-8HHXl{Z$0VswEEmG!)FUn(CdHc++d%&-k)jyU#u{=7s z2}SZW>l+7OC>JTY@IaGRh5S-KmoYb9IS73O|_aS0Zc@Vq85?%MeAXd{V4}-Ja+qympFCLQXlkhT! z{Fj=9*UVCNzFg~Etmz7^6W`PooBQMe*vN12!(~z!^B{F+gZekv^xy~|+nT~FE#-Ktwx8O5{+RDO z(vpXmQCq}C?bBc+C~Y7Mq8vSpZFTE%)+Cv9scpDPnT1Z;7CP=%+~hcEl$vsx)^5X^ zzH=LjWA}R?ikV8WMqAu2t=u(vq+{1O9i)ZWQ{72xy0Pw-mr9v8W9^Pa2WN=xCXmbH zk#uE>h+pQ%uF{hLhn|41JXn_kdDbZQKjP=%n8(DJRX)G48R+!`X251steuo66zF8v zA5lgM!Lq17)3K|V%+!Cn=ZR*j(&w_{lb;sbkjh zxT3q0AyQUmU%`OUx(+N;^Do&nRS*we0z+EH(?sP=86hr|5stxJc;mrNb-Ovo>Az8m0h zzUyEXeeA7!T$HalCfC^QqN2e}6OyylUsJ@66}>M%Zn!=N{u}0i%@ddY?=?O7@oC); zwR(PD_9^agDkR&z;`XKJmpCx8dC!i&$v7MsVgFz~3$p8^R_)jA@-1IG<+SzM_Jhqe z+i%~Td<(cjIQ^&8C0u;C%bslGe=m?{>q`&|`%e%NFLw*Emz!E;e{$MLjxPu?yRIXUkK&m{G?XsH%az;O6iPs-@;_b{}WYP^SYd zRLxMv;Y2#X;n*s7?e(?U_KU5rH?EkiAc=g{{<=m~+jgCA9wnGtu9h**^9*?QdZ# zD90Uwn7b{TSNs@pEd2;if4n72uGAGwot3ZEXPJ1Oxv4*^2lTcZk8ZzW_Vk@x_xN$1 zON(Q;H{F)Nds@Izwu^BuOYd*O_x{A>_&%x0$+Uy>05V1JahAP0{#%tfNJ7_1Nq30S zw=Ue1j_Y|g1)s;6Y+hTK^d0z6fB6c7^%Gvd0pWg#q&tXAcDO&K`tu21Q>Pb~nnz@& z#pRY1&yKsZI8bjg9ovawy@R%uV{M# zykRpI;V?^<4|ioW!;4o^#CewZb69!?EXfB`e+4Z0bLyb-zfzKscd<4Pph7jGl8;#`DE8i;&weK7iH`CTMicU7)He( zF&#~x!Cfsw3;8k5m4jk`{t)MhZ@WT<3dJ90Jv~zpx*t{}13!ihRj7U}kEZz_zyBGPwVu63%#4+7`j(%fxER$4gJPr|t9cQfDCPdtWajg!X*Sd?4mpN>B<>p4iB8St zdfN9HZxoFM;h^tHCmVU4I2~oAm+uFwDV02#J}k4Ao<=!ksN(1xT!QEGKx){>3uyH` z?$3_V{?GUpI_<5xlj}TQO^FpUe>L*MALJFZc0Q_D@1)uu>^&VBxcp(XjNVM6@CCAZ z8LD~E-jI1Aif^5V;!O{uc=5xC)-K|Q*a14z$X^hf$I0IM(f*y_uHg|B)4j+yh~o3^ zH24wTNz!hjAZOJ;^^fu;^i8F`x>=Q|?#so99()(IA6UX4pwUYZ&3l0#WnW4*-k@Z` z!a1Y3H4xHst8wWe zF9~aL*}MkS51rTg8BG4a=f%|j8CiiDyub7cD3aIVvQ^R=HsP}1_sCtpoi|g&v*@-a zZqH}!Jz6A57S&1OI?zRI<;Sd5xo@>s`sz;P_TP#A>i)u$8KpJYbHL7g8Z0jjf3~Nk zA;e}=*d{)e8X9 zHt9cM^^seQ+8dTqzCtkkZY8Er!Wcf6nqTMPwDm0C?0EV>GZu3n z_9tR5^5?A@EpZ3VN(20ob?Fw+kwz>^P2Emx2R3 z*Qz&~_SR9te(p;R`}uU*yboHX$38TEx{>d*DV&X)_d{!LeFq9DL0&c=z$N)0F0a08 zWpWzze;3i04k8NOUBOOSm38=0zKl}-iqvt3_8M>_Zu=C) z6Xm7vXP}1F`_gK5j+H{SzxEmTW+$wyFWHU0dVYb?&~<}uPdJ4t(ogcwDdr>!CZ6RL z78qF_qk}tPL(I*{)(F2m$NeoBz=4cre%Gc;o0`F}(N)#a+3!#>EI=c{el&`aw?@(f z=V1r6(zCyZA)QUBOud(0z5u4`nR-NO{sMZAslHOTPp24LsNnHuRDU`VsBY4BmGTAS z!B%bzI<+EFP+njUc5Wq z)i8Y4|+64{c2mBn!@OKFq|JP zw>DNCP1`+rPiir#e#=dg>0au1dM8$mZB6&ym{O>6(v_$KX>^j>g%0&ndr*Z*jl#wf zyVP-(`XZIFjVUu!Mmvhta{5D(YNV{0>PS{D2_h+_1RgBk&(p8#hwJ*`SFRsI2Vr-n z{r!rHyAE&y^nf#90Oaej;cy-8?~QvP%@gQ_H2W*#>*@3>eANGcRU^hdRxENJ%hRyd z+kbfsbi}Vry=;Vff##X1ri7kM`YNHi_R&!m-HGI&Pt`woUGfoY2Z!R9B`3Gg(v+2+ zpYK^&w`HkV>K#$O0Ebqdt>dC=g^W(>rM^)0C2trSI>2!f~5kb!snrr=KihJoNs+#g5!|KKkFw&NU5>?R|9+BgL- z{G&s-%l{^Ex!L+R2=X;!`H`>u<8es5AnjI#Y$G7!EH}(+>|K+$v_$5A_31Ys-TmQj z3d*$qq;Ow+$M7_}P$+&ke9#mRJPVs?QsZe;FEz$fKX7_!LBU|H9!1mre#Q@;>>hbh K!KFp&>Hh<1_qy)@ delta 8915 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 EXX|1SN&o-= diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 0e5a338b..8db5b359 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -206,7 +206,7 @@ namespace MapoDb { DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = DataLayer.obj.taPzProd2conf.GetData(idxMacchina.ToString())[0]; // chiamo stored stp_ConfermaProduzCompleta(idxMacchina,MatrApp,dataFrom,dataTo,pezziConf) - taPzProd2conf.stp_ConfermaProduzCompleta(idxMacchina, MatrOpr, rigaProd.DataFrom, rigaProd.DataTo, numPzConfermati, numPzScarto, modoConfProd,DateTime.Now, true); + taPzProd2conf.stp_ConfermaProduzCompleta(idxMacchina, MatrOpr, rigaProd.DataFrom, rigaProd.DataTo, numPzConfermati, numPzScarto, modoConfProd, DateTime.Now, true); // indico eseguito! answ = true; } @@ -408,15 +408,20 @@ namespace MapoDb /// public static string processInput(string idxMacchina, string valore, string dtEve, string dtCurr, string contatore) { - + string answ = ""; DateTime dataOraEvento = DateTime.Now; + DateTime dtEvento, dtCorrente; // controllo: se ho valori dt x evento e orario DIVERSI per acquisitore IOB calcolo dataOraEvento corretto if (dtEve != dtCurr) { Int64 delta = 0; try { + if (dtEve.Length < dtCurr.Length) + { + dtEve = dtEve.PadRight(dtCurr.Length, '0'); + } delta = Convert.ToInt64(dtCurr) - Convert.ToInt64(dtEve); // se meno di 60'000 ms ... if (delta < 59999) @@ -427,9 +432,25 @@ namespace MapoDb { // in questo caso elimino i MS dalle stringhe e converto i datetime.... CultureInfo provider = CultureInfo.InvariantCulture; + string formatShort = "yyyyMMddHHmmss"; string format = "yyyyMMddHHmmssfff"; - DateTime dtEvento = DateTime.ParseExact(dtEve, format, provider); - DateTime dtCorrente = DateTime.ParseExact(dtCurr, format, provider); + // SE ho solo fino ai secondi uso formatShort... + if (dtEve.Length > 14) + { + dtEvento = DateTime.ParseExact(dtEve, format, provider); + } + else + { + dtEvento = DateTime.ParseExact(dtEve, formatShort, provider); + } + if (dtCurr.Length > 14) + { + dtCorrente = DateTime.ParseExact(dtCurr, format, provider); + } + else + { + dtCorrente = DateTime.ParseExact(dtCurr, formatShort, provider); + } Int64 tiks = dtCorrente.Ticks - dtEvento.Ticks; dataOraEvento = dataOraEvento.AddTicks(-tiks); }