From 9d10f441f64ff6d740cd032d4f18875b8c01670f Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Mon, 11 Nov 2024 15:54:49 +0800
Subject: [PATCH 1/5] ..

---
 .vs/ICSSoft.FromERP/v16/.suo      | Bin 346624 -> 346112 bytes
 ICSSoft.FromERP/IcsSBom_Rhtyon.cs |   6 +++++-
 ICSSoft.Test/Program.cs           |   2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index 416e1dc07131b9cc6c8a2bdd753f44f6eef151bd..9d405cf60cb83477416cade5aeda762644861f31 100644
GIT binary patch
delta 14703
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
Y<*S(MIo5Cj8w8q`X0))?8rzZde_|>vcmMzZ

delta 13270
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

diff --git a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
index 49fa25f..a403745 100644
--- a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
@@ -77,6 +77,7 @@ isnull( A6.[Code],'') as 项目号,
 ,A.ModifiedOn as MTime
 ,A.ID as ErpDetailID
 ,e3.Name AlternateTypeName
+,u1.Name as SBItemUom
   INTO #TempBOM
 from  {1}.dbo.CBO_BOMComponent as A  
 left join {1}.dbo.[CBO_BOMMaster] as A1 on (A.[BOMMaster] = A1.[ID])
@@ -91,7 +92,7 @@ LEFT JOIN {1}.dbo.[Base_Organization_Trl] AS J ON ( I.[ID] = J.[ID]   AND J.SysM
 left join  {1}.dbo.UBF_Sys_ExtEnumType e1  on e1.Code = 'UFIDA.U9.CBO.MFG.Enums.AlternateTypesEnum' 
 left join {1}.dbo.UBF_Sys_ExtEnumValue e2 on e1.ID=e2.ExtEnumType and e2.evalue=A1.AlternateType
 left join  {1}.dbo.UBF_Sys_ExtEnumValue_Trl e3 on e2.id=e3.ID and e3.SysMLFlag='zh-CN'
-
+left join   {1}.dbo.Base_UOM_Trl  u1 on a.IssueUOM=u1.id and u1.SysMLFlag='zh-CN'
 where 1=1 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 
 and A1.AlternateType=0
 and A1.bomtype=0
@@ -123,6 +124,9 @@ and  a.TenantId='{0}'
                     //values.Add("SBItemDesc", "a.子阶料描述");
                     values.Add("SBSITEMCODE", "a.子阶料编码");
                     values.Add("SBITEMQTY", "a.子阶料计量数量");
+                    values.Add("SBUsageQty", "a.UsageQty");
+                    values.Add("ParentQty", "a.ParentQty");
+                    values.Add("SBItemUom", "a.SBItemUom");
                     values.Add("SEQ", "1");
                     values.Add("SBItemECN", "a.工程变更号");
                     values.Add("SBItemStatus", "'Y'");
diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs
index 20172ab..de67061 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();
+            IcsSBom_Rhtyon test = new IcsSBom_Rhtyon();
             test.Execute();
             //  var ss=  ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261);
 

From 82c38698a90e5bf45ad83629826a9e58ac03d60e Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Mon, 11 Nov 2024 16:58:35 +0800
Subject: [PATCH 2/5] ..

---
 .vs/ICSSoft.FromERP/v16/.suo         | Bin 346112 -> 347136 bytes
 ICSSoft.FromERP/IcsSBom_Rhtyon.cs    |   2 +-
 ICSSoft.FromERP/SyncMoHour_Rhyton.cs |   3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index 9d405cf60cb83477416cade5aeda762644861f31..57a431a03dcc030377c337bfb9b96885e853f484 100644
GIT binary patch
delta 4804
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

delta 4872
zcmb`~3wRXO6$kK~duPJtL0HIxKw=U=!a^V>ArJ_WY$Adp#t<F_q%;HqqNq_rND#~d
zK@p;POxOdFSGG8)r4+I@gH-9NpjNF41*Kq-(5Tc}no^{SLi)c6pcPTuuls$!J$LTT
z+?jjMo!MR2+HhBOcy&^;-=&w`&o2<|0JzZB)~31%MnVv5hP&Z`oil?(fc@6fABLnJ
zrCr7XQ7%>s?^zK@6l{<dbxkhz8VeCH8O~$0c*N~cY7Ez+2CYPED{O$DLjq0|jd%xK
z14CdwJPAvTrCRra%g`!>-@{X|0vIx38>GOspn<VhOA5z1+ti7>W9Te&HiBsc=zYrl
zg`Zy$w#L9FI07M%2vguL7zgjd1egXHphmnMaXRQ2Bm82Y>i^@#b`s*97u$0XZSWvC
z;Tc%v=Qqi35gIpuy1eHR?*V}U{Xh+-`U}ynKv#D-hbcrME`-If4hmokJPMCMt+?A(
zZF{o4B;EyLHPzZ|sX9JTgQ;>(MY|L(73XHO(cOMB6;*LmG%}F9tJJ~PC+=Zf%Max~
zQk_%1zL|TqZ3OF)cdNShg>ROj0;AS|Kl(3~K^>sV@EH1khIpwA%h3LI8PqD93Dwwl
zHsYl++;7zAq2pJf7m075-qrH1^7(yvS68F*uHqK&X8}RN6C!FO&QQGfvxp$_oE3&E
zBHA0>twkDJg6)Pqc$}uvZsZ5wq$S`$@3!EHWYnF^rE+V0G0mmX_u{gO;6At?9)Mz4
z041;xN}&uE!Go|EmcT=xhIf(oLKlbd#z!Baudk*tuDA=WH5T+J_m9M>SCDb;6^FNX
z(y>mS#ln*wRy(Xzlyvqkig}nit~$4+tLGu%nH?E07yCa1os59GKDs)^P9wP>s_$1g
z;S=b0BidDjf#AV9orU--__c9gU2JDBTEB$#&}1~kg_33LtP4#(gY8N%Ar4BQ2dstX
zU^gto=r16a!ye<af=pU%44IWs;|dOV7G1a+WVCrrY>g|!cxP5p^5v_=hy9=$RI(j#
z6mnoNRKexB6keK3GkUK&7ks9kgpWZDsI}oiyb)p{8!pch?WbWp`~nU^`<w?|nzOp@
zIP_j^&g%1WW9Mr(V7~ij#U|%r-}m4!<iiMfA5;?l1RsF9qT`5bfO%#ih1R%+sjSqx
z<Gt~&Bf95VVPtJd@FuK06x0}5OdTsCsAEOoAUr7B#`O0(+=qia4-3y0&2w0Io(Zgt
zDfa&jKHNQ^eSvtIY_-ADzrB`oCX&Y^8ebyerKj4+vqyMd6CR&%+i*j~zj-9cb53}U
zi2e&OkeZx^WuoFwuw4tCux*3B5C}m=|BvQ&RwY`Bt$yGzHhlEY_MW-eQpet5EcK<;
zxCYj`ai1M)>Ezifbk*-NYECZqR-Y`Q8kf!UiRO7l@c8$rpSNG@twN-cx8(FHY5J3B
z{G0?+4)tSKE5&(l+PjN9uM5uwTjN(}$Ugw5iB2=l<tADV8yybdWfx?Qm6J=`NLP>X
zE>>G8k>>t{qIvyT3bq_$=`gwPq25;So^-6QIgLcXQY_%E*g5QCL7bicg`Ra#4=-Qr
zt>)lDdefn%`#HM5fHEBPCF0|V=MnEiRFhLLa}@bE<q;~_ofk}?)#f-7=0wuWFljSf
zsSd*v7HK)}Bp;d6$!6X|cow~H_uAiYCA9`z2XKW&bWEBhIBq_asyviYF?X3Sb*pSK
z-9@olpYEGiemckddfAQHcQsUIte-!-y*)WB_l=pi=UcLoULf|J5Rn||C5O8krIU@5
z>nMR^B54aBub?pA+=FKD;!vts<5Fo^M90W*h;E!)hkRkT6J*U;M#srIo<(tjr)N`)
z6*C3hT-1YXmd{CXWI4(yy<4w)-`yYFIw$eOqWpvNzRbQb=16$#^0U28pMUP)ogr3q
zR!JT=^q~HnQ%eJ_!!_j4+_#X!a;!&9xZ(zy$UEw2G-L2EYrC8B^rnrpTNsHVkav`$
zg88c`pPlcKugNZbnAg+foOii+$iK?Fy6;td^y0Q^t9yJkwktv1rH><4K|b2*F0Dn|
zfI3*CppOx+z6@f%e;IJxNK7FxTAmH+sN^mr)pSVBqCM0`+!{feB?n5chRNBwb@BV{
zncaRHS2)IuDGAA$(dVO4oZF2ec;rX)62DW08ZD})QRX>{<i>ZjSNN3{TExrhDUR*c
zlus*-7dK|Ih!A<4KTl*>kH1g%6Bn$bY`2^0JBnPno$ThvL}r-qH$TC0>M4Z#B>A`i
z$>!WjEQ@n)x|X|TQwC>jrM+f}NH+%vVde|LE}JS-qBtx$yFtt2#Ro-C&YvkXtEf>_
z$I?AU*7KQqf28deZr)A}-@ft#LNi=H#Sl{jDxDG`!no)S;jl8^6?^e*79DTJPZvkj
zva?(E!=hDp5YjI|f(APHLnp9700e^J@Whpeq7e=&AQG12Lc*X2+C3o(qTw2dfmn!x
zUeFu*z_rj9;-Me(hZGn91EDj<OGF%mcpYLA3<W&VL)yG(s1>1{x0be20#;|NoWU{8
zqBrOFAdT}qcw2dja(V438lb+x@YA?dh4vSJn58FL&cD-9!I90Pul<S@(Y0Az$8pUf
z?tgsi?YHdWGkG~;1+0LF;SpE~k8-aZ>NBnuO#|v+4Y+|}Ev$ojcmmeL2G|IjKux{@
zF%`)`v(1HxwLjtA$3%<OQbN&Wo~6{L3ehr+cSMLve&;Sx?LHw~?EFAD^|`&5ELmdh
zv&j)U`@H0I9~VA1K49N*ytzIQF4HcxEA~GjMvyrND>_hW+-s<w%%g56yOk9ovvdxu
zqSDUlZ;VQ~iq~^PIi7yIt7tOnfwj7@=^D9=IJHi#@N$|>oK%OW)5r=MP3-C=eVkZN
z{vA2L5G(7O4v~x8tH@_L`^ssg&Jb_;j#Hvw-+C>CH}%K;<f@_~qwA*b#*DHM>&ZXU
z6ZG}%%DxY26wg^lBmeX6Z2B1A1>bc$S{c_#jjnokZB!Sm{g*3^okQgB`pr(AnKCnZ
z){sHN(`F_QN=+SFFlbn6VF6mh)6xo33WpRH%!=^a&dC#H8UJ;g9LgUIm7A@UVR8y`
zlPw?Q9sA@kYt?XBB9hkPKfsp~H&Wr?;e`b$gNF?onv{f53zKFKDoDoAgVRz{k_V^E
z8a$*R>Bo%vs4NNQ!UkDsRgIQWw(xS4@6t>Ca*KgcTr)~O&3ndbK~~Yravxb+@?@*v
zA^YST+&@qDap%c+9+xL?Bd=9CNrraemMR*Ee2rg0Y35G+HaLE&t&O{Ddb*f$13Tx)
zgM9M=Z6G@frLXA@If?l7)0AMj=E*T#w88k1$`6#vA?`9cnVn@aj0cp-2+LI__xMu@
zH&|LIZ}w^v`S~`PZJmtJ>V)O2kc)^P+aN33)5W`2$kE)8E@QaWDFgTkw@k67R?4jb
zmnT~+xobUkik%>xeA`;Nl3jnno;xPWWUgkpnu|urRI5{r_C=8SycArsT$XU_DS17=
z`IdaaDoW5++qzznF00FSd4|kA>VTcH7th-(vw6-A`6?&v!!L?|JS*LjC++XJ%v<@k
zVcHn=wu-CrWH8cKzDrh+`z5(GT>Z!Gc-ejVXhgsjm0(oj4SsPNR!wV*47YN2<JX8x
ze=yCucY^Hu-6dj_Xd(C7B+IRGr?w%4Q_5*9=QhipJo{B-)mg0hyXz^kvxPHm^c(G$
zjz9KAR@)zBCZRY)EDp(xK);bw-VVebcy7I>>BHD}NILi}O^-BNq-N%6_z5&ZW?Gpi
z<<vkPKT%Fql}P2c|0a+A_~qaVG^c5rSuDjCO*EBA5*BG%8@Ws6tN)jUV(pI7vLd@)
zk!)4R82RIiwp3c@Gqo(WdVerMO$X)3AD78IZE@2`-G%SD(-gzTer+n-bv?j5pb684
zgk<Ycf}_UjSALUOxnuPt;_<rPgFnsE`%#5K&t#gjwIp-2F3dVDy<^~rW-;I!-*we1
ND8h8=nmJY%{{{@Qx)=Ze

diff --git a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
index a403745..7f923ee 100644
--- a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
@@ -94,7 +94,7 @@ left join {1}.dbo.UBF_Sys_ExtEnumValue e2 on e1.ID=e2.ExtEnumType and e2.evalue=
 left join  {1}.dbo.UBF_Sys_ExtEnumValue_Trl e3 on e2.id=e3.ID and e3.SysMLFlag='zh-CN'
 left join   {1}.dbo.Base_UOM_Trl  u1 on a.IssueUOM=u1.id and u1.SysMLFlag='zh-CN'
 where 1=1 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 
-and A1.AlternateType=0
+--and A1.AlternateType=0
 and A1.bomtype=0
 
                                                 IF NOT EXISTS(SELECT * FROM #TempBOM)
diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
index 07c5822..38e16cc 100644
--- a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
+++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
@@ -150,6 +150,7 @@ order by a.MoCode, a.OpSeq asc
  ,RealTime
  ,ManualTime
 ,MachiningTotalTime
+,EqpTotalTime
 ,ResQty
 ,HourDiff
  ,Status
@@ -169,6 +170,8 @@ a.MoCode
 ,a.PTime
 ,a.ManualTime
 ,(a.PTime+cast( a.ManualTime as decimal(18,6) ))
+,case when a.ResQty>0 then (a.PTime+cast( a.ManualTime as decimal(18,6) ))/a.ResQty
+else 0 end as EqpTotalTime
 ,a.ResQty
 ,(a.PTime+cast( a.ManualTime as decimal(18,6) )-a.TotalTime)
 ,a.Status

From c382a410ca9dffc9648075e5f9295026c3a5b38a Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Tue, 12 Nov 2024 09:18:20 +0800
Subject: [PATCH 3/5] ..

---
 .vs/ICSSoft.FromERP/v16/.suo      | Bin 347136 -> 347136 bytes
 ICSSoft.FromERP/IcsMo_Rhtyon.cs   |   5 +++++
 ICSSoft.FromERP/IcsSBom_Rhtyon.cs |   2 +-
 ICSSoft.Test/Program.cs           |   2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index 57a431a03dcc030377c337bfb9b96885e853f484..a58655838024cb70d4cfe46a32c9553f1457b5e1 100644
GIT binary patch
delta 2819
zcmbuB3s6+o8OQg#-(B1#YkA9~ir}M?!NpzJ@DK!Cu}-WdN?XSyYI!WyYK^9mRD>vE
zY^=}}ytqdb)0PdckFg-EaBQ>|%wsxDThW?GA{9g8qb4zE)f!{9{|lsHqU|{8-T9sG
zJLlf}?fL)D*)v<QHLPN5Sj~5bzhW>LTELINh30|>6m#E$Wr?F4r|5US62(VBt8rs5
zxPz+^u~JJ@%cxarRkMPYqOXE*G8m>JF4m03s<pe3EdnM`2C6|7p4fz#4W<FT+9AXz
zfKfpe@Gp$*L4PswXAw7oTX;_&{|WLbU>k4({r#UIJ_qs)%kf!hh%rn@y_H&kve5LT
zyJ}E_-$A0)n%y)uau=S}mAnLA2Jxsp60uTSW=a|5L$(13kOf*nA{YnmXdP-&zuI%?
z4N+@OGB#tRN1I{}FL(#pGVmD40J@gP!F(_bn!*q>fj;-Y4aRW9CE#A3y^Zmqo;{<r
zn&ZRtx4-O0gYTMoeE_+ArIDYh^t7)enuGM-q+cYe<*1@r3dfPu?1fqMTkXlh(Xo1w
z-{8h=JsG^7LVr6r3=V3|bs<_qOdz#s#|po0T#K<|+O@*0STC}ppc5PiZvnkZE~36r
z%SAykh16E4<^ve%FRi_|Wpr&t;M9v4_z-*qJ_eV-C!h~p23Np8z%{TOTnGOIH^8SL
zWw5lV#bvTlxn{1L&@XE2s1I;A5V*la&;YlK5Ssu5*Nu+diR^R13z6&7eH7?|^-1;%
z4yr{@7qK644j3xF`43rZb@Ba@1{+=c(Ef7lsFN7$0(szF&<%7e@<BS#>z_e<5A=ff
z!4_~9e2VvVGj;UmzT{ZqSGUaL&hT_Ao)fB8;T)qigpKrN9zQ~!cNI^U;yLZ_*{^89
zalxXqM0NPSdGQtY29qM@oTLf934QO7=Ym3uwW%M@6$#~Pu<wUg1#P~vlK$>1xl%=*
z8;a+;;<>4KZkt+e-5@0@MY}mWLB^S=%dEvI!D4nDS!8qs^-^0XDXLVm={C8apfPex
z6rCO~j@Qs+k>9M2lyjZ5hs1m*Ma$@Uc;1^seqKLPyt7Dge~aQ|+)U~sZ!Vd<YcM(&
z%qLS@Fe^&!QzK-Ai!Ow0sn83rrqkqI1reT2G(xP{M^B4{Dw-${R8W4TSzowN@Ro>u
zf!0x@n6rWEMdmqLIpkKyi!>=_`{EtdJ%+MnC-<~=zy1A-%~dxaogW@NJ8*MM!25}@
zf6kDBzob4InA>*DO&r-uz4G)&w2}J1P$2aPhzXUmUZ(wu$d4pd7)xn|2>1~jWobEm
zhen4ky<A{@ywLZ@(&^5>)Es$i-l>BA-0mvcxno(8=y`_1++K>;dWMC`>{ZlGqVhK9
z%G_P_HD&l#Y#V*+V8`5fb?`@0BP_*q)lzb5L4Tp8_0<{f7K)J*Tj&Idju@j|+9UX=
zS*th>w+`rTogh`xVY)-2Zv;|4Lrs1|?0{3#+s@N1;zpd3K~9<?GbZtCO4}t;{ph?_
zdttrYc$HR#doRNF-an}^GRC5uG5_>BwOv<QlJBFG_Yx_S+zAH5XN-fl*j}7kl;lXZ
zx>8bXR>wn*Bx{;|QKHqB{E)5KW=kuuyBs47BKBimEmownL-Zu`uSI1NuMwZ@W#box
zQj?2auB1h&)*^>}k=5aFq*&7&$%$5%J*hC&ZnGs7q!#@5LW!cn$z@{S>zpbRQz2M3
zq;rFL$oDR&=Q?T<>ztU#?|1UUBJdE8lW6)_bUw@$5s=F-hB>g`2Ci}K`r#4{azt$o
z?-qw=st?E&uks->>c?1wu)oen#e;b~)}6=S5VP`lnyBvLFlju?(<n$k)&{Qe?QbHn
z2|5eWffLmn(bU4RdQ<vEWs$vuYh*(nyHuG!kJByE?cyb){G(C~h7i0C={16@20T1E
zmCeHZ8qbi?>v;@`pTES_1KP8nWnxiZ$=3TZ#J|nW+x&+V)=iQ&s~W0^AJp@vyZq8k
zdtL;+!STYD$wtvMjnm}5-JGii-Q}DNXyhm!^lHvAuF+@sZShE|Izw-MB{syXgL;M^
z<dgR>Y+bzCw6lIDE5bgRL&cgF4iwwG?9`hVWJn_ml9%`M0;8paawgmGDNC_CW&JER
zEBCXK2_y=Rak=Qs;B*mio<n74JKONfN{6)i+5G%{Ewuh`W#Ag$uKz#D{?9_ki{`zY
zDYKnww?#(%mCvan)60?nbNS7RMx_xVaF^;3`KszK=XUd+VPc`=86x6)*s*B(=<_Xd
zg_n%~3R}d)a+sSp-)rUH^!xu;@-9cDzLGR_#i&En3V!Y`>pL^lESdEN_gdu0N7N5)
F{TrZqgeCw0

delta 3191
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

diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs
index c5df4f7..d7d5706 100644
--- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs
@@ -103,6 +103,7 @@ and b1.code not like 'K10%'
 ,case when a.ActualCompleteDate is null then ''
 else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate
 ,a.IsFIClose 
+,e3.Name AlternateTypeName
                                         INTO #TempMO
                                         from  {1}.dbo.MO_MO as A  With(NoLock)
                                         left join {1}.dbo.[MO_MOMemo] as A1 With(NoLock) on (A.[ID] = A1.[MO])  
@@ -116,6 +117,9 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate
                                         left join {1}.dbo.[CBO_Department] as A13 With(NoLock) on (A.[Department] = A13.[ID])  
                                         left join {1}.dbo.[CBO_Department_Trl] as A14 With(NoLock) on (A14.SysMlFlag = 'zh-CN') and (A13.[ID] = A14.[ID])
                                         LEFT JOIN {1}.dbo.[CBO_Wh] AS A22 With(NoLock) ON A22.ID=A.CompleteWh
+                                        left join  {1}.dbo.UBF_Sys_ExtEnumType e1  on e1.Code = 'UFIDA.U9.CBO.MFG.Enums.AlternateTypesEnum' 
+                                        left join {1}.dbo.UBF_Sys_ExtEnumValue e2 on e1.ID=e2.ExtEnumType and e2.evalue=a.BOMAlternate
+                                        left join  {1}.dbo.UBF_Sys_ExtEnumValue_Trl e3 on e2.id=e3.ID and e3.SysMLFlag='zh-CN'
                                         where  (A.DocState=2 OR A.DocState=3) and  A.[BusinessType] != 50 and (A.[BusinessType] != 52) 
                                         and (A.[BusinessType] != 2417)  and (A.[IsMultiRouting] != 1) and A.[ItemMaster] is not null --and (A.[IsStartMO] != 1) 
                                         and  ISNULL(A.ModifiedOn,A.BusinessCreatedOn)>=@LastTime AND A12.id='{0}'
@@ -173,6 +177,7 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate
                     values.Add("Default3", "a.ActualCompleteDate");
                     values.Add("Default5", "a.DocState");
                     values.Add("Default6", "a.IsFIClose");
+                    values.Add("Alternate", "a.AlternateTypeName");
                     
                     //更新存在数据
                     sql += ICSHelper.UpdateSQL("b", values)
diff --git a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
index 7f923ee..f5e6610 100644
--- a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
@@ -139,7 +139,7 @@ and  a.TenantId='{0}'
                     values.Add("LastModifierUserId", "'" + ConstWorkPoint.Muser + "'");//操作人
                     values.Add("LastModifierUserName", "'" + ConstWorkPoint.Musername + "'");//操作人名称
                     values.Add("SBItemContype", "c.ItemContype");
-                    values.Add("SBUseage", "a.AlternateTypeName");
+                    values.Add("Alternate", "a.AlternateTypeName");
                     values.Add("FixedScrap", "a.固定损耗");
                     values.Add("Scrap", "a.变动损耗");
                     values.Add("ScrapType", "a.损耗类型");
diff --git a/ICSSoft.Test/Program.cs b/ICSSoft.Test/Program.cs
index de67061..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();
 
-            IcsSBom_Rhtyon test = new IcsSBom_Rhtyon();
+            IcsMo_Rhtyon test = new IcsMo_Rhtyon();
             test.Execute();
             //  var ss=  ICSHelper.ApiSign("sj_w_id", "70FF7F01C5899A5ACAAD4ECB7FA5B3C5", 1724650261);
 

From f488115ccce12fa8f71062b9fe2d1e0ecde07be7 Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Tue, 12 Nov 2024 11:11:27 +0800
Subject: [PATCH 4/5] ..

---
 .vs/ICSSoft.FromERP/v16/.suo      | Bin 347136 -> 347136 bytes
 ICSSoft.FromERP/IcsMo_Rhtyon.cs   |   1 -
 ICSSoft.FromERP/IcsSBom_Rhtyon.cs |   2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index a58655838024cb70d4cfe46a32c9553f1457b5e1..d850f420dd8efc0a803a40fbf7e7406ca4a0a9ea 100644
GIT binary patch
delta 3756
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
DFlITv

delta 5032
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
Nqa{{LoTGN1`w!xv+T#EK

diff --git a/ICSSoft.FromERP/IcsMo_Rhtyon.cs b/ICSSoft.FromERP/IcsMo_Rhtyon.cs
index d7d5706..7d4ab75 100644
--- a/ICSSoft.FromERP/IcsMo_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsMo_Rhtyon.cs
@@ -161,7 +161,6 @@ else Convert(varchar(10),a.ActualCompleteDate,120 ) end as ActualCompleteDate
                     values.Add("WHCode", "a.WHCode");//仓库
                     values.Add("MoPlanStartDate", "a.StartDate");//开工日
                     values.Add("MoPlanEndDate", "a.DueDate");//完工日
-
                     values.Add("MOMemo", "a.MOMemo");//生产订单状态
                     values.Add("MoUser", "a.CreatePerson");//生产订单状态
                     values.Add("MODOWNDATE", "a.CreateDateTime");//生产订单状态
diff --git a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
index f5e6610..28c7e63 100644
--- a/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
+++ b/ICSSoft.FromERP/IcsSBom_Rhtyon.cs
@@ -94,7 +94,7 @@ left join {1}.dbo.UBF_Sys_ExtEnumValue e2 on e1.ID=e2.ExtEnumType and e2.evalue=
 left join  {1}.dbo.UBF_Sys_ExtEnumValue_Trl e3 on e2.id=e3.ID and e3.SysMLFlag='zh-CN'
 left join   {1}.dbo.Base_UOM_Trl  u1 on a.IssueUOM=u1.id and u1.SysMLFlag='zh-CN'
 where 1=1 and IsEffective=1 and A.ModifiedOn>=@LastTime AND I.id={0} and A.ComponentType=0 
---and A1.AlternateType=0
+and A1.AlternateType=0
 and A1.bomtype=0
 
                                                 IF NOT EXISTS(SELECT * FROM #TempBOM)

From 381b8b5af10f201c4752c2eb1421234cbdebe880 Mon Sep 17 00:00:00 2001
From: xusc <xu960413@163.com>
Date: Tue, 12 Nov 2024 15:56:13 +0800
Subject: [PATCH 5/5] ..

---
 .vs/ICSSoft.FromERP/v16/.suo         | Bin 347136 -> 346624 bytes
 ICSSoft.FromERP/SyncMoHour_Rhyton.cs |  49 +++++++++++++++++++++++----
 ICSSoft.Test/Program.cs              |   2 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.vs/ICSSoft.FromERP/v16/.suo b/.vs/ICSSoft.FromERP/v16/.suo
index d850f420dd8efc0a803a40fbf7e7406ca4a0a9ea..bdb9766d40714dc54c0c1d4fded42908d10742f2 100644
GIT binary patch
delta 6125
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

delta 5169
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
E0pWlxxBvhE

diff --git a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
index 38e16cc..8cfc043 100644
--- a/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
+++ b/ICSSoft.FromERP/SyncMoHour_Rhyton.cs
@@ -61,9 +61,22 @@ namespace ICSSoft.FromERP
                     }
 
                     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.*
+,(a.PTime+cast( a.ManualTime as decimal(18,6) )) as MachiningTotalTime
+,case when (a.EqpCalcType='1'and a.ResQty>0) then (a.PTime+cast( a.ManualTime as decimal(18,6) ))/a.ResQty
+else 0 end as EqpTotalTime
+,(a.PTime+cast( a.ManualTime as decimal(18,6) )-a.TotalTime) as HourDiff
+ into #tempSyncMoHour_Rhyton
+from 
+(
+
+
 select 
 a.MoCode
 ,a.ItemCode
@@ -75,13 +88,14 @@ a.MoCode
 ,((a.STime*a.MoPlanQty)+a.Rtime) as TotalTime
 ,cast( cast( isnull( a.ProduceTime,0) as decimal(18,6)) /cast( 3600 as  decimal(18,6)) as decimal(18,6)) as PTime
 ,a.ManualTime
+
 ,a.Status
 ,a.TenantId
  ,a.CreationTime MTIME
  ,a.CreatorUserId
  ,a.CreatorUserName
+ ,a.EqpCalcType
 
- into #tempSyncMoHour_Rhyton
 from
 (
  select
@@ -103,6 +117,7 @@ from
   ,GETDATE() CreationTime
   ,'job' as CreatorUserId
   ,'job' CreatorUserName
+  ,h1.EqpCalcType
  from IcsMo a with(nolock)
   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
@@ -131,10 +146,11 @@ and a.MoStatus='mostatus_close'
 and a.Default6='0'
 and a.TenantId='{0}'
 and e.OpControl='10000000'
-and (h2.id is null)
+and h2.Status='No'
 ) a
 where 1=1
-order by a.MoCode, a.OpSeq asc
+) a
+
 
 
 
@@ -169,17 +185,36 @@ a.MoCode
 ,a.TotalTime
 ,a.PTime
 ,a.ManualTime
-,(a.PTime+cast( a.ManualTime as decimal(18,6) ))
-,case when a.ResQty>0 then (a.PTime+cast( a.ManualTime as decimal(18,6) ))/a.ResQty
-else 0 end as EqpTotalTime
+,a.MachiningTotalTime
+,a.EqpTotalTime
 ,a.ResQty
-,(a.PTime+cast( a.ManualTime as decimal(18,6) )-a.TotalTime)
+,a.HourDiff
 ,a.Status
 ,a.TenantId
 ,a.MTIME
  ,a.CreatorUserId
  ,a.CreatorUserName
 from #tempSyncMoHour_Rhyton  a
+left join IcsMoHourData b on a.MoCode=b.MoCode and a.OpCode=b.OpCode
+where b.Id is null
+
+
+update IcsMoHourData
+set STime=a.STime
+ ,Rtime=a.Rtime
+ ,TotalTime=a.TotalTime
+ ,RealTime=a.PTime
+ ,ManualTime=a.ManualTime
+,MachiningTotalTime=a.MachiningTotalTime
+,EqpTotalTime=a.EqpTotalTime
+,ResQty=a.ResQty
+,HourDiff=a.HourDiff
+from #tempSyncMoHour_Rhyton  a
+ join IcsMoHourData b on a.MoCode=b.MoCode and a.OpCode=b.OpCode
+ where 1=1
+ and b.Status='No'
+
+
 
 
 
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);