出入库回退上下架

src/WMS.Web.Api/Controllers/BackRecordController.cs

@@ -0,0 +1,81 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.BackRecord;
+using WMS.Web.Core.Internal.Results;
+using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService;
+using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values;
+
+namespace WMS.Web.Api.Controllers
+{
+    /// <summary>
+    /// 出入库回退上下架：接口
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class BackRecordController : ControllerBase
+    {
+        private readonly ILoginService _loginService;
+        private readonly IBackRecordService _backRecordService;
+        private readonly IBackRecordRepositories _backRecordRepositories;
+        public BackRecordController(ILoginService loginService, IBackRecordRepositories backRecordRepositories, IBackRecordService backRecordService)
+        {
+            this._loginService = loginService;
+            this._backRecordService = backRecordService;
+            this._backRecordRepositories = backRecordRepositories;
+        }
+
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetList")]
+        public async Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList([FromBody] BackRecordQueryRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultPagedList<BackRecordQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+            var result = await _backRecordRepositories.GetPagedList(dto);
+            return result;
+        }
+
+        /// <summary>
+        /// 出库回退上架
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("OnShelf")]
+        public async Task<Result> OnShelf([FromBody] SaveBackRecordRequest 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 _backRecordService.BackShelf(dto, loginInfo);
+        }
+
+        /// <summary>
+        /// 入库回退下架
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("OffShelf")]
+        public async Task<Result> OffShelf([FromBody] SaveBackRecordRequest 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 _backRecordService.BackShelf(dto, loginInfo);
+        }
+
+    }
+}

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -58,6 +58,10 @@ namespace WMS.Web.Api.Controllers
             {
                 response.InstockStatus.Add(enumv.ToString(), enumv.GetRemark());
             }
+            foreach (BackRecordType enumv in Enum.GetValues(typeof(BackRecordType)))
+            {
+                response.BackRecordType.Add(enumv.ToString(), enumv.GetRemark());
+            }
             //2
             //1
             return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -4,6 +4,32 @@
         <name>WMS.Web.Api</name>
     </assembly>
     <members>
+        <member name="T:WMS.Web.Api.Controllers.BackRecordController">
+            <summary>
+            出入库回退上下架：接口
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.BackRecordController.GetPagedList(WMS.Web.Core.Dto.BackRecordQueryRequest)">
+            <summary>
+            列表
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.BackRecordController.OnShelf(WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest)">
+            <summary>
+            出库回退上架
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.BackRecordController.OffShelf(WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest)">
+            <summary>
+            入库回退下架
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.ChangeBoxRecordController">
             <summary>
             改箱

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -180,6 +180,51 @@
             序列号集
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest">
+            <summary>
+            保存出入库回退上下架明细：请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.BoxId">
+            <summary>
+            所属箱号ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.SubStockId">
+            <summary>
+            仓位ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest">
+            <summary>
+            保存出入库回退上下架：请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest.Type">
+            <summary>
+            类型：1为入库回退下架，2为出库回退上架
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest">
             <summary>
             改箱列表请求
@@ -350,6 +395,11 @@
             入库状态
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.EnumStatusResponse.BackRecordType">
+            <summary>
+            类型：1为入库回退下架，2为出库回退上架
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
             <summary>
             ERP：单据查询-dto

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -14,11 +14,6 @@
             ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BackRecord.BoxId">
-            <summary>
-            所属箱号ID
-            </summary>
-        </member>
         <member name="P:WMS.Web.Domain.Entitys.BackRecord.Type">
             <summary>
             类型：1为入库回退下架，2为出库回退上架
@@ -39,6 +34,12 @@
             明细
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.BackRecord.Create(System.Int32)">
+            <summary>
+            创建
+            </summary>
+            <param name="creatorId"></param>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.BackRecordDetails">
             <summary>
             wms出入库回退记录表
@@ -54,6 +55,11 @@
             回退记录表ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.BoxId">
+            <summary>
+            所属箱号ID
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.MaterialId">
             <summary>
             物料ID
@@ -997,6 +1003,14 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.Add(WMS.Web.Domain.Entitys.BackRecord,System.Boolean)">
+            <summary>
+            新增
+            </summary>
+            <param name="entity"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IBasicsRepositories">
             <summary>
             基础数据
@@ -1132,6 +1146,19 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.IService.IBackRecordService">
+            <summary>
+            出入库回退上下架：服务接口
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.IBackRecordService.BackShelf(WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            回退上下架
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IChangeMoveBoxService">
             <summary>
             改箱 移箱服务
@@ -1663,7 +1690,7 @@
         </member>
         <member name="T:WMS.Web.Domain.QuartzJob.InStockOrderQuartzJob">
             <summary>
-            erp入库单-获取定时任务
+            erp入库任务单-获取定时任务
             </summary>
         </member>
         <member name="M:WMS.Web.Domain.QuartzJob.InStockOrderQuartzJob.Execute(Quartz.IJobExecutionContext)">
@@ -1673,6 +1700,19 @@
             <param name="context"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.Services.BackRecordService">
+            <summary>
+            出入库回退上下架：服务接口
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.BackRecordService.BackShelf(WMS.Web.Core.Dto.BackRecord.SaveBackRecordRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            回退上下架
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>