From fb95cccae270bd25d3c5c3cb6ea631f29db39bc8 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 14 Jun 2024 09:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= 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 .../Controllers/ChangeBoxRecordController.cs | 4 +-- .../Controllers/InStockTaskController.cs | 15 ++++++++++ .../Controllers/OutStockTaskController.cs | 15 ++++++++++ src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 16 +++++++++- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 ++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 28 +++++++++++++++++- .../Dto/TakeStock/SaveTakeStockRequest.cs | 5 ++++ .../IService/IInStockTaskService.cs | 7 +++++ .../IService/Public/IOutStockTaskService.cs | 2 ++ .../Services/InStockTaskService.cs | 11 +++++++ .../Services/OutStockTaskService.cs | 11 +++++++ 12 files changed, 115 insertions(+), 4 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index fe5f3d248877ebaf7723c4023713bc9195d43e61..c636cfb08b52a7949e8e6cc4924850577f73bf02 100644 GIT binary patch delta 5434 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 delta 5124 zcmb7{d3+Vs702JqP42k~5Fk|bv?n_ItwYF9%E-0;4`%a&=k)rMI&YZ^!vHx^FpWnORv)p@T?wvci z`T9`i*M~Blx0g9jI!^my=aSVK#ZEM%*!@`fQ%AT1oy(#-Mz|e&`EM<92c$T;k#qgp zeQwX_1&iHRMmf3G=;n9Y?{;+thFsO`cJTX@x!wJmefT+0;F5oEp_}FB>~*vKlKpN+ zFEbKe3e9>GiPS)~koDK0-2l~#ZzI}GkPkILo1sSNZm0>m2igMN3vGqEVvPIHZiDWJ z9)KQ%?0DOuhfKt8Jm8+=+0Ktak3&yDPeM;YQOLz0Pov!f*_(U@ZNhe7KMUKodnNt| zT05Q{!{+Z3`#H2H!L~Q_JY;X;1!#wfcoEyF8M1@D2)zWgzKNG%zXGLW0NYtQ{-EEh zt@>%?z6RSCdL6Pg-hk}5J>*8-1aC7vBaycNt*7W$ux&@&U1X=m*I+n@>x+N=iN}W@~N0j|-!0)k4F4RNgxOk|xO+4ntxk$&k zSaXR)N|TXch?Hp_E|C$*$VeUcc$DVR5-LxI#-LM$=CKkPmyC=@~Q|9y`)Y4(!iFP!i#JC!{w^})Mc8N>;AEJvG%+|^X-BwqwB}0 z?pZmj^uRdpbuip&&8slA&w=ge;IQ%gz3-0o7iX)|Xx_`J#)X#|??NRwy2ZN3dc;oW`B?HzNF8iTuG2xY zK5S~jrZ#NqwEt*{%JL6xR^8kU+W)9Toe}NUs5-k&z2C1%9dR~BONXm$$G>cgT3WhE z=X1J~&+VZ0PzNXj^5M^c&V({ypA0pCH$#ok-B1&B53~ik7uu?$A8k>~T`!8{{*=#q zocyY)1M+>UEG=T7Z8b~c&Vrlp$?dCy*1;jG(VB)J1JcPI)!G**_6I?`GY#Fmx zLR>01j5s?5UJvdv;vCDs;l#ZJM-ZPaIFh)x;3(pA1xFK~FIZ0eyc3QvhPaP-D~S6F zjwOCc62=j~A~>GddrkOi;x`1ZA-+=jO(0$_IFYzX@LJ-nf|H212~H;7B{+q6hu~D= zUkXkm{E6=y4VCrQ%*je7WFq;(Wms#J9_6D~VSLt|o4ga@EAg1n(f8 zuENJyLtH6%C-L`^uolnhh6#5Or?_6o>xc(Qx%I>~Qlpl*PH+Qpz2HV-EkkS~ZZGH) zX9zYBX9{j6HiC`B>4J9?cNFxRu!W@ZJ;Xx0^1afuAP6MIx}7jc>3ZsHMw4`az?w4W0{ zB9rn9yyk+BqMIZlHgyle+2)AO(Xav@mB%jlkj)q zn7EnvAA)h>uLb`}{Egthun`2mB|a+nZ|n)d@9_2u{s(Wr3Ez0fuq&txrwFDR)}AmK zHiBt}(*@fZZZFuuaE9PXhBF0EHr!G06vLeaI~&dtJk@X)!LEi+6YOTVdx#$QFnqeW zdm7FbJi~B~;F*Sd37%#6Y{4HH?k#wZ;d2GgGkm__1%~?wUTC(JNJlqa4_9zk@ z)pRe`sm`h6VWt$~GJ{_nN`@OAVR)qB zQOJaUwBd5YV+;-^6~>-nin0BS{aajN)5jW|Va6FAk8C*P3}er(wS2W1#@84*+fFdS z**4bEo@$?Q>YVSQ*}K)Zr+GD$II~SO_;e=EY+zj06M!J|#_&pfR9^d4;N(N-oJR2bMYy|7CHyV&?cQ&fT9 zd|1tOrqhu0p_$MuC~*|) zg=3aIiroa?Y-kQN7n%pnhZaB!p+(SQ=w@gMbPIGVbQ`o3@}Me{-;tLAmP0Ebdu+Qs zdgOC;f$myEIIh}>ud`q$w%$TL`5zv2`$uQ7TA*`RVt=LJl&=t}#6MN_IHdZ#$`s(( zYo~6trPY?IEmed3b)?SnuV_*2`rcves)q;LVhT>QYfRAG88&Of=B}_==Pztgy`s%S zRim5NJ*AM>{m<&_ZKd_LW{ss9OSP72Ppn?os`}`#`i8Jjeb{Uan@wTk2i5(4Evj?h z`c_>l!me$S!#)jRv)Oh%+vE4r3gWTz@T$C@29D!j7W?9bmvsaeA4+6>k_K**1xJ|m zSt9H6H2$n@793&Lg|1YLrLlJ*{!u-enh4mI;R@|<62l!$<8Rsy2S=FoeImYZT-FmpheX=R>D(cimIz8#Ug8N(P3OE;4* [HttpPost] [Route("Save")] - public async Task Save(SaveChangeBoxRecordRequest dto) + public async Task Save(List dto) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return Result.ReFailure(ResultCodes.Token_Invalid_Error); - return await _changeMoveBoxService.ChangeBoxSave(new List() { dto }, loginInfo, true, true, true); + return await _changeMoveBoxService.ChangeBoxSave(dto, loginInfo, true, true, true); } } } diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 6fa447de..ec903420 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -106,6 +106,21 @@ namespace WMS.Web.Api.Controllers return await _inStockTaskService.Repeal(dto, loginInfo); } + /// + /// 反作废 + /// + /// + /// + [HttpPost] + [Route("NoRepeal")] + public async Task NoRepeal([FromBody] OperateRequest dto) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + return await _inStockTaskService.NoRepeal(dto, loginInfo); + } /// /// 金蝶-拉取数据-测试用 diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index a27652d4..e9b177f1 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -127,6 +127,21 @@ namespace WMS.Web.Api.Controllers return await _outStockTaskService.Repeal(dto, loginInfo); } + /// + /// 反作废 + /// + /// + /// + [HttpPost] + [Route("NoRepeal")] + public async Task NoRepeal(OperateRequest dto) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + return await _outStockTaskService.NoRepeal(dto, loginInfo); + } /// /// 合并 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index dae7e824..f530bf7d 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -94,7 +94,7 @@ - + 改箱保存-PDA @@ -228,6 +228,13 @@ + + + 反作废 + + + + 金蝶-拉取数据-测试用 @@ -497,6 +504,13 @@ + + + 反作废 + + + + 合并 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index ae96613b..5ffa6f86 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -5994,6 +5994,11 @@ 物料编码 + + + 仓位 + + 仓位 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index aa1cc557..3d31cb23 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -2894,7 +2894,7 @@ - 获取-已入库的箱 + 获取-非采购上将已入库的箱 @@ -3659,6 +3659,14 @@ + + + 反作废 + + + + + 即时库存-服务接口 @@ -5319,6 +5327,15 @@ + + + 反作废 + + + + + + 即时库存-服务 @@ -5414,6 +5431,15 @@ + + + 反作废 + + + + + + 出库任务合并 diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs index 7f5d472a..cc5d15cb 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs @@ -20,6 +20,11 @@ namespace WMS.Web.Core.Dto.TakeStock /// [Required(ErrorMessage = "物料不能为空")] public string MaterialNumber { get; set; } + /// + /// 仓位 + /// + [Required(ErrorMessage = "仓库不能为空")] + public string StockCode { get; set; } ///// ///// 仓位ID ///// diff --git a/src/WMS.Web.Domain/IService/IInStockTaskService.cs b/src/WMS.Web.Domain/IService/IInStockTaskService.cs index 6ad3e1cf..4c2a8590 100644 --- a/src/WMS.Web.Domain/IService/IInStockTaskService.cs +++ b/src/WMS.Web.Domain/IService/IInStockTaskService.cs @@ -74,5 +74,12 @@ namespace WMS.Web.Domain.IService /// /// Task Repeal(OperateRequest dto, LoginInDto loginInfo); + /// + /// 反作废 + /// + /// + /// + /// + Task NoRepeal(OperateRequest dto, LoginInDto loginInfo); } } diff --git a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs index 8880ecc9..755f07e2 100644 --- a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs +++ b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs @@ -49,6 +49,8 @@ namespace WMS.Web.Domain.IService.Public Task BillQueryForSalOutStock(bool isTransaction, List sourceBillNos = null, DateTime? beginTime = null); //出库任务作废 Task Repeal(OperateRequest dto, LoginInDto loginInfo); + //出库任务反作废 + Task NoRepeal(OperateRequest dto, LoginInDto loginInfo); //出库任务作废 Task merge(OperateRequest dto, LoginInDto loginInfo); /// diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 7ae1991c..84ab2ffa 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -665,5 +665,16 @@ namespace WMS.Web.Domain.Services { _logger.LogInformation($"《{type.GetRemark()}总条数：" + totalCount + "，修改条数：" + updateCount + "，新增条数：" + addCount + "》"); } + /// + /// 反作废 + /// + /// + /// + /// + /// + public Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) + { + throw new NotImplementedException(); + } } } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 6f6c94d8..275c9b14 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -92,6 +92,17 @@ namespace WMS.Web.Domain.Services return Result.ReSuccess(); } /// + /// 反作废 + /// + /// + /// + /// + /// + public Task NoRepeal(OperateRequest dto, LoginInDto loginInfo) + { + throw new NotImplementedException(); + } + /// /// 出库任务合并 /// ///