From 759f6f26fde51a601a1eb5a78848d11e2bd3572c Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 22 May 2024 14:59:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...winin.fasterz.aggridreport.metadata.v7.bin | Bin 682951 -> 684403 bytes ...winin.fasterz.aggridreport.projects.v7.bin | Bin 6983502 -> 7306609 bytes .../v17/.futdcache.v2 | Bin 12176 -> 13910 bytes .../.vs/WinIn.FasterZ.AgGridReport/v17/.suo | Bin 100864 -> 102400 bytes .../v17/fileList.bin | Bin 104320 -> 104473 bytes .../Stores/PurchaseReceiptNoteController.cs | 7 +++++- .../Balances/BalanceAppService.cs | 1 - .../TransferLibJobAppService.cs | 16 ++++++++++++- .../PurchaseReceiptNoteAppService.cs | 22 ++++++++++++++---- 9 files changed, 39 insertions(+), 7 deletions(-) diff --git a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin index 70c79a0fa46a9f5ea3b026283b28d320bad6d46f..b7eb44ae2256cb0053090010287f75ecad027e38 100644 GIT binary patch delta 1280 zcmYjRTTE0}6rFSL%sqD_of!s^*I=C@;9y|}1=K((2-@V`|zo_oIzs8`_k#sZ<+Ns{$sPv?K*1!5CBQ8IjbRoS(DLzI*Mp z*4{r}v){jM=emBYPJBoimnz^6Vk+E`LD{W-kDqz`lE*K5{Cbby;PERSKmXdVI))8> zBIDGT^I9Y=`4$ghs2kxn<4JL;rl+q>U$Z=C^(i>~Y9Y*f^#+&^$qB}kWY?~3@9wDo zOuXul(R3jYoiN0~T^(f579NqqnBlaDInnCm(Rjn8JQq8cb4J{Ut!=EYsckN8ZmfH& zzIHB>=e6x#i?bIqqnhLfe# z#dhFQq*8{;VnxO0QEa~UAdK$H>>b!js2V+G^gJ?*WPvl6UctF|B^3ElG{M~Hs^^)g z(vuU9&*;NoomMHpKq^d&lr&-aMOjF@cT1{@y~DDIeq4z74*rMG`DOjB(%qi3xFyhWHSr9}L*k>1C}a4MW5H^lq5 zJp#S)v_GKoHnw$^6ITL-YeSnzVwxbhTVh4Hw}WS(^gAAmhwI6R+AS37&8}SC5^oiE8hPFwlb_xSHd-!TJR0^jH6jqp%h10Ev zlvtRv1jZ}tC?IkKvUf36JNGJa#`ez=`@~I-@A-VpREn3P?MV1mQogpJfK-MYo05vr zt8xU)eflVjp4Ic&wjZt(Wez7(EPPH{fuqrs5SS1<%pc0?tWtf2bPQAX#aN$j7jtMn zDAt3ciiq`kFU7ktP()`Xiwjen*o zzImhm1*wf0Cp>?3j^vi1<^KRf6e!vXI(m@n_qj-7?1_xVF07VP9XdM6uC~?Z;5)Ch35$cW9g!v? zs8PzpnuEf+-%VUXDn@zg(%;RPdQi&J&D-fZ%NTYdUMAnKPk6~{)<51w1q|D(>A0TS zO=A*H)=)@|_k?sFpxct(Sxbi)<{PDLNZcz|tk|lUrpsB84mqx6C5)$pM-oeBUJe+!LVyjy*!d zdd(5)WgF-UCWmFKKJln1G2U;Xe*MFv)FEN~F>&RlN3KZK(Oq!9Dwkm5ut;cqoH`hm ztrXQG?ShIuk91g+Ywclq6J}JoB0Jvqbo?YUEchN6nOjswksF}rfRN-sQx_4tq|TNl z5bUN8P!ggjYGQIWt{$T>+IEv$o$llCZx(g#wb2mvR8S4x`O0KL{It=8qBl9m-9OlpPQjA>Y zezg6jWMQn4g19hkvf`u5CIxln^j1c<1@k*-7&DcW##|M3=pvtZA_tLviU$$7%J0TM zLCS(uOYQoVIx^x>GsUIuX_!iu0 z7Ch^{^B?EsxbuQhf%mL&1N5~C0lIXGcj3uzxDBtw#NnbAIs@lX8b!rEs)9eo_u=Ij z<-k=hK-X^a04`X_2H%%FAFcbv4bj+OYS37Ty(`Lw*v#A9gPfOynARyUL{VB~W-yNZ jFsv_k)AifgpN@BDzP6!Q%pIqu@$O&b)mPdrXS4qYO^sV^ diff --git a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin index fd95e949fd862fcea87e4ea5f7a5a83892368a99..0c49dcf6f10278813692d397e349a95c8436c7b7 100644 GIT binary patch delta 958 zcmbV~TS!xJ9LGJoIHz;Erp~t0a%z^>XvT<8x0kihfq?^s~g{Qu;{dj4nyx3nV_43I#dGrNlYO zHPiM%cX77DRXO+eUh4~LGF07>g*UR2prD{184<23wZ`iKQXJx(R|n>A9jb||nh2&{ zZ`{2m#Xz7sz|xM_=@tofel1A|rsuT{^`*=JedlbbX(N3-8FI-D_MFvWrB;XS)s9LJi)Ui!=n!{| zAua8^LnX?e>6wq>?Ptr&pj&ml)K;J*%IEGy6=JS>ix4ZahCX75)sgncu wF}q;blT2B0G86spzIVayjFO9wMev`E6#N&&FGRg~&>~v&UzDB{W@jtD0nWvdApigX delta 223 zcmV~$wN*m_006)TpWrSD?ry=|T>~K@xI0r&T+ap!KuyaE>_SV$-S6Lb@bmE*yh)QT zkRc>fmTWn4<;ho|P?2IKN|h;BAuOU&m1;F=)v4E@QIlpZTD57{p;MP`J$m)&7d2qe zkYOW6jTtv#(v)d4X3d$mV9}CgD^{&pw_($kZ98_w?AaH0AR*~c%8_FyPMtY-;nJ0B SH*Vdz_u$c!XD?r`vG;!<&r=}) diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 index 3187d3c1282dde2d23eebd53d12028cffe6f9666..b8e663096ffa6d7a13b733a1427138001bb25048 100644 GIT binary patch delta 210 zcmbObe=Ud6bt7ZH{$yv}6_XX@Bqo1Q=Ha}0y|}2P@(xGKWPWXr$qusYllxWJCL1t1 zfmL*A@^JdALsXPa7SMJFs$iR}pkob|Jukt-xnJ=gSbqgj)^GA#O&g$$3P*nA9I)tQ zKJ8gxrTer+CX4DVfoRj?;cWG0ECyLy2R2k*jcc->LiXfVohe`y`no)v`nF796$M}w S8<-$g`ib*!Ow?fp%K!ij#zu|+ delta 10 RcmcbXGa;VQW+P+2J^&bz1K$7u diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo index e1e1da4badba10a558403dbf4ab6512f9366e919..056e8863200049f7b6fe64d2caa71e3831cba3eb 100644 GIT binary patch delta 2815 zcmbuAe^69a6vy9rJl0*vucH2F+LV6HG+B)~*7Sp>Kb+BKa2)#OnDjlci$BW7>M|eBedpeH z?tSNb?^%Dl$=_vab?~WfOR7y#G89G8z`3EJAsB_g?AKOJR1?D02lm{v?`ygVp76a~ ztJZS3TjSrdpPLA}`Bi0Uk3&@E) zC$z2FVp$k@NNig*EpF(7t4tVkkS{$EKXp0ubWaftb!B`L(qa&}e#D5*px zS&6=A{})N@my<+tYG@Ps$oU|yjTcmd&EO&612v!)YymQR6oafo)K+QM?QRRn!I2bk z|BhttSCb8|y_vMp==1+|bjcN3FiF*QHy=`+?A41kk(XEAoyiW>#Dn^+G7$R(oON8o zMck)4tjF*qM_StDw$?+&)YNb2iX*RxB{{$6SLS}>NL)4rCu@3&SFI=BoKmlDCH^I4 zwU!|>BWYmoIDdQ{G8ZG;Q50h+gVcbYPP4dvV~(*db9b!XlCND9+}l#jeMt_}TFj4$ z;WI6@v5%m8gll#cndP=ir5IUYS9)-UDHx{)=bH6Ss2~}WGa;i!X=gcUaymxlPEHTH zRJ~#e#jvX)kCt&`MJ|_pIga})tQ>Bdq~Gu2Z<}1~hn=+D6|%LHwn^UZOw2Y{p;Lv= z;7<~B0$;4BTqC#OAn7fIqbd1UyAG|GYUZg+yUbEKrCLVwWehI0lD_v)EXfg%1~&$e zSt)pjnGY^b=AJplZKaw~p3_OeQZ3+LL}5v8z?ngdW3a_QOdc&BQ*u}?m=gFroffda zFe@-CgHmlrzyB%z*C#((6Myx68yeb6PIJa>X*{rLtf8$tOU_2TAQ{{S+XS|Q9bf|3 z2_6N_K;}s6K&@*Cz|jew0K37H;3@Dl*aPGWMB8*cNBd6nyTJ?KMeq`M8SDeEfc@YA zcop=3*FXpu;C1i@cvDg0lwNe+0)1_(W?J4y=L2xAt?am|>VfrDWgB>)>4vn~IoY#k z*A>) z^lwfly{=G`G9A^By>-RrBsk=!aoAbf>0sN|Q^7_xSgQuh)nL7*x8|G87|)8%LCs)q zYw_^%ve0O>!PX<16yd1DD#yP7LQCVerYY+VCE`E5;9BtPeef9RK*w{MqU0JU#agO^%8Lyp!)fZR77ePOW{^Q#@ehc}-b- zkH@05M7(R@xjtb|c8+62yp2{NYPBnj_1Aklc@)qcN-=+2V@Wpk~bPT(7D}3hZXJ| zOJPns8J3N9+(o`#-%{F1f&L1b%&jFQ=i>xyHB`ql7B%;ptLe7{Bec*=!`S~f}2wrt< zSaN+G)hXhF=LuaSUMLz4@B3UyvbZL$?cwpA{UKix3VFldLe8eRL_!}+<|1F{Ss~}G zz~edOqX-VUf#8tyyy0QVAs<2f=aBPaT%HwjBQ3xo=l*{RIrm4(3x|9dE%bj5xoQ%z zb!EI3AA1KR071~C!AAfd`Bu#JJ6l2G=-~dMOaoU!jqakUYJwuW_XB6E zVur4KXG?44U2I7|VyLDLJ}n_%dUQrug^d{tB|bd3U}+lKM19mzYCP2b$Qq=_&RIr0 zyu8#`EorNk?FTi-fT!=JDqRJ$l!EodogGw{LXy~~ERo-#A|tIvY8GOWR# z6=p?V3;A09oKD#11iPW~93L5)U@EjIpF8O#yfxNDn=NZa&a~_-+q4x1W)*s zGt3z_8S}Up>MR{Kk ze^%^rp&hgL&(gJ%1751{*_e&y+h(l$AW6$yb1_P;mEc9(&lvKrT=(0&5I^u!<9S=X z?CCOa+8b~n)SIH(EXqyAkxho4rcwicDb9g?d#1?@>SjsZAfj(uD%x+yV|~4(59Jyw!sB+}-csuUF4Sg|42*nxr0|J6^kCGJ)LSG;r4Dn1@WajZD-w zG?YLz@Xg0pZN#rwzMnh7XVU+Dp%?{x?etsq>|V%6Ufw6+{hMF)?d;4a=Ib5QkSJRm z)Qj@9!f4>69TOQq`3Ak$y09z3hMwy?>_e;Ahk`?KIAONtJ>eAdE-_ksv)k5m=v>2nKFC<@`LTSL{U)Y&SuIzx(o_XdQb*Cw?}%z8=d{{s zIP{jrVO)8GVlM%&T0uFrFE5FJF83JayAnvn>p#?Cox4o4&kKg4^>iYA-)s{>z}{oy z;Q6_v9yp<)wI&g+prh(kdjW`$82}UX0yb1O1)Ao-cHOZBupu6-ien<2!4l+aS`SzYceSecI=y08qOWc9dO>j7tGKG5pHqD=BfPkS9?i>FC De9Cw| diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin index a67b133c50c28a9301aaa50f9dd44609e4708e63..2f841c338a87a1cc46e92e816fbd81c36da651cc 100644 GIT binary patch delta 64 zcmZoz&o*-d8!rPG7&)irja7f=PL|F0ncT0+J=tuYESsTTL1|LO S^u+0m@{=^vH{YAL=m!9WvKImX delta 36 pcmbQafvsUZ8xI2*7& /// /// /// - public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService) + public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService, ISplitPackingRecAppService splitPackingRecAppService) { _purchaseReceiptNoteAppService = purchaseReceiptNoteAppService; + _splitPackingRecAppService = splitPackingRecAppService; } /// @@ -48,6 +51,8 @@ public class PurchaseReceiptNoteController : AbpController string packingCode) { return await _purchaseReceiptNoteAppService.GetDetailByItemAndPackingAsync(itemCode, packingCode).ConfigureAwait(false); + + } /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index 7e81b3b08..69611ae4d 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -650,7 +650,6 @@ public class BalanceAppService [HttpGet("usable-list")] public virtual async Task> GetUsableListAsync(RecommendBalanceRequestInput input) { - var inventoryBalances = await _balanceManager .GetUsableListAsync(input.ItemCode, input.Locations, input.Statuses, input.IsPackingCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs index 372eafae9..913dc928e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs @@ -26,6 +26,7 @@ public class TransferLibJobAppService private readonly IServiceProvider _serviceProvider; private readonly ILocationAppService _locationAppService; private readonly IExpectOutAppService _expectOutAppService; + private readonly IBalanceAppService _balanceAppService; protected ITransferLibRequestAppService TransferLibRequestAppService => LazyServiceProvider.LazyGetRequiredService(); @@ -33,12 +34,13 @@ public class TransferLibJobAppService public TransferLibJobAppService( ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager, IServiceProvider serviceProvider, ILocationAppService locationAppService, - IExpectOutAppService expectOutAppService) : base(repository, + IExpectOutAppService expectOutAppService, IBalanceAppService balanceAppService) : base(repository, TransferLibJobManager) { _serviceProvider = serviceProvider; _locationAppService = locationAppService; _expectOutAppService = expectOutAppService; + _balanceAppService = balanceAppService; } /// @@ -205,6 +207,8 @@ public class TransferLibJobAppService detail.HandledFromContainerCode = string.Empty; detail.HandledToContainerCode = string.Empty; + var balanceDto=await _balanceAppService.GetByPackingCodeAsync(detail.HandledToPackingCode).ConfigureAwait(false); + var fromLocationDto = await _locationAppService.GetByCodeAsync(detail.HandledFromLocationCode) .ConfigureAwait(false); var toLocationDto = @@ -216,11 +220,21 @@ public class TransferLibJobAppService detail.HandledFromLocationGroup = fromLocationDto.LocationGroupCode; detail.HandledFromWarehouseCode = fromLocationDto.WarehouseCode; + detail.HandledFromArriveDate= balanceDto.ArriveDate; + detail.HandledFromExpireDate= balanceDto.ExpireDate; + detail.HandledFromProduceDate= balanceDto.ProduceDate; + detail.HandledFromSupplierBatch= balanceDto.SupplierBatch; + detail.HandledToLocationArea = toLocationDto.AreaCode; detail.HandledToLocationCode = toLocationDto.Code; detail.HandledToLocationErpCode = toLocationDto.ErpLocationCode; detail.HandledToLocationGroup = toLocationDto.LocationGroupCode; detail.HandledToWarehouseCode = toLocationDto.WarehouseCode; + + detail.HandledToArriveDate = balanceDto.ArriveDate; + detail.HandledToExpireDate = balanceDto.ExpireDate; + detail.HandledToProduceDate = balanceDto.ProduceDate; + detail.HandledToSupplierBatch = balanceDto.SupplierBatch; } var ret = await base.CompleteAsync(id, dto).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs index 7c7d13a11..e1bd42b58 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Volo.Abp.ObjectMapping; using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Label.Application.Contracts; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Domain; @@ -169,13 +170,26 @@ public class PurchaseReceiptNoteAppService : public virtual async Task GetDetailByItemAndPackingAsync(string itemCode, string packingCode) { - var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == packingCode), true).ConfigureAwait(false)).FirstOrDefault(); + var list=await _splitPackingRecAppService.GetListByToPackingCode(new List(){ packingCode }).ConfigureAwait(false); + var splitPackingRecDto=list.FirstOrDefault(); - var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == packingCode); + var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode), true).ConfigureAwait(false)).FirstOrDefault(); - var dto = ObjectMapper.Map(detail); + if (entity != null) + { + var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode); - return dto; + var dto = ObjectMapper.Map(detail); + + dto.Qty = splitPackingRecDto.ToQty; + dto.PackingCode = packingCode; + + return dto; + } + else + { + return null; + } } ///