From 6fca85456e18282c2c8ae90845801422a750a831 Mon Sep 17 00:00:00 2001 From: xusc Date: Mon, 9 Sep 2024 17:41:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?...=E9=94=90=E8=85=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ICSSoft.FromERP/v16/.suo | Bin 373248 -> 378880 bytes ICSSoft.FromERP/App.config | 6 ++++-- ICSSoft.FromERP/IcsMo_Rhtyon.cs | 6 ++++-- ICSSoft.FromERP/SyncCas_Jinyang.cs | 2 ++ ICSSoft.Test/Program.cs | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index ea1bc335c108cfa718e8b1b3de0352bd9a6dd35d..5ac85cf70c38e4c98568cd8163e4b6febea88bd7 100644 GIT binary patch delta 13743 zcmeI230zgxzQ_6Ry*45s9`S&Ph=7QwOd={~=5a{L$PmZO5){k{K?G;zIAl&KoSo-y zWe#L$Rw`iZG}D7tSG(qrWtwR=T${|au&fN;Z=C}~w|l$2`+4tu-ut}H=kq;l*lVx7 z*7{FtuXC)Q_*)BG6vlOStNWPT+!iD60jg_iYGgG5PoN=_h4caNU}?IS;&bV~7@De_ zCr@0le67z_=F$V@Hxw@-FP%j5BCB^n3L5)@pV8R_q)2LZ)~1gk9S@d+1t1J0fgE&~ zj`S(;4A4Ok7zZJKs)4Pz$lOhW=T+Q zK{^`T4rHhIBOL=i#QkzzB)w3ct1oKYd}?3hCWE11Dab<)nMhlKen7U~k8~RF2NS_K zFb~wux+WWWPxL+#X$!C#3<4WKWAyhp(no+znd)=Wqt%iJA;i5XJFZC~Dw#_8ckY2y zP>3qoWhbO70kSpTwW-XPATNb^ACSV7byAoz4MQr08HLBCBmE=7yaVm(go!Tt)<|i} z&g4f!z7cp12(T7NVU~g46{epQW-+J}<`(2@^u}7Ng7z|pkCf&`Af*|N0ZYA?^>xzR zjIxyGTebCd(zKx5P@3`{`H|B65M+QHAnTs3O=Z4TwoTlQ*H%j5>bn~Uv>exd4`BrROG`wKhe!zS738xK2=2X^cziUXo`Nr zR6uR?{ALB7tN)i10(%zTk7 zi*U2-q9eFdE*C%}=jUD2`2np#ojV43H|pxz=oasQb_-EKxDbW33)lp9fkvonjPy}( zCuSSn2AR4$cOd@|=+K}}UR#IqZeTA;kEMd5^eKu5=|i>$7FiRO=C!#5xgc65#x+X+ zq2)XZ((?lc>xWx()o%vQ*B-`WE&7~R^W3E}JWTqJ2{Gl7L1)R9nCBjXHM?J1_ajB> zTOSV64E6_?$FKf=$6!O#adaN!EQEa9vN^&l>zg%iBzxt(iE3avruaFs!ETC!n zjlcqJVci40Tn|Kl=&?_3ba_`)K}^yNto;S^=^U6K0iByZh%m)TXZ{;r8o zAF9zqJx}WaUY`|N!)-}Z(VN+$!QEGAxt@Pln_q58&ePUlG56|ok_YMiOucOP^!EtE z9DL!yN;wU#A=_hl?x|RV+dTETkImJqz6jDy>oPFo{B^5z zt0_p|FxtC3a&&d0@`zFIQCUV%fW9HvTaUcC!Q%`%l6v;bQ>t#B^mq?77aP`k?#FXG z;Sp|bMs+NGN7`ysnDrk<$CgK0&uTWzUdK zqRt@JqG2J>Eh93_vhq0;WcmWqouK@s5gz0%YraA0Tc95snP5w~sazEL+#&IL)R4D} z*L&JVgmbu^0!*?q+1gf{>d7P0yq`y*u0#E$5%XOOpE$Bm)OA?ARp{2UksLXiLWCFQ zS-&1e-e_7)#XCgte5H7|^Si=5T0xI^iqpUa@=}G}kv0MzpfMPRIxnRC^yr1%8wVjL z@2JtU_OuXTDCx^@Md^DM4)c@a?T?BjxM2X&=}2GJTNezZMO?ayh89_qb+Ig&*6Bl* zaj0x9rSS?l01g5NNXA`P(r4~pOhW(R zVh26EZ;*b+D~D`sq{PvkA@57wF;&oJr6#7 z>O0Ynk9cSi<%8a;P;JNaC{E8mUO=(>4Sb)`^G_6bdtPc{%cVx1Vz9Gbnrs0qe@m@t<727Uqk&@wWX!{ zo>R%T58#9^UTkE$4-Y?fmdeh+sZGbI%=(0>lhM6?NLm_Z`2wyF(hrY| z7brMfjnB1$;da*Z&ZT&$xS?6Yc{JOLc5-I&BM081R<5F1ARZ@cF^5SR$0eoRJs4on3yAWZ|=AP2|^O8b=Nng{a1OfU<~ z26Mn%1$&%%$jk=|z(P;}tV((HSBhZEZtWSp$+JHC*r8tPpnfZv3^7s<-V(w=%gM~9 zdQ&Vjdq)crH^DQA&+5y${@9=s3Izy%-!&IjNU_z3g_ zAA?W8-@s+?DfkS04!!_ig0H|U;41hUTm#p^H{e@P1#W=vI^gSja1;Chegr>(Ti|C< z4HT?`8?CFRa3jn_7s>Y7Gp#IZ;q?=xYwn}bw7s5 z#ZM^z@dtOMB%D0$f*egQ3OBc==)EysNN4h?7SyFgBeHdk)QimlhQ){8CnG4HJ|Vk1 z_2stDs=oYX6Y}HO0BXj~d})AgiB4ftBf7@QTOw6Y?it?niNPK38v{-4=a!i}rhi{< z7C^DQ%9pzG$sKAKFY%^Ge$zGNX8sQ(L{v*vWp#t&Vnk<&}9YUri({4ZDWvx$f>Nwz87K#Pz>A;)7~mza7wiKsgZatsfq&dB!zV5}5`jwx}c7Jm4BFMxm zAu+0lOBUH&;7(oj-fcZO*_|T2J9m%j+|6}qs=O4<+1u2nQonm8fx#LddhZw-tx^(YG5?r&^Qb}q=VX0%!3Ct76i}|vM(g7y)WHH?p&Gz z6$$Q7ffZjVR$^;kvKWr5iiPZ9bcDkmM%al{yvwWJk0gCVYi}d+K{~7b+hN4ozziHz zGLsbhP72u;5=@E_vV$&B$xc#yGawHsI~n!`@UB%85#0nOAJ7z-fG?0OgKATmm!Bz^ zxw$C4`JJJEcR^kZZ&23``3TS+L;@+Vj!5Osycs$f42p`<&o|CQ#RRaTD1E%@AUC6C zB#~0Fo{p)vnWtP&PfY3Y?&df8_wA)j{Jg`3uFm}N!b79$^53^>_rlSUiO%|=liobB zY`U#{#Jha;NgCAr=?7;Vt-F8pd!^@uql+K~LvCD$O|9~BE*e^jh|Y$91o zeo}~izoj+Cnr|q#vHg}})eq%Ia?bb401PaZEeps|a*G5PdMPHu>C7j29aJz0f{NX@q&80QiEI+e^?w1-?VprT_q}*lT zmTBEb#%&qMrS*mY8876UN;9c${(dry%cfbV@&f^23g4GRU6hzwg*2IBQ5gq1gLuG4 zl4wK0Xyon(W55I8K`<7ifpjnqj0X>ay3xpVBFdA%WH1Fx1yUoYAx&y^l*T?i`}w?&!A#~x5F8-p)US=g^txGyWS)NuP|t(ae5N^^C`1RvggH^uO! z10t}A-0GQuOb2rMw@PaqXjE?OExmYy&tUGHPo4DpPW$r82gpo28P0qTm%S!@IVwXn zS7>leY+ZxF_zt4m`C66Y!-F2Bii#adfG4M1p@nRES_wAHBO@`=jV-b2PF~emeU@WARA|%sK3utm z0{ES^6wxHh`SeU^@))5cFL$z}0U=hnJda5%xyFl&ACp^^sygOK(YwYw?9jei$sXCJQ zVl#CCrv#~u*qSH087PJ+zs#vy=N{b?x^>Bn&WIb=4Rh)eADy1qB_le1e2@5U8RIh( zGP-2^W=>q{rHZC5# znsL3sv~%o4-pq^cRp%K^JFD?ZV;Lm+g8p*d?)mp7_py4w_m2#utieF~IiLB@2C|uJ zN>nfI=q_5aPl7tp(}d;$@|In^sHZxQ3l@qb9@|K)YSyN{(=Lty$eZ|suChUvXwC;b z)lNL1qk7QzxT|XM;7T7gh)<}ZGdr59?tk$beR#O&NR$;~WeIkbO z{==d#Z|^2Xv1OL(@RBER&9NGhZm;l=C)8E^a;(}#TF40Ay+Dm;(_A&4c5$4CdM|G* zQPVkOp}L$+eyZlOu$O16Z}M}6xDgiClRcNK%ZX^F>Ndr|FXR4-9~@TCSrs5Kjg*`yg+>(%28ZHHrX#k+icyByz6m~rnJ z!lyy;gHCu<%q?}4apEb}S8MiL)uyBBYKD#7WBm1Lb*|!BZ)mQW8klJ;X->U1t}YNI z^bf?8b6j2Pnza9uY5)%_#c1&E)uKM<&j+8x7@jQ3r}nC`#1w+c@1K zZ(c|3IqgmoaEKPf*h=C)8ES96GBTVO-b)cO#D4c{`*1l>zIQS#a#x0Ga@t3*emyl< zs`T(C^;!-Wo#j+#>A6)nW-gebE^--`BTKdXCr!#eO|>{}Nh-C)WjWWf)Fh{7^R!$X zHo#i0Lhla|_m!IL(ss*Cbs^q03$oQk|BDn@@#NC3YHP!?U;P*_xp|@u7q%6N#>h45 zv+B0qj|ss;qC_vFmrdO#{=0PjxAEkESl5pv7}Ix(<5ZEOT8SMq;f~H67LiVuBYn~# z#ZbD7YWOj@ANlUnhTC)#>GmEXLqGX+fcrT78G(owcNcdw8g;@`ngIW$yXe7|3iN_o z1K3(2EZSSRuwD8!=D7XBgVSCYo-~)+>=ln1;w2GGy!Ev3=bZh*N-Ni;Yg2ghyV!Up z?Z=mIYb}?b!x0$vFj2he4Ux$y2ZcX9%mwYW;hbaEOuT=eFwrvZTqUOSH0*kL&zHjN zbfLzmSI|}-`}u3FFp3Er+MkBV9s;@lWjr%2kNRWV>yO?I9{ZYjR4?phMnU6UmEv(W zSBi~%ysL=k&993@dzj{~$E`85Po;3DHQelsn4(YJ8fILM6M@8=v(+lxx|6q@6C>Gj z7-Jasn%GJ+Wy47v^sVrr`&}2Utu+%p&TEf|O|(@G{C*C}P`x?j2t0mOdu=M8{fjX1 zCm)E(`lR!|==C8v_X4tV=q4?jSHFR=KXz0sr!=MkbT@B)8x@5|p|^)li4Z-c*ECLf z3xf>g((~wi@Fii!gF;V>;q3h>mUZhf5yXp|YyN!lvKY*P#~`qX<6$gOf9`_(-d!|l^yWbIMTvjPYxE3+zoJfFlAZb4?JS!H`Vy?U*+H%Ty zk%9LVr_`ow@Wn_bLM803hETp_p7x%&jklf?6FK~S6hl|2J&ZAj)U7Sq6sxu}S_$zt zvOlNx;d{rcW+SIeoFKVP4|bYGMR$>*gwGfg-zEC9Rck+6zIV)B{e}+Bo{$$aAU8Yf z&eW7KL{1xV%Hw4UTrE#ObX`O|Qm=KX)maMtji z^CE{2T@W@-{aWPm2YwU?7uK71y)TyVcOKeAo_s?Ig8|A@GMM)TIButTC-8?Kh=+}j zE(#py4ZA4T&}`mvLX73jO|?MY{4qSz9#sor$46oUn?4eSE*JFqa_J&7c-Kud{pPX~ z!PXX90O7aW^J2z78AvoQZlguwP;$%1VgZ-^4TG%<8#ie__c7yo)&^q8^QF&NfPFzzKg6KwPen(k-_#2`xO0$2D_K&lXD0HxBnY z!^R|ia_?{qIm;;hQZyyby#cpZ?>BdT3D2Fwecl!6y!$J3=ePp5JM5}h#;<-Q=lr#J zUaqW-a$U~r+Ep=*3$MY|?QptaJ#L@}2Y*`^K{_~>XM$YYEPZ#V^nAG(i8C0EWYbNY z^q#E2Uj&}y>>J_{c2tQnj;j)d=w2?qyai)T;)3Q{CKrAS?_@h7gG|&+R0r|(_S${y z3}3!C5eEyUx6S9m??njPzC(zr6=9r73#4RT^rY67Lq1co-JO42Tj`R%^J1(N;3~v8 zr`bD2I9(2DI9or)UZR61$=(R zwiaTp58`_JY`L8X=U1u_)zYqG1G0oSDcTASQ#30^>73mc&9z|Ot!hGw)Spw_wYj`! zmbSqakMVzu7=F8vR>)PJnwh@|)VA{S55$;%&nB{6=J2Pg|9@9?*WUVnMr$WK-6c)s zAs0ouzVY#n@H+C(2}kN*1U&VaSrL5IQ*);$q!DJy{Z}{gVI_Xdsa+$Ygqs`K` zrnoLfGCifu+*WX$N-LOs=0I7 z`>;3XuD4>Z)1mC(gH5#QE?;rUT^r2aui;m#lxAp)9r8-)#QfRR98YmR3co~oQx}e| zLafQDgkKuts|C?&F8v-6BkC>D5kE2^E)=lM40Crnvnl#>tEB6i#GxCtd})nAt`{3; zM2W$w+?1>0Jod5c9d{2#+oQaxrFM|)^?TQ3?0O?`VFj-XKEekC%hU=wQ(Hji=S$Gw+-Tf&ui04 z41rhoty+6N*%!y|$(s^5d#iSexA@@K`MY*$ZS|C}#)kD7s3LE8UJKWAhMSyED=O8p zZD9_>x?Qs&@FH@hLC0B^r7gj^{P2Vmes0&u!zwkpl#xon*vsnAYhf-I($Mvoxyd%I jtMnljvV~d7EvXJUayS}mDV)Ub_zwrJyPEHI-s|`eF>Vwr delta 15218 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 diff --git a/ICSSoft.FromERP/App.config b/ICSSoft.FromERP/App.config index edb105e..2b3d9c1 100644 --- a/ICSSoft.FromERP/App.config +++ b/ICSSoft.FromERP/App.config @@ -2,7 +2,8 @@ - + + @@ -18,7 +19,8 @@ - + + diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index 421f108..8d5d74c 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -63,7 +63,9 @@ namespace ICSSoft.FromERP 0 as RCVQuantity, A13.Code as DepCode, A22.Code as WHCode, - 'mostatus_initial' as MOStatus, + case when A.DocState=2 then 'mostatus_initial' + when A.DocState=3 then 'mostatus_close' + else 'mostatus_initial' end as MOStatus, A2.Description as MOMemo, '2' as ERPStatus, A.StartDate as StartDate, @@ -170,7 +172,7 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("LastModifierUserId", "'" + ConstWorkPoint.Muser + "'"); values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'"); values.Add("LastModificationTime", "a.Mtime");//操作时间 - //values.Add("Default1", "a.EATTRIBUTE1"); + values.Add("Default1", "a.EATTRIBUTE1"); //values.Add("Default2", "a.NeedType"); values.Add("DocType", "a.MoDocType"); // values.Add("Default3", "a.ActualCompleteDate"); diff --git a/ICSSoft.FromERP/SyncCas_Jinyang.cs b/ICSSoft.FromERP/SyncCas_Jinyang.cs index d6bcd90..554ce03 100644 --- a/ICSSoft.FromERP/SyncCas_Jinyang.cs +++ b/ICSSoft.FromERP/SyncCas_Jinyang.cs @@ -67,6 +67,8 @@ DROP TABLE #tempSyncCas_Jinyang select * ,a.CreateTime as MTime into #tempSyncCas_Jinyang from [ICSDomeAmb] a with( nolock) where a.CreateTime>@LastTime +and free1 <>'15' and Free2 not like '%e%' and free1<>'0' + and LotNO <>'' select a.* diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index 1913a4a..09b8fbd 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - IcsMainCategoryCode_Rhtyon test = new IcsMainCategoryCode_Rhtyon(); + IcsMo_Rhtyon test = new IcsMo_Rhtyon(); test.Execute(); // var ss= ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261); From 9af71c3d83b720bfc0d283603e2b0986cb9be89c Mon Sep 17 00:00:00 2001 From: xusc Date: Wed, 11 Sep 2024 15:18:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=94=90=E8=85=BE=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ICSSoft.FromERP/v16/.suo | Bin 378880 -> 382464 bytes ICSSoft.FromERP/App.config | 2 +- ICSSoft.FromERP/ICSSoft.FromERP.csproj | 1 + ICSSoft.FromERP/IcsMo_Rhtyon.cs | 6 +- ICSSoft.FromERP/SyncMoHour_Rhyton.cs | 174 +++++++++++++++++++++++++ ICSSoft.Test/Program.cs | 2 +- 6 files changed, 180 insertions(+), 5 deletions(-) create mode 100644 ICSSoft.FromERP/SyncMoHour_Rhyton.cs diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index 5ac85cf70c38e4c98568cd8163e4b6febea88bd7..2cd846d9e73197540bb78f672fc2cd3f9c5280cd 100644 GIT binary patch delta 10844 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 BjJf~- delta 10134 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 - + diff --git a/ICSSoft.FromERP/ICSSoft.FromERP.csproj b/ICSSoft.FromERP/ICSSoft.FromERP.csproj index e5d9a36..f850fb3 100644 --- a/ICSSoft.FromERP/ICSSoft.FromERP.csproj +++ b/ICSSoft.FromERP/ICSSoft.FromERP.csproj @@ -175,6 +175,7 @@ + diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index 8d5d74c..a775872 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -175,8 +175,8 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("Default1", "a.EATTRIBUTE1"); //values.Add("Default2", "a.NeedType"); values.Add("DocType", "a.MoDocType"); - // values.Add("Default3", "a.ActualCompleteDate"); - + // values.Add("Default3", "a.ActualCompleteDate"); + values.Add("MOSTATUS", "a.MOStatus");//生产订单状态 //更新存在数据 sql += ICSHelper.UpdateSQL("b", values) + @" #TempMO a @@ -198,7 +198,7 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("CreatorUserId", "'" + ConstWorkPoint.Muser + "'");//操作人 values.Add("CreatorUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称 values.Add("TenantId", "'" + TenantId + "'");//站点 - values.Add("MOSTATUS", "a.MOStatus");//生产订单状态 + //插入新增数据 sql += ICSHelper.InsertSQL("ICSMO", values) + @" #TempMO a diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs new file mode 100644 index 0000000..0d02250 --- /dev/null +++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs @@ -0,0 +1,174 @@ +using ICSSoft.FromERP.Model; +using Newtonsoft.Json; +using Quartz; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ICSSoft.FromERP +{ + /// + /// 工单工时统计(锐腾) + /// + public class SyncMoHour_Rhyton : IJob + { + private static object key = new object(); + private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + public void Execute(IJobExecutionContext context) + { + try + { + lock (key) + { + log.Info("开始……………………………………………………………………"); + Execute(); + log.Info("结束……………………………………………………………………"); + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + + public void Execute() + { + try + { + string conStr = ICSHelper.GetConnectString(); + string Namespace = this.GetType().Namespace; + // string Class = this.GetType().Name; + DataTable dt = ICSHelper.GetERPDB(conStr); + foreach (DataRow dr in dt.Rows) + { + var dtNowBegin = new DateTime(2000, 1, 1, 0, 0, 0);//默认开始时间 + var dtNow = DateTime.Now; + string erpName = ICSHelper.GetConfigString()["ERPDB"]; + string TenantId = dr["TenantId"].ToString();//mes 组织 + string TenantCode = dr["TenantCode"].ToString(); + string ErpId = dr["ErpID"].ToString(); //erpID + string Class = this.GetType().Name + TenantCode; + erpName = string.Format(erpName, TenantId); + + string sql0 = " SELECT top 1 ModifyDate FROM ICSERPTime where ClassName='" + Class + "'"; + var lastDate = ICSHelper.ExecuteScalar(conStr, sql0).ToDateOrNull(); + if (!lastDate.HasValue) + { + lastDate = dtNowBegin; + } + + string sql = @" if exists (select * from tempdb.dbo.sysobjects where id = object_id(N'tempdb..#tempSyncMoHour_Rhyton') and type='U') +DROP TABLE #tempSyncMoHour_Rhyton + + + +select +a.MoCode +,a.ItemCode +,a.OpCode +,a.MoPlanQty +,a.STime +,cast( cast( isnull( a.ProduceTime,0) as decimal(18,4)) /cast( 3600 as decimal(18,4)) as decimal(18,2)) as PTime +,a.ManualTime +,a.Status +,a.TenantId + ,a.CreationTime MTIME + ,a.CreatorUserId + ,a.CreatorUserName + + into #tempSyncMoHour_Rhyton +from +( + select + a.MoCode + ,a.ItemCode + --,b.ItemName + ,e.OpCode + ,e.OpSeq + --,e2.OPName + ,a.MoPlanQty + , + ( + select sum(isnull( f.Stime,0)) Stime + from IcsItem2Route h with(nolock) + join IcsItemRoute2Op f with(nolock) on h.ItemCode=f.ItemCode and h.RouteCode=f.RouteCode + where h.IsRef='Y' + and h.ItemCode=a.ItemCode + and f.OpCode=e.OpCode + group by h.ItemCode,f.OpCode + ) + as STime + ,g.ProduceTime + ,f.RecordingHours as ManualTime + --,0.00 as AlterTime + ,'No' as Status + ,'{0}' as TenantId + ,GETDATE() CreationTime + ,'job' as CreatorUserId + ,'job' CreatorUserName + from IcsMo a with(nolock) + left join IcsInventory b with(nolock) on a.ItemCode=b.ItemCode and a.TenantId=b.TenantId + left join IcsMo2Route d with(nolock) on a.MoCode=d.MoCode and d.IsMRoute='Y' and a.TenantId=d.TenantId +left join IcsMoRoute2Op e with(nolock) on d.MoCode=e.MoCode and d.RouteId=e.RouteId and d.TenantId=e.TenantId +left join IcsOP e2 with(nolock) on e.OpCode=e2.OPCode and e.TenantId=e2.TenantId +left join +( +select sum(RecordingHours) RecordingHours, +t.MoCode,t.OpCode +from IcsManualRecording t with(nolock) +group by t.MoCode,t.OpCode +) f on a.MoCode=f.MoCode and e.OpCode=f.OpCode +left join +(select t.MoCode,t.OpCode,SUM( datediff(SS,t.BeginTime,t.EndTime)) ProduceTime from IcsLotOnWipDetail t with(nolock) +where t.CollectStatus='End' +and t.IsHistory='N' +and t.CollectForm='Standard' +group by t.MoCode,t.OpCode +) g on a.MoCode=g.MoCode and e.OpCode=g.OpCode +where 1=1 +and a.TenantId='{0}' +and a.CreationTime>@LastTime +) a +where 1=1 +order by a.MoCode, a.OpSeq asc + + + + insert into IcsMoHourData ( + MoCode + ,ItemCode + ,OpCode + ,Qty + ,STime + ,RealTime + ,ManualTime + ,Status + ,TenantId + ,CreationTime + ,CreatorUserId + ,CreatorUserName + ) +select * from #tempSyncMoHour_Rhyton "; + + sql = string.Format(sql, TenantId); + sql = ICSHelper.Time(Namespace, Class, TenantId, sql, "#tempSyncMoHour_Rhyton"); + // sql += "DROP TABLE #tempSyncCas_Jinyang"; + + + // sql += @""; + + + ICSHelper.ExecuteDate(conStr, sql); + + } + } + catch (Exception ex) + { + log.Error(ex.ToString()); + } + } + } +} diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index 09b8fbd..20172ab 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - IcsMo_Rhtyon test = new IcsMo_Rhtyon(); + SyncMoHour_Rhyton test = new SyncMoHour_Rhyton(); test.Execute(); // var ss= ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261); From 421525c035c8542faf331de09bbfa72942dabb04 Mon Sep 17 00:00:00 2001 From: xusc Date: Thu, 12 Sep 2024 15:37:09 +0800 Subject: [PATCH 3/3] ... --- .vs/ICSSoft.FromERP/v16/.suo | Bin 382464 -> 369664 bytes ICSSoft.FromERP/IcsMo_Rhtyon.cs | 7 ++++--- ICSSoft.FromERP/SyncMoHour_Rhyton.cs | 8 ++++---- ICSSoft.Test/Program.cs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo index 2cd846d9e73197540bb78f672fc2cd3f9c5280cd..56c61f4abc67f6e07ec3fb7d9b74c36ebe02b75d 100644 GIT binary patch delta 13017 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 Lpc-DH#b5jvWXe#U diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs index a775872..d79f098 100644 --- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs +++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs @@ -87,6 +87,7 @@ namespace ICSSoft.FromERP ,A12.Code as TenantId ,A12.id as Org ,a.DescFlexField_PrivateDescSeg1 AS EATTRIBUTE1 + ,a.DescFlexField_PrivateDescSeg2 AS EATTRIBUTE2 ,( select b1.code from {1}.dbo.UBF_Sys_ExtEnumType a1 left join {1}.dbo.UBF_Sys_ExtEnumValue b1 on a1.ID=b1.ExtEnumType @@ -173,10 +174,10 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'"); values.Add("LastModificationTime", "a.Mtime");//操作时间 values.Add("Default1", "a.EATTRIBUTE1"); - //values.Add("Default2", "a.NeedType"); + values.Add("CusItemCode", "a.EATTRIBUTE2"); values.Add("DocType", "a.MoDocType"); // values.Add("Default3", "a.ActualCompleteDate"); - values.Add("MOSTATUS", "a.MOStatus");//生产订单状态 + //更新存在数据 sql += ICSHelper.UpdateSQL("b", values) + @" #TempMO a @@ -198,7 +199,7 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate values.Add("CreatorUserId", "'" + ConstWorkPoint.Muser + "'");//操作人 values.Add("CreatorUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称 values.Add("TenantId", "'" + TenantId + "'");//站点 - + values.Add("MOSTATUS", "a.MOStatus");//生产订单状态 //插入新增数据 sql += ICSHelper.InsertSQL("ICSMO", values) + @" #TempMO a diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs index 0d02250..3dee8b5 100644 --- a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs +++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs @@ -110,10 +110,10 @@ from ,'job' as CreatorUserId ,'job' CreatorUserName from IcsMo a with(nolock) - left join IcsInventory b with(nolock) on a.ItemCode=b.ItemCode and a.TenantId=b.TenantId - left join IcsMo2Route d with(nolock) on a.MoCode=d.MoCode and d.IsMRoute='Y' and a.TenantId=d.TenantId -left join IcsMoRoute2Op e with(nolock) on d.MoCode=e.MoCode and d.RouteId=e.RouteId and d.TenantId=e.TenantId -left join IcsOP e2 with(nolock) on e.OpCode=e2.OPCode and e.TenantId=e2.TenantId + join IcsInventory b with(nolock) on a.ItemCode=b.ItemCode and a.TenantId=b.TenantId + join IcsMo2Route d with(nolock) on a.MoCode=d.MoCode and d.IsMRoute='Y' and a.TenantId=d.TenantId + join IcsMoRoute2Op e with(nolock) on d.MoCode=e.MoCode and d.RouteId=e.RouteId and d.TenantId=e.TenantId + join IcsOP e2 with(nolock) on e.OpCode=e2.OPCode and e.TenantId=e2.TenantId left join ( select sum(RecordingHours) RecordingHours, diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs index 20172ab..09b8fbd 100644 --- a/ICSSoft.Test/Program.cs +++ b/ICSSoft.Test/Program.cs @@ -13,7 +13,7 @@ namespace ICSSoft.Test //ICSVendor test = new ICSVendor(); //test.Execute(); - SyncMoHour_Rhyton test = new SyncMoHour_Rhyton(); + IcsMo_Rhtyon test = new IcsMo_Rhtyon(); test.Execute(); // var ss= ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261);