入库单-接口

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

@@ -5,8 +5,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.InStock;
 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;
 
@@ -20,10 +22,12 @@ namespace WMS.Web.Api.Controllers
     public class InStockController : ControllerBase
     {
         private readonly ILoginService _loginService;
+        private readonly IInStockService _inStockService;
         private readonly IInStockRepositories _inStockRepositories;
-        public InStockController(ILoginService loginService, IInStockRepositories inStockRepositories) 
+        public InStockController(ILoginService loginService, IInStockRepositories inStockRepositories, IInStockService inStockService) 
         {
             this._loginService = loginService;
+            this._inStockService = inStockService;
             this._inStockRepositories = inStockRepositories;
         }
 
@@ -42,5 +46,37 @@ namespace WMS.Web.Api.Controllers
             var result= await _inStockRepositories.GetPagedList(dto);
             return result;
         }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Save")]
+        public async Task<Result> Save(List<SaveInStockRequest> 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 _inStockService.Save(dto, loginInfo);
+        }
+
+        /// <summary>
+        /// 同步金蝶
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Sync")]
+        public async Task<Result> Sync(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 _inStockService.Sync(dto);
+        }
     }
 }

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

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

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

@@ -35,6 +35,20 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest})">
+            <summary>
+            保存
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockController.Sync(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            同步金蝶
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.InStockTaskController">
             <summary>
             入库任务单-接口

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

@@ -475,6 +475,51 @@
             同步成功或者失败
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockRequest">
+            <summary>
+            保存入库单-请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.Type">
+            <summary>
+            入库类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SourceBillNo">
+             <summary>
+             来源单号
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SupplierId">
+            <summary>
+            供应商
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.OrgId">
+            <summary>
+            组织
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.MaterialId">
+             <summary>
+             物料Id
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.StockId">
+             <summary>
+             仓库ID
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SubStockId">
+             <summary>
+             仓位ID
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.Qty">
+             <summary>
+             入库数量
+            </summary> 
+        </member>
         <member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">
             <summary>
             授权token -- 给前端用的验证token
@@ -980,6 +1025,11 @@
             单据Id
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.DetailId">
+            <summary>
+            明细Id
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.BillNo">
             <summary>
             单据编号
@@ -1070,6 +1120,11 @@
             出库单任务
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.Ids">
+            <summary>
+            刷新 明细Id
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryRequest.Type">
             <summary>
             单据类型(出库单下拉列表)

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

@@ -300,6 +300,17 @@
             明细
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.InStock.Create(System.Int32)">
+            <summary>
+            创建
+            </summary>
+            <param name="creatorId"></param>
+        </member>
+        <member name="M:WMS.Web.Domain.Entitys.InStock.GenerateNo">
+            <summary>
+            生成单据号
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InStockDetails">
             <summary>
             wms入库单明细
@@ -964,6 +975,14 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.Add(WMS.Web.Domain.Entitys.InStock,System.Boolean)">
+            <summary>
+            添加
+            </summary>
+            <param name="entity"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories">
             <summary>
             入库任务-仓储接口
@@ -1045,6 +1064,26 @@
             改箱 移箱服务
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.IService.IInStockService">
+            <summary>
+            入库单服务接口
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.IInStockService.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest},WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            保存
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.IInStockService.Sync(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            同步金蝶
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IOutStockService">
             <summary>
             出库服务
@@ -1538,6 +1577,26 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.Services.InStockService">
+            <summary>
+            入库单服务
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.InStockService.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest},WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            出库单
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.InStockService.Sync(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            同步金蝶
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.OutStockService">
             <summary>
             出库服务