From c382a410ca9dffc9648075e5f9295026c3a5b38a Mon Sep 17 00:00:00 2001 From: xusc Date: Tue, 12 Nov 2024 09:18:20 +0800 Subject: [PATCH] .. --- .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*)vLTELINh30|>6m#E$Wr?F4r|5US62(VBt8rs5 zxPz+^u~JJ@%cxarRkMPYqOXE*G8m>JF4m03sk4({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;{z_e<5A=ff z!4_~9e2VvVGj;UmzT{ZqSGUaL&hT_Ao)fB8;T)qigpKrN9zQ~!cNI^U;yLZ_*{^89 zalxXqM0NPSdGQtY29qM@oTLf934QO7=Ym3uwW%M@6$#~Pu1xl%=* 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!Vdu zf!0x@n6rWEMdmqLIpkKyi!>=_`{EtdJ%+MnC-<~=zy1A-%~dxaogW@NJ8*MM!25}@ zf6kDBzob4InA>*DO&r-uz4G)&w2}J1P$2aPhzXUmUZ(wu$d4pd7)xn|2>1~jWobEm zhen4ky)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~9BwOv8bXR>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?(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^ zY+bzCw6lIDE5bgRL&cgF4iwwG?9`hVWJn_ml9%`M0;8paawgmGDNC_CW&JER zEBCXK2_y=Rak=Qs;B*miopL^lESdEN_gdu0N7N5) F{TrZqgeCw0 delta 3191 zcmb7_3sh9s6^3WubHN$F1;|S*BBDlBwLq#PR+Gs_HCa7uZ3=eIs#klaTWsFID z(MG(=hGVy(5rSYwT1=znLRA);N$VSRV+dmj6o z{h!TTdwGbxJY?OZ?r$3mh8i#zd|hMpRZMgC4!R#|IZFpz^Ar~aF2ukN(1unGyG%<~ zmr$LyR~;2N6YnYrBZFZK>}<`;Yi;p1cm==+mVnV;=b%w&jYOAYfR;eCK; zp%!cG7ycF|>#4j6wt^=SJOXx^HrtrkyB6N7fWatG2jW0~(55x2@$Pj0gSSrUn&Q27 zq2~*2q$$k$8N69wDi{Iu1g3!(KsO{60-Fl-1g^E)FxX#$hl%zV^y{K61#Z!_y{0Ea z9+cx{j4pP4Wm@4+<*r5H_f%TtninYo^|zs~$Eo^mnxCyd)oZb~QM6Bc$=0X%8+85= z3-v+0&4<4k><90*_dgCB1Bv#)E^qJi%x-Jji}!MH3q%1M(C;oB_8=$*&EODd0FB@< zcn=&g7&QOf0mW7DkAoB7Bsc~1b4`HNV|8wYIL8_Ep92z{2cH6c-bL6;;4=6d_#EhK zufSey_y5^$_5SPd|79>Jh8FEo?vJQYtNCDPZJyCgPR+Dopj)PXy}!bw08j=7gDS;f z$c5bvAmN5SeLEz45k2~mr+^L#^=(SE8e34Ten1ySvcUHe4W}7JRe1I({wvme0h=;OhcR2g5`tB!MuyTCcK9!d?@onVjQEaZV(ob1G~a$OA8sk*5r%9;J3~ z*|UJI2053KveB*|VKH4Gre##b{=X7la#0mMOP1KY+_(NPJJ;2;Xl&ZCb%&?soVB|B z=Yl7GXq`6Q?W_I5wye5d;Pz)#mW*)bkivV4DU|2b(tP)M<-Xt0^l+2@ZxIYmaNlxT zPCGbj1yyqDQ7Y;*)L21714b;r+xAIT&KEnf<-VgkubMn*ZAMxFE3N8{jV~D&tonTB zkZzZrc~J(uK{tr!Y^8M_+Q|z|w2It2Gh7EprctmQUrBXJ`;H|aral>}n+`R(zqgVUauONi6?5os6_GqRSA?aOeBdx8XoAf?McTLVZNR{oS z2D9I%WGp*FKJu|EbVl%z5_(!zucQ=WyCgf84x=a;b)7Dfb3duh7Bbd1P_1_-*`Vmy z`uC}oJoz}U;kL~}tv^PpN_VuJpQTNt4Ba%uV7MpnsjygM zZF%w5+?aTCk~zkbmtcvp=H@2F49m4zY`F#bmSN_&Py^f3#1h_?B$DKLi-;uWpGh&7 zcf?4v#wX@m@@+B6`BrO;#as{}ZB2HdR5=RvF9Vr&`vWdbXtA>jz)3;l5PNmqurRicjM_I*dJYkmz zVKEW2FD9z#oRTg2>W@XdVzOAk=2Vfw)eaFPCuE2NYG6JJ)6)VPYT-OCcV~+qleGO* z3?`F5dQw1or|ouEBmU1b#p|K^PpYR4Xwbhwy+Hcgo_zX9VU@=xi4q}kmZvCG5AJCL z8an4RUAAk2ou6Hkf~x5RvWj4<&Pi^!1SD?~KO zwqB}H@H!T2bzNd)b&|N*gMS{~_5zAS> zLdF#a%MTlbnfTat5y|#(Vs)VY5%RQvhFx$hT`J6i-Ulm8Q2(EBWsMlksZ&L=EIKN- z`^o5!#08bJGDHw>%0w2Z!pC@LrpTcOs&1vC(W0IluuZk_bQQl@&z%!Hy77rkxUfxS zB91pdFAn{H!d&AkD{hJz1AO&QoTo4k>1wX!vDW_!s#P@)#utxT-< zq0UPmReExAqPmm1R8ki)-O@d>k}Th?q~e%~4h>{0{r#whg(e;JXfe%AV5#svBa 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);