增加出库任务单详情

增加订阅通知详情

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

@@ -204,5 +204,20 @@ namespace WMS.Web.Api.Controllers
             //再刷新3天内所有的
             return await _outStockTaskService.Sync(null, begin);
         }
+        /// <summary>
+        /// 出库任务单详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetInfo/{id}")]
+        public async Task<Result<OutStockTaskInfoResponse>> GetInfo([FromRoute] int id)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<OutStockTaskInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            return await _outStockTaskService.GetInfo(id);
+        }
     }
 }

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

@@ -128,5 +128,23 @@ namespace WMS.Web.Api.Controllers
             if (!res) Result.ReFailure(ResultCodes.DateWriteError);
             return Result.ReSuccess();
         }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetInfo/{id}")]
+        public async Task<Result<SubscribeNotificationInfoResponse>> GetInfo([FromRoute] int id)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var entity = await _repositories.Get(id);
+            if (entity == null) Result<SubscribeNotificationInfoResponse>.ReFailure(ResultCodes.SubscribeNotificationNoData);
+            return Result<SubscribeNotificationInfoResponse>.ReSuccess(_mapper.Map<SubscribeNotificationInfoResponse>(entity));
+        }
     }
 }

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

@@ -275,7 +275,7 @@ namespace WMS.Web.Api.Controllers
         }
 
         /// <summary>
-        /// 获取出库单客户下拉列表
+        /// 获取客户下拉列表(包含组织信息)
         /// </summary>
         /// <param name="name">客户名</param>
         /// <returns></returns>
@@ -310,6 +310,32 @@ namespace WMS.Web.Api.Controllers
 
             return Result<List<PullDownStrResponse>>.ReSuccess(pullList);
         }
+        /// <summary>
+        /// 获取客户下拉列表(纯客户信息 不包含组织信息)
+        /// </summary>
+        /// <param name="name">客户名</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetCustomersNoOrg/{name}")]
+        public async Task<Result<List<PullDownStrResponse>>> GetCustomersNoOrg([FromRoute] string name)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<List<PullDownStrResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
+            var customers = await _erpService.BillQueryForCustomer();
+            
+            List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
+            foreach (var c in customers.Data.Where(w => w.Name.Contains(name)))
+            {
+                pullList.Add(new PullDownStrResponse()
+                {
+                    Id = c.Id.ToString(),
+                    Name = c.Name,
+                    Code = c.Number
+                });
+            }
+            return Result<List<PullDownStrResponse>>.ReSuccess(pullList);
+        }
 
         /// <summary>
         /// 获取仓位：模糊名称

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

@@ -499,6 +499,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetInfo(System.Int32)">
+            <summary>
+            出库任务单详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.SerialNumberController.Get(System.String)">
             <summary>
             获取序列号信息
@@ -539,6 +546,13 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.SubscribeNotificationController.GetInfo(System.Int32)">
+            <summary>
+            获取详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.SysConfigController">
             <summary>
             系统配置
@@ -593,7 +607,14 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomers(System.String)">
             <summary>
-            获取出库单客户下拉列表
+            获取客户下拉列表(包含组织信息)
+            </summary>
+            <param name="name">客户名</param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomersNoOrg(System.String)">
+            <summary>
+            获取客户下拉列表(纯客户信息 不包含组织信息)
             </summary>
             <param name="name">客户名</param>
             <returns></returns>

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

@@ -4563,6 +4563,111 @@
             单号
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse">
+            <summary>
+            出库任务单对应出库明细
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.MaterialNumber">
+            <summary>
+            物料编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.Specifications">
+            <summary>
+            物料规格型号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.BoxBillNo">
+            <summary>
+            箱号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.SerialNumbers">
+            <summary>
+            序列号  
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.SubStockCode">
+            <summary>
+            仓位
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.Qty">
+             <summary>
+             出库数量
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.AccruedQty">
+             <summary>
+             应出库数量
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.Method">
+            <summary>
+            出库方式
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.Creator">
+            <summary>
+            出库人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse.CreateTime">
+            <summary>
+            出库时间
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse">
+            <summary>
+            出库任务单详情
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.Id">
+            <summary>
+            主键
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.SourceBillNo">
+            <summary>
+            来源单号
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.DeliveryOrg">
+             <summary>
+             发货组织
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.ReceiptCustomer">
+             <summary>
+             客户
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.Status">
+            <summary>
+            单据状态
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.Type">
+            <summary>
+            单据类型
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.CreateTime">
+             <summary>
+             创建时间（erp那边的创建时间）
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoResponse.Details">
+            <summary>
+            出库箱信息
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse">
             <summary>
             出库单任务列表
@@ -5298,6 +5403,36 @@
             邮件
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse">
+            <summary>
+            订阅通知详情
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse.Id">
+            <summary>
+            主键
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse.CustomerName">
+            <summary>
+            客户名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse.CustomerNumber">
+            <summary>
+            客户编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse.Telephones">
+            <summary>
+            电话
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationInfoResponse.Emails">
+            <summary>
+            邮件
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationQueryInfoResponse">
             <summary>
             订阅通知列表
@@ -5368,12 +5503,12 @@
             操作人
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationQueryRequest.OperateBeginDate">
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationQueryRequest.CreateBeginDate">
             <summary>
             操作时间 开始
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationQueryRequest.OperateEndDate">
+        <member name="P:WMS.Web.Core.Dto.SubscribeNotification.SubscribeNotificationQueryRequest.CreateEndDate">
             <summary>
             操作时间 结束
             </summary>

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

@@ -3849,6 +3849,13 @@
             <param name="begin"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.GetInfo(System.Int32)">
+            <summary>
+            查询出库任务单详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.IService.Public.ISingleDataService">
             <summary>
             单点数据返回服务接口
@@ -4959,6 +4966,13 @@
             <param name="sourceBillNos"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.OutStockTaskService.GetInfo(System.Int32)">
+            <summary>
+            获取出库任务单详情
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.Public.ErpBaseDataSync">
             <summary>
             同步erp基础数据