详情接口

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

@@ -60,6 +60,23 @@ namespace WMS.Web.Api.Controllers
             return ResultPagedList<InStockQueryResponse>.ReSuccess(list, count);
              
         }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetInfo/{id}")]
+        public async Task<Result<InStockInfoResponse>> GetInfo([FromRoute] int id)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<InStockInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var response = await _inStockRepositories.GetInfo(id);
+            return Result<InStockInfoResponse>.ReSuccess(response);
+        }
         /// <summary>
         /// 导出
         /// </summary>

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

@@ -169,7 +169,7 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="boxBillNo"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpGet]
         [Route("GetBoxInventoryDetails/{boxBillNo}")]
         public async Task<ResultList<BoxInventoryDetailsResponse>> GetBoxInventoryDetails([FromRoute] string boxBillNo)
         {

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

@@ -86,6 +86,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockController.GetInfo(System.Int32)">
+            <summary>
+            获取详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.InStockController.Export(WMS.Web.Core.Dto.InStockQueryRequest)">
             <summary>
             导出

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

@@ -1725,6 +1725,126 @@
             创建时间（erp那边的创建时间）
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.InStockInfoResponse">
+            <summary>
+            入库单详情
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.InStockInfoResponse.Creator">
+            <summary>
+            创建人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.InStockInfoResponse.CreateTime">
+            <summary>
+            创建时间（入库时间）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.InStockInfoResponse.Operate">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.InStockInfoResponse.SyncTime">
+            <summary>
+            同步时间
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest">
+            <summary>
+            非采购单上架请求对象-按箱
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskId">
+            <summary>
+            单据ID(等同-入库任务单ID)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.ShelfMethod">
+            <summary>
+            上架方式
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Boxs">
+            <summary>
+            箱集合
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Details">
+            <summary>
+            入库单明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest">
+            <summary>
+            采购上架-请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.BoxIds">
+            <summary>
+            箱IDS
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest">
+            <summary>
+            保存入库单明细-请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.TaskId">
+            <summary>
+            单据ID(等同-入库任务单ID)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SourceBillNo">
+             <summary>
+             来源单号
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SupplierId">
+            <summary>
+            供应商
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.OrgId">
+            <summary>
+            组织
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.MaterialId">
+             <summary>
+             物料Id
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockCode">
+             <summary>
+             仓库编码
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SubStockId">
+             <summary>
+             仓位ID
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.Qty">
+             <summary>
+             入库数量
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockRequest">
+            <summary>
+            保存入库单-请求对象
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStockQueryRequest">
             <summary>
             入库单查询请求对象
@@ -1860,101 +1980,6 @@
             同步成功或者失败
             </summary>
         </member>
-        <member name="T:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest">
-            <summary>
-            非采购单上架请求对象-按箱
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskId">
-            <summary>
-            单据ID(等同-入库任务单ID)
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.ShelfMethod">
-            <summary>
-            上架方式
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Boxs">
-            <summary>
-            箱集合
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Details">
-            <summary>
-            入库单明细
-            </summary>
-        </member>
-        <member name="T:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest">
-            <summary>
-            采购上架-请求对象
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.BoxIds">
-            <summary>
-            箱IDS
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.Details">
-            <summary>
-            明细
-            </summary>
-        </member>
-        <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest">
-            <summary>
-            保存入库单明细-请求对象
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.TaskId">
-            <summary>
-            单据ID(等同-入库任务单ID)
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SourceBillNo">
-             <summary>
-             来源单号
-            </summary> 
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SupplierId">
-            <summary>
-            供应商
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.OrgId">
-            <summary>
-            组织
-            </summary>
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.MaterialId">
-             <summary>
-             物料Id
-            </summary> 
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockCode">
-             <summary>
-             仓库编码
-            </summary> 
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SubStockId">
-             <summary>
-             仓位ID
-            </summary> 
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.Qty">
-             <summary>
-             入库数量
-            </summary> 
-        </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SerialNumbers">
-            <summary>
-            序列号集
-            </summary>
-        </member>
-        <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockRequest">
-            <summary>
-            保存入库单-请求对象
-            </summary>
-        </member>
         <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryBackGenerateDto">
             <summary>
             出入库回退上下架-箱库存处理对象

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

@@ -471,6 +471,16 @@
             同步成功或者失败
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStock.OperateId">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStock.SyncTime">
+            <summary>
+            同步时间
+            </summary>
+        </member>
         <member name="F:WMS.Web.Domain.Entitys.InStock.Details">
             <summary>
             明细
@@ -1660,6 +1670,13 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockRepositories.GetInfo(System.Int32)">
+            <summary>
+            详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories">
             <summary>
             入库任务-仓储接口

src/WMS.Web.Core/Dto/InStock/InStockInfoResponse.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.InStock
+{
+    /// <summary>
+    /// 入库单详情
+    /// </summary>
+    public class InStockInfoResponse
+    {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string Creator { get; set; }
+        /// <summary>
+        /// 创建时间（入库时间）
+        /// </summary>
+        public string CreateTime { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string Operate { get; set; }        
+        /// <summary>
+        /// 同步时间
+        /// </summary>
+        public string SyncTime { get; set; }
+    }
+}

src/WMS.Web.Domain/Entitys/InStock.cs

@@ -39,6 +39,16 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public bool? SuccessSync { get; set; }
 
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public int OperateId { get; set; }
+
+        /// <summary>
+        /// 同步时间
+        /// </summary>
+        public DateTime? SyncTime { get; set; }
+
         /// <summary>
         /// 明细
         /// </summary>

src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 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.Entitys;
 
@@ -27,5 +28,12 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="isTransaction"></param>
         /// <returns></returns>
         Task<InStock> Add(InStock entity, bool isTransaction = true);
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<InStockInfoResponse> GetInfo(int id);
     }
 }

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -8,6 +8,8 @@ using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.InStock;
+using WMS.Web.Core.Help;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
@@ -178,5 +180,25 @@ namespace WMS.Web.Repositories
         {
             return await GetPagedList(dto);
         }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<InStockInfoResponse> GetInfo(int id)
+        {
+            var res = await _context.Instock
+               .FirstOrDefaultAsync(f => id == f.Id);
+            if (res == null) return null;
+            var response = new InStockInfoResponse()
+            {
+                CreateTime = res.CreateTime.DateToStringSeconds(),
+                SyncTime = res.SyncTime.DateToStringSeconds(),
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.CreatorId),
+                Operate = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.OperateId)
+            };
+            return response;
+        }
     }
 }