From ef38eeadf54a53682e540ba74a92e48a96202ed2 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 22 Nov 2024 10:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 277406 -> 277406 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 +++++ .../Dto/InStock/InStockQueryResponse.cs | 5 +++++ .../InStockRepositories.cs | 1 + 4 files changed, 11 insertions(+) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 4ee4ed0e2b339d39a333b65a8078511777945b19..4d07dc2ffa20ad6bba8af91c72a80579ef88486b 100644 GIT binary patch delta 3528 zcmb7`3v?9K8OL{KlKsArh)~-U46nA7QmdGKWFMH?@Q?yZFcwg$weDsUp@_Ap2q@Vg zDi2X0AR|6d@d4GU&}vr!1p-kXDxgG=mna}2KIZRIK?sT8WWN~Ob9#>MIlsNX`_2E} zxpQYGn?=XlEjr%L$eLojXc&Xa1_Z?b**iXcB8OK*etvuyeYgTY!S8!+l04;cZ7}}d-V=8Kk1HtPuL~w z7WN2xg?+;N!hYcc;X~noa8PjPJ0yH092PznjtHL!rmXF#w4Vy@x<8Y)rEf_8bLqS7 z7n$S9=E>a&-AUX5j=1SeO@ceFWe30S?j1|YpzmJA z|88enIk9`2-P^uF_#wC0-DY<|S<-rP+%H*hKz7(O)iE5?v79U?m9x{_959SjeXi9| z+RfD1t|1yjUY28Fl-J3|Xzz*q6h>O>ha{`3Ee*~Y@n69kNrE@gi4IOqjnVK7Zl*p? zF7_B0Pq?MUClDsK_$0!uEq)tevg=MBst8HdYC=g?raFbt*VUvXZYT8D@>IeA)jJ3S zRqrGWR=taGiRv`M`$lHA>4Z|P&LCW>I+Jif19uY+sm>xCR=r1-c0~PN!c{tMHes>q z9KtHqxr8;UHH2E#d4x@>^9dVN?;~tgT|j75wFwQX_Y*wX?%I=iSV(w4H|Rlvx4E2$ zhX`4!4-;5*5uuIhBZOnR_D2a{sXj(Hp}Lrmr`gBl%vybda8mV2Lbs$Qo+1QQm&obN z%)Ty_^{D<`&aC>h+yl)%Bj?cSKM2q2Wjsf?OaspohN&(ij8I)pxFVxT{F5+J%l{%= zqxu5jMV;;6gp}$_gbsSTmkFIzR}iLKnFX&T%u-!N=%RsF@PSUYlQ2dndygmC*j8ok!w_Io2C$F7u%6^$x^+Oq^fdhntT0KPgNcAvbf=>1^;fPj0 zxq$GTjyp>DRLh?cK3Dxho>vVx1Zee3LYnNc&strRUu)?k;go6v;k0Tap-I)lFgSC& zO@^hK#b|j4vKdo!iC)H3RbsGaa~OAOwGAV;xhgMk9^(v6v}K&B+K$m)^+$}eRDaC) ziE2LMr>Y$o9aYa}6sUG$bXM)c=&IU{@iWz*Gk%d&@6Pz8Y7fS*RC_Xht$GgQH>&3{ z&QtBhIA67p;ZyZ90;)kqk!pw$R*f*C8BL-$;{q)gGk&XjA>((dC5%3*eHr~!`!g<5 z9l-d#>OjUI)xnI5RWD%-Q7vT*RlSr^#`*$Z#`uGlhcSk$j$mA_dIjT3)sc)ps$RwT zlj_xsKdWBDh^fXI<*Errg=!_^TGhxX#%T4wFvh4}#~7=6J>##cH!%LDI?f)y%qlc) zw3jTi0z+=%!D;#6W_FvjW2P~l)3}8(L61yqJu*p-+{(C3k4$boQYA-{Y@f`rM%lBM zTi#LCT#9OWtXaODeB3UNHRBF>j3p@byBO0L)7j~Q8QfQXiYJqZ`;$Gxjn8DK1MX(b zlC%^GoK8+>r;9^1#$4RPLvb%-uH|-Sr%o@o+7u+$QopqPiy#*=hvg4y8vDfM<9cf& z{dM04=dyHKgW_&5(}>i48?0gJviVvCvM(X?t);c4V*lH~~+dGft zs^;76k6OKYj^~Rds9P*HskyHkEB&hG{$#dCM|PuO^|4Paw8~Rs zO0BluU~$$Uyu>KZO3M$TL}poOydd|=#>+e~Enl)ND_mRQ+Dg|}+Br>Dpl}t}7;`XR qvJ2#KxX9h)SGc)(HPfulG;1==TKl>tt9xpHnYGYN)i+uji@yPbb=Kto delta 4111 zcmaKu33QWH7RQr(Y3>EeCQPX!&_V1VU`f+-b1KtPL_n>DvMAzcntX*oNjgao_n-)f zAVRCe6%|DtK*w>$i5uuR&WsCI3a)_SI^c%+8%I%bxnFuqq33AM`RD!aefQma-+Nz{ zb>H+^_e~#r|Euhe+U*l3S9{6=rS8)5;y|gV&|hBUt}ib3`h3Nv*I(%Km6v)O>P!4( zg??YXr^xFq_L}YzPkC9rH&Etxmlg-gd^UT@vQ?Aq$yJjbPG_|#evj8Ia+kY{0-ivr zH{f@dm3adJuiNMM1d1EHo>H^kXC*K4n}ub?X0fNF!CO}7DJ%)p7rAZr^5pB&95wkl z{Z2PyQ+<)yW^8=KH{V(rqk zGv*IROkYz|Q9m4PpF~|SF?!m?rhh@qSKnw# z)X}yEO^i+n2C8O97rHX|v~MZZ&zr<&I0I#d9Y}L&4DOMzf=m7P95EJ8Bz!v4(JD z{#oHraGqSfjXONHAxHJ0mpwibp07`UZ9tcthjaAlm>72Wf$MqHrP#W4REgS(G8<^A zG_n#~+Z^X6YIit1C4Ft}FGGfx*k;=%dRf#*>{c0H5p7prn~Xa|J2~<04o6P$Tf)0U zyG46M$I6k zQhp`l|3y}dU(48G+r|DyY->EI^Pk9Q<+E~F@!zWbos7N3w%YriZShP`hs5|$WG(tZ zWF`Ai^pohwCT!iLh^V_Hkj1uNTIZ0Mj&&}HHN>{|?v&B0k)`v4q<*FompH7$A{mc7 zFc#ZdXf^kdXrE}m=wp$U=$B5f>n6IMW`Aj_o8<0(qP+DGWs7=>dWm|A`iR=3z!A5c z-}RPzNfPU+u%41Gv4gtCT32Ij!YO0l`1OPd%Bu*I6mKA$skoZ3*WR9O z4WUN8&4gOT7QzP_a3kR(#hVEG6xR|yR!k6P>9U&%>z!5cO!K!8o>KR%gl80QBRs2k zJK;seI|$D!t|M$$yp!;w;$4J8igy!iS?#^AC)}gwb1%WA-VJifPUZUutav}6yW#_c zueA9;6TVj5NI0mtiIADDEJ*6?YPbE51q?q4*lXqxd?ZK`XyOn63CGp+p1TBE)y=E$t!% zHDWj66ph$JC{ui!P@(t^VT|Hl`K&3vOL$L{y+@d*$=)Z-SNwnwQv8t6l)<^#_=pfu z_y6R|HQPSIem#_r37;r_D(f`hGs5TUJwW(EF(uzXnhb<5)te?ff0EA*w_mrN;ZQUfPQ@&SOOY6?*p1O$u?Hhtu_q&*Y3rD5^kQ74 zE%s(C&RV<4=pSFAo_>t}y5={G9K`{QT*YG<$0-hE9IrTtF<5a3BTwArFor3f z$jDdx9b_pA>(4jOBk0bUM2_cY__jXY+r5UJLSve@>3w{R*KH!^OLXmRMjf>h=o#agaK zLe?7A-;0}hTpBG#>KNG+cG;WlKZNY^^In~N<{=|}T>M3 + + + 同步成功或者失败(状态) + + 备注 diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs index a816a6a6..4633d0cf 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs @@ -97,6 +97,11 @@ namespace WMS.Web.Core.Dto /// [Column("金蝶同步状态")] public string SuccessSync { get; set; } + /// + /// 同步成功或者失败(状态) + /// + [Ignore] + public int SuccessSyncStatus { get; set; } /// /// 备注 diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 5eba7399..7519bbc9 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -386,6 +386,7 @@ namespace WMS.Web.Repositories Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), SuccessSync = (s.order.Type != InstockType.Purchase ? "--" : (s.order.SuccessSync == SyncStatus.Success ? "成功" : (s.order.SuccessSync == SyncStatus.SyncIng ? "同步中" : "失败"))), + SuccessSyncStatus= (int)s.order.SuccessSync, Remark = s.order.Remark }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();