From 0b112ae843ff0e0c036a2c50cbb3f6a296c2b6c5 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Tue, 28 Nov 2023 09:24:32 +0800 Subject: [PATCH 1/2] 11 --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 231119 -> 231119 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 9604cf19e53a9c7da043a0bf0a4df35aaf46baeb..e1f4a529e834f5eb9435fb6253b7e6707aaaed2a 100644 GIT binary patch delta 20937 zcmeHP33wDm+D=ucCm|4$K!AiCB;1&gOzs2_asdgK0S{0h5CSTP5(Gp!OaK);5RyTP zg@DKIDquh~YV)gHo``_pDx#|b>UyBSl;eR4^1oHpJ<}0%)!)_Kf0O5V`#Y<;x{jWz zudDLPlIE{0X-;}qlZ#kZ0L`nejwFNFfjm;&Wc-vVe*QDAn>m41rjcUyLI4eq)(U%! z@@qbP@Wn~PCyYxfoO(^!#B2ThlZ0yzk*Wvl6i9p2$I-uPWHQSuB2(&52OK11vTOdR zPHe|OqPs3?7E-^m={pYB$W~L?j!e?@(eS0Qu5DLLVmr!7aQ(5gUP1Mp`t0&|RU}Sg z_hb{D-FYnush`ZtUJDn&%pE zS1LOaOtXza&FCIdzr1E8Ve!diXiZ2EJG+)Nt1r3xcAa%=OFFZ$_mkfB{)O4EY*`4+u77p!!hx=K-;6NgLaCFuvOgNZs!kBy z=o3ZqB3O1h8Dx}%(LJ<@BP}T<_0O zQe$T?vWv2y2%2xa+=u9tCFPR|c;F@Zq@10~Cs&aR*bXP{!e&I!2icbeT32{;( z$z=JF)M?yXNM=$aqljEi7_KSaDt4`Gnr1i#k{2~rTux@W;=;oXT0&Awt zlJD5j@5pGYQe7o?2O2BZl6Z|=!yf5JoCfN4P$0REl|4$zT}$hl8++ zMiJJupg}AlgCw)6{^W7oRy;7e%Hb0F- zu}`yTZ=71uyzL3Pjkeg2~v?CDk!DCTTliewQ%fd)sNvS>E+MDCzC8x z&w5wq-e>EN7X(q)k$(QJn@1(qM~_+MU%zX~9)B_cZ;@ozsO3xWKDlpox+`RLH5ml1 zvys%B5=w4z^k*gIy=&w7JDDN#5JlW zo8@&S-5DOd*myaTv>_}xm&UREd8CwFEg#XCoJ&8a)g^h>BSY@t8cSl)cA?ocociTT zKi5-af-y3K6cXcsOblKlJezFvXVnEHsfI{8o)s06_KpnIanT7=*p##6YCST)tb8&n z(`aiWM5A|T>^%qVU67ld?i@d^ylg^QN?BS?YUVg+M*5Yh<>lkbQYMVgah7FfWtCr< zm40Q}mF3Qy?96g!dfNDL<1!|U&zw+}HQt$arC*V1qLGC(hAo>ygN+XgXl$pJ(SBiSrQ;!3E18v%#4XdEVq`-QpV0Nk(jV5U-GoylbWQQwg zub7YkKfg#nKfh4WFrWp{5(oz<%brG)2giYJ3d95Lfet`NpcBv;h%u9Q0WY%X3fQyh z2AKkFfCx5d8jY&_VU`!blmH|G-GLw8BE-B!5^N%?WI$vW1N<1-)J(ISDY0XyYxJ{A6lC0P!b@7VKyDlp=2{az>HZo1|wS zMaC*JUy&ovOB;E?S5v#$v73BPzK1of^hx_zA|%|lf2A+MtL$2v%WG_@O*+Un+oVJ6 zfK7UfIbWou?d|n+#H@z*%xZYw{hp`>5~2CpWp$OU^0(TB!*+qpx4AtMq4`>G$S#|u zVizs7dc{|44-$#C+$C!z>?KLMEs$iu0@?w#YZqX0kig>GYJ%*1NlNcP>Fpgs3u#}k zP_~=K!mnz#^s8Mc$xe_as$=qS!aiFleVX1ZjZQ^MU-tP#6IOMz^tlH{Z{B;9?o*W@ z^cG)&&V=>6MJBl77CO+nRU%<^O8c_S*GbsfJ+!aolup?G7)_M9>{eNxrF$iL2$J{C zNB4@%SL~w$y{dtWXsne-Az>AZY?ZKW5p`L%62e9-_PGutY~Etu-7h0-^eaB=2*S1x z(Y*OyLD+q9nzyK>gpIk4PO)+xPuSRaZ4^too!;Ut*7o*VtXC*GKz%}R2b(434qI_6 z@36V8@1WUQ^HrOrWT-8JhwYZNcFVFmZCM}fXiF2=$tEO22)2y{Uc-j|jYgmynhuj) z&8f)tPEtC$gbsww*;z`T4%38mpOQvhES2*W3GE`Kmmzs8V$4$6Ip)J;)!w71+t;PG z>=K#4t8i3`ChxvqNyiS_x<AAk!UI9uL1M z3v^g1$#N;hz9q?!MCnHZkwq}neI`hoiL&3@BUqq z=1J1uxk5^V-QDqBDmQs~cmb@bqR4L_2rQEKRCzUd6rF2Pp*H=du zP*%25Hc6E-u7MF{+Ut~gpH#}S(Nan|ENx{eQrfSS_bTOnrR-BGZ6QabXP;Clm93J} zO;B3>X#i!9tdjTL52ICeE7D}mwM&!9@>a`arAH;XODQ)i1=|1h1xIKKWq*qgRG~L&$CQ(*W<`bt-7WcmIB~(G#PFPV%N6OGQ?|Gkw zg5UhUEaj05S@fafBx(17R9=)RrDiH*&QFtr`%xEK8Y&7pT<_2zjIGh@!QT70ke(PkZQi2 z7O0*Js)X%PW-cH!TNzmRDi<8|AN=me+ljgRs0o`61KtrqA*gEPto`ZPW6OWvTS= zcVRkA`4Q7})G~Sad$7Du`3I)uA3n>6uzW=M$EM{IpXC@VpHlvrX*uq*oPgydq@DE}7ZJIYUkoT2=Ckh7HgY5h3SI0ex( z?hm4C+yN4x@j$JH+|8S4{XMvNc#vR%z%&(1Q!vd0(@cx;@L<6OL)9Eri+GqOx&%5Qk1=- zQgp$CQa1a7hrcC7vjd1W7FnCEE*e&dW=nhchf*|~*TauV(QH!>KOsf4Aw^q>w5s*M zL~1paWQ99$Ao#YLxJJoqw7ka1YplGslaCsQ>zPx8$7{K~J1LOjEKt50a6asyL zen5XM*LdSGy4X?4kNM~FPl3;X1mP66Kl-vZwOr-3uT z_rO`ePtWB9pnwMW13KUU0)RlEiC&q@gTOQengPK;b07o=1;T(9KuaJTXa%$e+5i!H zZdFxJGuW`Z$j{I1x4=!@)UEMI{ZzOd9V>ZT9UZ@|j$RohxG2Fz3ocr4O;W_TXfSwU zgfT|<4j$Xs5%0d0>`$N3g_WtgdI2Wu;yozGcN)^9>pbIJOC~H?I?q1Wk^@T*{g=N6 zDjU298tsOMJNyC&}qWgp<5 z_0U}S{K8(!i_lw(fdRlkU=T1^V<#S?`7}>wdEe6ZtmJVTO7nGA`Z#UvD8Nk$br$ch zUDu*7_||*@?&Lqp<_P4+I7QgMlHyR%E;lxJYMZy4Jo$33M+)9tt`PxL9X< zzoP?!E&+cjaGB0x4SFjbj&CEUXxtuX7_ZRTm|5CQmyHBJ3Yd=pu>e>I z+zi|TjE24xSPcF);CA2+U<`C)fihqmumrlhfO7E5K&$=l?yltz5W`>wfMFni$X!48 zhuj@#{occo6qv`o}c&5M+SIjk`;WmF5Z@N>wc8d<)>jqZ1DFWtJ%WaVk-s=WdxZSF=;2CuGA053M@?+6UzSt`MZ8~^w@xhAX zD}qNE?W_y?8NyKc{TB}*t=)Bg~tYAg6DgtJ$<#vw_-fCIF3O7Z-+-terr-S#p zf%SMM3A1pA-~E=~pLOtFKd{Ow2;BZ+x&2iK?{x#Ktb)KTlb92QECODa@(kb_f`m4;id?fO_tlkI(V-eSmCA!m_b&(4Q6K+(MzoO z(eLs}U}oiJtB{ZAe6z2RU_~Jn0rRNkR!Nf0qc4d%~()t+6moKM!|juayA`79tvv2XkVua^3M5K|HV{)sd;`G?FoQzbn&>mfpkLvALRT&d=Upg28(ruX#UASEP5ef%khBq^wL1A zDj{KMxpqD67>4y9BrF24!UKb4-p=*(`9!QvAYomC^#>TNJg}SqgEa*f3}CQoz>)yW zDg;d2G{Ja&1MNxr)e05nl$bDr!K@K8LNJ&XVipJn^FPewPGFl4|yts5mpS}3u725|=# z@g2H5P{hZI_)cAf$$Xzio)Jy%#-)Zos}BPBb2_f>ApX40U(orBI^P9<=wH(LZk@lZ zyIb%*dLANYvvn|hueic}pYCqPU(xw~c<<4NxkKEc?lAbu4>?s;z03gkO$`Fz2lP`d z#LcVut1`=3IvD;paYdG|i7a2&`9Wm)s?O4;)7g!YH}QIufB5jFsI_l!NMq#fS8XqB zjJ&CigsZzT^2Ywa-IDe&h`TZJX1?DVcX+aY-40KCmurl?@qeet+ntR;FZBjsjhk`J zitug5Z47!Pu*RLda_?p1PG0Lp`Frf-Z47#OKTP~i+k!9sk)W5@7F_dx+fCHew^?|N z*f1A0{0(#S+aVP|6B}aRMEKz?o&VjmyzR5R1IxQQKWtjUHTjwrX^y~hROj!RmiO67 zs-6@#9(fPM#qVIf`)3BV;`S+&ftk2@-@NnYzwR?lbZor?tIrt~`H=eUM z_^O{5tiXc%1iU7AcT(PZMisl#< z9islH!HtUAs7Y)TzQZ&bxho6=r29?+ljuQAe zL^;f%BzJ0)<%q-%gpxYMRg+hLdA04%zQ5sKSlw~%?(Co52aBD{*a-W_?So~XJVyKf zOSiz%5_~MuwIRP~%WI|B@_N4Qt`5}jB5Ys%;da*m=+E8aiv8ixHvxixra&_w7-$ZJ z0HHt_&;n=)gafS{xfk))VA=o?KqSx>hytR47$6pC2gCvKKzpDAAU4!?1eN>BFEqpI zL)fYTS`69FwhYjc#VPhZY}N}j7++_9v*WkPY{q}DEaDWjD#noZq9`&i0ErA%a}Z}BP9l`@^h#cJXRW$ICC1#9y=)S{oC%*XmITIAj`fSqix0^d85Wdr~ko+ zP8+oA5cXLa+O_LZ*{(l!@-&=1JWlJvGRNX`YXWOLe9Hb)4xie;_wg;(ww0%;`HJ64 z#mQ6aM92BgqAs(}n6ghMYF(pkXFhYWKFV|Oe1|%9b)2&9leC&hwfs8I>Wdwkq)kh( zt^Te?1`{1WzVu?`IR1~%Z+oii7oYST{L@E0UFRI^w4F`+;o9x=YbP@sfAVa7#9L9H>Xe%0!C8R6|o8MpS9FQY~9EVZy z6~#Zc7&}Ls*`>iUrTW|hq~?K9_SSSQD$IM_vp`Pu(e{oR+OR-tUBJf9(27TTml{7< z4>;v=!Mjc87wy_nCz!S~|Cw5c;kKp2^$nK}=R4Rr74yg+E+1@%IejPP*gKEYb~&qY z&a4)wK(cATb-;9>4!X^N0c-)D0-gr813Q47Z08d+O`ieR1B@874V{UWF=#2PGVq_5 zo-=47z23n#I_@8gSJ{$U_NGp$`87FSg YLTK3c(242uSx`BBHvTbNJJ$4n0a4?|Hvj+t delta 21685 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 Date: Tue, 28 Nov 2023 09:40:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 12 +++---- src/WMS.Web.Domain/Entitys/OutStock.cs | 32 ++++++++++++------- .../Entitys/OutStockErpDetails.cs | 5 +++ .../Services/OutStockService.cs | 8 ++--- .../Configuration/RepositoryDbContext.cs | 4 --- 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index b149caa5..ef9135d6 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1064,11 +1064,6 @@ 同步成功或者失败 默认是失败状态 - - - 同步失败的源订单号(默认就包含所有来源单号) - - 同步时间 @@ -1090,7 +1085,7 @@ - + 同步金蝶(成功) @@ -1217,6 +1212,11 @@ 出库数量 + + + 同步成功或者失败 默认是失败状态 + + erp出库任务单 diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs index 0e0c7c18..c2d2d348 100644 --- a/src/WMS.Web.Domain/Entitys/OutStock.cs +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -81,11 +81,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("SuccessSync")] public bool SuccessSync { get; set; } = false; - /// - /// 同步失败的源订单号(默认就包含所有来源单号) - /// - [Column("SuccessSyncFail")] - public List SuccessSyncFail { get; set; } = new List(); + ///// + ///// 同步失败的源订单号(默认就包含所有来源单号) + ///// + //[Column("SuccessSyncFail")] + //public List SuccessSyncFail { get; set; } = new List(); /// /// 同步时间 /// @@ -119,24 +119,32 @@ namespace WMS.Web.Domain.Entitys { //只有销售出库才需要同步金蝶 this.SuccessSync = false; - this.SuccessSyncFail = this.Details.SelectMany(s => s.ErpDetails).GroupBy(g => g.Erp_DetailId).Select(s => s.Key).ToList(); + var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); + erpd.ForEach(f => f.SuccessSync = false); } else { this.SuccessSync = true; - this.SuccessSyncFail = new List(); + var erpd = this.Details.SelectMany(s => s.ErpDetails).ToList(); + erpd.ForEach(f => f.SuccessSync = true); } } /// /// 同步金蝶(成功) /// /// - public void SyncSuccess(List erpDetailIds, int operateId) + public void SyncSuccess(string sourcBillNo, int operateId) { - foreach (var e in erpDetailIds) - this.SuccessSyncFail.Remove(e); - this.SuccessSync = true; - this.Remark = ""; + //foreach (var e in erpDetailIds) + // this.SuccessSyncFail.Remove(e); + var erpd = this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SourceBillNo.Equals(sourcBillNo)).ToList(); + erpd.ForEach(f => f.SuccessSync = true); + //所有erp明细同步成功才是整个单据成功 + if (this.Details.SelectMany(s => s.ErpDetails).Where(w => w.SuccessSync != false).Any()) + { + this.SuccessSync = true; + this.Remark = ""; + } this.OperateId = operateId; this.SyncTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs index 7f393e94..ead3bbb2 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockErpDetails.cs @@ -44,5 +44,10 @@ namespace WMS.Web.Domain.Entitys /// [Column("Qty")] public decimal Qty { get; set; } + /// + /// 同步成功或者失败 默认是失败状态 + /// + [Column("SuccessSync")] + public bool SuccessSync { get; set; } = false; } } diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 66d926ef..55fd3b6f 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -180,8 +180,8 @@ namespace WMS.Web.Domain.Services { if (entity.SuccessSync) continue; List failList =entity.Details.SelectMany(s=>s.ErpDetails) - .Where(w=> entity.SuccessSyncFail.Contains(w.Erp_DetailId)) - .Select(s=>s.SourceBillNo).ToList();//同步失败的来源单号 + .Where(w=> w.SuccessSync==false).GroupBy(g=>g.SourceBillNo) + .Select(s=>s.Key).ToList();//同步失败的来源单号 //找到单据里需要同步的单据 var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key); foreach (var s in failList) @@ -197,11 +197,11 @@ namespace WMS.Web.Domain.Services //下推金蝶 var res = await this.Push(erpDto); if (res.IsSuccess) - entity.SyncSuccess(erp_details, loginInfo.UserInfo.StaffId); + entity.SyncSuccess(s, loginInfo.UserInfo.StaffId); else entity.SyncFail(res.Message, loginInfo.UserInfo.StaffId); } - entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true; + //entity.SuccessSync = entity.SuccessSyncFail.Count() > 0 ? false : true; //最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱 var isSuccess = await _outStockRepositories.Edit(entity, true); if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError); diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index 998c9ef7..50221302 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -83,10 +83,6 @@ namespace WMS.Web.Repositories.Configuration ent.ToTable("t_wms_outstock"); ent.HasKey(x => x.Id); - ent.Property(f => f.SuccessSyncFail).HasConversion( - v => JsonConvert.SerializeObject(v), - v => JsonConvert.DeserializeObject>(v)); - ent.HasMany(p => p.Details) .WithOne() .HasForeignKey(p => p.Fid)