From 043a2971c32e0e270a14cdfe72cf9caca550eb54 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 13 Jul 2024 10:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E6=96=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 274420 -> 274420 bytes src/WMS.Web.Domain/Entitys/InstockTask.cs | 4 ++++ src/WMS.Web.Domain/Entitys/OutStockTask.cs | 5 +++++ .../Services/InStockTaskService.cs | 3 ++- .../Services/OutStockTaskService.cs | 4 +++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 6102f9e72384abcca1ea4d9a41d8dfc6b23cca67..7f0cc8e039f57faa21743ad63cb2ccdb2eddb8e7 100644 GIT binary patch delta 4181 zcmZXX33wIN702JqP3Bx6U_c04AcRG<3e=`TDbOaYNk~E0wNRkEoc%5 zgHWn0Vi71>z!BL&R6s;&OL3_{TZ*;RzQ2zGTA@Any%QcEzVAD^zjOZQ-aB*d+{vBm z7vryAjJM9svldy_UdvvRYh`)!PT38;p4Y6Fo?Bp(S6E=j_@Ct3S7s%b>Oi23t(+}B z5D2W|b~Rgt#MXG9owD0Bs?X9U4sB-J!uAT=RyLFNs@L+g-NxO(xSMSc+g`Re*?hLQ z*lg~;kK4D|6!U&=D}9Uo1MHjjpy<1}HRG8vO#UJ94|Dqf`{q)Pu$k$PvTf4=H()v) zV>5#tXM2b3-itWF{<~~dc>vQ{I{u*Fd-wEnIQM<_%|s{J%p9lK%(#u@LQXSp)=7cD z2MqTX=M4L%BVS$MHLu-iJE{G>MY{i5?=M;n9^Wj5S(?Z)R5vv;qs4IhpG0oR0(v^Z zddPB+?Szow?e3+Tx;ai}h=1tim?jjoL&#;dw}U>SNVY&)ZxmAj*9Qr<<7o}%(m6-a5 zeOVj!2ZnuF5%vqhzN`cLg<;>7@^fHRI3P7=e{9&7O0!=S_NBh;PYU}|RrYr(b3r>I z_sujltV>82PO9m!fXa9as0NI?LC(7&rqp#o#jpjkMG}JsaD%g ziE&DNuT+)BG=ARcX7XQ%G^LTIEYg%a-jocL;0>-&4eeEqmv%`d`!80gI<~di+vTaN zR)rszt(sWgg|qeuuQW$#FL|A+ZLRU%$We6@JSP>+*qXD&TdAnYw$|~7ty7z9cON@x zl#2aUYH{($@}^kYU)~hxO#G_oLcv&crCaraRru-Jj&8(N<=UY;p+_aB6EZ3}lhCu0 zvk2LSc@=U9y##X!$uS&tIozAj%rIjgLJPq>LQBEEghvGX5grxnPiQ4LfN<1`j4+VU zMxyzI#{~xwPDsLF!h3=R1ox!y5W;D}p@dG-Zx~^LU?E|H;Bdl5!4ZVbf+Gpr1xFFK z363VbAvlI`QE)8b&tY`qFph9p!s7`=QlJThs}h|^xFR@-@DIVsgntT7A)J?Mf0A%P za4O+b!D)nlN$yjGFC_Xj;d57bI>CyKRB#5Nj^HzduOwk6;Y-0;glmGcc?~4@S;E&6 zokMs|ZeuPXMG{=X6N1Hrb`f+jkI-Ji^9daU7ZB0}7ZMi9Xp0F;1eX%Nlj)Wb?g%dD z0;8sS4t?8Im!vE1XmL(1lJI>4B-)K2(Bf> z3%*FGCAf}IRd78aPViTR+Jf!|-a<0-uL<3*a(5dEnUb)HkSGb82@M3d z5E=`^Fq0*fcl1?Y0qeWZ>6$j|y%l^cLJf$P?U2Xf31tmat2T z@;X1}g1;m5k%ZlZJrdnZcvH|PGc+)oH&B>E}gGl_oA8(#1Wehmm-A{Up1|3dhy;NN(|3;vy71A<@j-WU9e z_rBmY-r9m+6aFn2BtY;RLP+pB;Xi^m2saIy_wOyjw-Wx2@L$323AY9B5dJ3^(6Dr5 z&)6DDFh(O*(9s}4tx-j=szx=zIF0IpH8k7@gyS`83f9tiP_VW}9l->Rx`OpI>I*i| zXegMd(MYhdMv`C?jby>58qEZoYqSU>zkeUnXer@`H69WCk;bEfk7=|LY^~8o@W&dD z3;skSMewH@PYAZvXeanHjrM{+*XSVFQKM7jD&p`9jbBPQRU=KXGv8HXab5XT^ zxVtt7S1B}8X4seVvY!+7vvoxkmF}InsHRz?{nSfphh24yPQ_TZaoW4&sgC}_ELG38 z$7?TXol0n1#L5J=YJC2RW2??qgKZ+mCb3Oso5EIkaBIPbx0;sM@uun@YtC$o{LmHE z%Bf#Qe2O%cT4lggqQXE0c`x0t)BM@j)O5#M>;=D3bs8+u=^-pJH@DQ#QbWrOE%TB> zDy7bHZPsH3e?qL`l?@+AS7@&=q>{a>H`IgP`jDy?W0e*cdo#<`M!&~(wX?(j0n|>r A!2kdN delta 4109 zcmZve33yc1702`5P2Ra|F(5kx2xw6$i&AST(1v|aSOnSkH9$Z%1;qi`!O##$p4w`a z%_`QViX-9zA|fDySg9+Et)*0{^Y0+gR5R(wFGbzW$l{+3RdtT8Y|vwXC$Xv<=#ps+GA| z_}Kx!W%fqJIx20_cC*?RwXJGTsFj5`9Q0d8UQm2g?M1ciYA>lp)m~QHq2_D%SG3)! zW|Uvmw%qsBe@%VYzE1r)ZQXco443}~{axB#qrO|pZZ)^cH*H!Z?I{J@Bsu zYF94eZT0u5Rn!4oXYKfZ`@N&_@_vEl?pNPUbU@9`aZt_a*<8rGwn?%uhctL)ao$tk zb##l{7PdR+*K2cip{`!<)rHH{Iox(6x1y@s3RfpLV!F16qxO(r(Aqn)eYUxf*Y$l3 zyU#;?($ZpSOJZKkj~R3iVj1WWT&x+ZUgE7o&!A(hG72&j&@0gISWWZ}VztpHKwc0> z&+yrN(>RhJ^o;8VeFN9TV}2a{RP7&N0F~QQ%0N{H1-OIC;FK~%m7xKKQ5l|6MyN6} zz$hxCQ_2`s3dRN)M`?UYnxN9e0F$UZW-c#ovMN&o6i}IwaaozF%CrE}sT@u9DO6=f z5RSg&*Ne=gd}nI1St`#CFo(+Alrm41y8_%zWqv}zCF82JK(%`U+)Hh9YPyB0+!rA7 zzvC?mB5^DZa6hFbsi~G~r)2?V8@G4MgU)fxH8Cmiig8*)-(~5p^h#}$(!hkz%~5|y z!snK#KO*6CBh(+0@Y}Nf8kmp>u;}VfPWUXf`co4=3#@)&nAzVn96T!#X8ANcFX6Lj z>Muz6$x`XwU}3^%dDLHYRsPb1za$8c`{usT3@{CA>Fc^8=n$)<@9)Y0tB9+kZ3dY7 zH5;!9I>qt2r$apuV2ze-m$I8lIoX6~kNHEQN2Zu6m2!$MXRi%VbVatZ%Pxw3KgWDq zTh;_U+z4T-^M3Vc=2{c+gCZ9yimop<#p&TqrKY~OKFlpOxA+@^u>DDs6D=(@HGHo$ z+!mVCURkt4AJfPSKRoP@4U6)O4YMCM)x9u$CePHW_F#~UCTiEIWqG-%>P1IAY&QCl z4w8!<8tAC)PA_-SqN6xs7uni2;JZX^y8G$Y<2Xigj~*zF|; z8zN}Q=upAU#9@NHOc*ZMm&6E02=+5PQgDzsO3+BE7}tKM z;3MKJ!6(Gog0sw>BRI}zWUk;d@;rf;kzCJRf*QoT1%GG4e8Jy{3j|*i@6kPA?!AJ4 zFuG81A0HzkXw8I0f?J7;1-E5%h$LQ$`vq+nULt5qTq@{5Tqan~(N+jn5?2ZS&FNMP zz9+5`6qw{=JRm3}775b)WOS{-C;m#;7LbbtT{zu3K?&zrFW5jV6_gP}fn~P`1)0Q$ z1X;v~1=WbZ7E~nuMo^jfh@iS+#GQ#p1>HFFZ}l`09~0DO^5cTn_;effh%sT4pgt2e z3+fWL2pSN#3K|ig5Hu$KPOyiAJt-0N=4emp86|EL=#1{npned`uJEJcNqQsX4L)>5yef%AQR~X(YC}zJ`^_dxcUGN5Rm%gq{*e!UI z(LI8Ql+;=A1Zk%C0~`kVeS?)Bht_2p`S&6tKWJ>A7F92#XyTenxgSL zECyQ)v9SgiYTb=KPZZqW_)wQV%<7GPxWx#~)7Al2wwid|NQsnRs>WFT?M+>(l=b66iI4smmnV+3>ZB5tU1G9P zD7&0E&Z?72RCbBUM#1`>;?Ym1n&W=7Fvs+%8y-Avh6dxUKI??A*$LC4X*cVxzAU*? zuY}J+tDm3n^TI_Z%ua7&wB1Sbv|nM8&BbK3DN%f32Kspg%ISL1%1{f`M9r#A)%Y~E zO3Ibhs;FhEP1jhV+6=XsYUQ`L>-7d#)eCbkm_Zrt;xn;Wj;kdZT@ruJ!=S>}%p3yZPyS5~{F>d;|`!Aysj0yk% diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index dfad8045..a3da9baa 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -63,6 +63,10 @@ namespace WMS.Web.Domain.Entitys /// 创建时间（erp那边的创建时间） /// public DateTime CreateTime { get; set; } + /// + /// 在wms最新数据修改时间 + /// + public DateTime WmsUpdateTime { get; set; } = DateTime.Now; /// /// 作废人 diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 1384008f..5d63d14f 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -84,6 +84,11 @@ namespace WMS.Web.Domain.Entitys [Column("CreateTime")] public DateTime? CreateTime { get; set; } /// + /// 在wms最新数据修改时间 + /// + [Column("WmsUpdateTime")] + public DateTime WmsUpdateTime { get; set; } = DateTime.Now; + /// /// 明细 /// public List Details = new List(); diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index f092734c..df38cea2 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -600,7 +600,8 @@ namespace WMS.Web.Domain.Services //过滤掉已经作废的单据 //data_list = data_list.Where(w => w.Status != InstockStatus.Repeal).ToList(); - + //更新修改时间 + data_list.ForEach(f => f.WmsUpdateTime = DateTime.Now); //2.3.提交任务单的修改 var isSuccess = await _inStockTaskRepositories.UpdateRange(data_list, isTransaction); if (!isSuccess) diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 4376fd35..2b27d129 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -218,8 +218,10 @@ namespace WMS.Web.Domain.Services outStockTask.GenerateStatus(); } } - //过滤掉已经作废的单据 + var update_date_list = data_list.Where(w => update_ids.Contains(w.Id)).ToList(); + //更新修改时间 + update_date_list.ForEach(f => f.WmsUpdateTime = DateTime.Now); //2.2.提交修改 var isSuccess = await _outStockTaskRepositories.EditEntityList(update_date_list, isTransaction); if (!isSuccess)