Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.OpApi/Controllers/ServiceWorkFlowBaseController.cs

@@ -118,7 +118,7 @@ namespace DS.WMS.OpApi.Controllers
         /// </summary>
         /// <param name="querySearch">服务流程台账查询请求</param>
         /// <returns>返回结果</returns>
-        [HttpGet("GetPage")]
+        [HttpPost("GetPage")]
         public async Task<DataResult<List<ServiceWorkFlowBasePageDto>>> GetPageAsync([FromBody] PageRequest querySearch)
         {
             return await _serviceWorkFlowBaseService.GetPageAsync(querySearch);

ds-wms-service/DS.WMS.OpApi/Controllers/ServiceWorkFlowManageController.cs

@@ -0,0 +1,187 @@
+using DS.Module.Core;
+using DS.Module.DjyServiceStatus;
+using DS.WMS.Core.Op.Dtos;
+using DS.WMS.Core.Op.Interface;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.OpApi.Controllers
+{
+    public class ServiceWorkFlowManageController : ApiController
+    {
+        private readonly IServiceWorkFlowManageService _serviceWorkFlowManageService;
+
+        public ServiceWorkFlowManageController(IServiceWorkFlowManageService serviceWorkFlowManageService)
+        {
+            _serviceWorkFlowManageService = serviceWorkFlowManageService;
+        }
+
+        #region 推送状态
+        /// <summary>
+        /// 推送状态
+        /// </summary>
+        /// <param name="info">服务流程报文详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("PushStatus")]
+        public async Task<DataResult> PushStatus([FromBody] TrackingMessageInfo info)
+        {
+            return await _serviceWorkFlowManageService.PushStatus(info);
+        }
+        #endregion
+
+        #region 单票单服务项目查询
+        /// <summary>
+        /// 单票单服务项目查询
+        /// </summary>
+        /// <param name="info">查询服务流程详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("QuerySingleBusinessPerServiceProject")]
+        public async Task<DataResult<List<ServiceWorkFlowRunDto>>> QuerySingleBusinessPerServiceProject([FromBody] TrackingQueryMessageInfo info)
+        {
+            return await _serviceWorkFlowManageService.QuerySingleBusinessPerServiceProject(info);
+        }
+        #endregion
+
+        #region 单票所有相关服务项目查询
+        /// <summary>
+        /// 单票所有相关服务项目查询
+        /// </summary>
+        /// <param name="info">查询服务流程详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("QuerySingleBusinessAll")]
+        public async Task<DataResult<List<ServiceWorkFlowRunDto>>> QuerySingleBusinessAll([FromBody] TrackingQueryMessageInfo info)
+        {
+            return await _serviceWorkFlowManageService.QuerySingleBusinessAll(info);
+        }
+        #endregion
+
+        #region 取消状态
+        /// <summary>
+        /// 取消状态
+        /// </summary>
+        /// <param name="info">服务流程报文详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("CancelStatus")]
+        public async Task<DataResult> CancelStatus([FromBody] TrackingMessageInfo info)
+        {
+            return await _serviceWorkFlowManageService.CancelStatus(info);
+        }
+        #endregion
+
+        #region 查询当前租户下可用服务项目与状态详情
+        /// <summary>
+        /// 查询当前租户下可用服务项目与状态详情
+        /// </summary>
+        /// <param name="info">查询服务项目请求报文</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("QueryServiceInfo")]
+        public async Task<DataResult<List<ServiceProjectBaseDto>>> QueryServiceInfo([FromBody] TrackingQueryMessageInfo info)
+        {
+            return await _serviceWorkFlowManageService.QueryServiceInfo(info);
+        }
+        #endregion
+
+        #region 检索已选中并且可用的服务项目列表
+        /// <summary>
+        /// 检索已选中并且可用的服务项目列表
+        /// </summary>
+        /// <param name="model">查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableProjectList")]
+        public async Task<DataResult<List<ServiceProjectWithStatusDto>>> GetEnableProjectList([FromBody] QueryServiceProjectWithStatus model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableProjectList(model);
+        }
+        #endregion
+
+        #region 检索服务项目下的状态列表
+        /// <summary>
+        /// 检索服务项目下的状态列表
+        /// </summary>
+        /// <param name="model">查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableStatusListByProject")]
+        public async Task<DataResult<List<ServiceProjectStatusDto>>> GetEnableStatusListByProject([FromBody] QueryServiceProjectWithStatus model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableStatusListByProject(model);
+        }
+        #endregion
+
+        #region 单票检索服务项目下的状态列表
+        /// <summary>
+        /// 单票检索服务项目下的状态列表
+        /// </summary>
+        /// <param name="model">查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableStatusListByBusiness")]
+        public async Task<DataResult<List<ServiceProjectStatusDto>>> GetEnableStatusListByBusiness([FromBody] QueryServiceProjectWithStatus model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableStatusListByBusiness(model);
+        }
+        #endregion
+
+        #region 保存服务状态
+        /// <summary>
+        /// 保存服务状态
+        /// </summary>
+        /// <param name="model">修改服务状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("SaveServiceStatus")]
+        public async Task<DataResult> SaveServiceStatus([FromBody] ModifyServiceProjectStatusDto model)
+        {
+            return await _serviceWorkFlowManageService.SaveServiceStatus(model);
+        }
+        #endregion
+
+        #region 取消服务状态
+        /// <summary>
+        /// 取消服务状态
+        /// </summary>
+        /// <param name="model">修改服务状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("CancelServiceStatus")]
+        public async Task<DataResult> CancelServiceStatus([FromBody] ModifyServiceProjectStatusDto model)
+        {
+            return await _serviceWorkFlowManageService.CancelServiceStatus(model);
+        }
+        #endregion
+
+        #region 批量检索服务项目下的状态列表
+        /// <summary>
+        /// 批量检索服务项目下的状态列表
+        /// </summary>
+        /// <param name="model">批量查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableStatusListByBusinessBatch")]
+        public async Task<DataResult<List<ServiceProjectStatusDto>>> GetEnableStatusListByBusinessBatch([FromBody] QueryServiceProjectWithStatusBatch model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableStatusListByBusinessBatch(model);
+        }
+        #endregion
+
+        #region 检索已选中并且可用的服务项目列表(标准)
+        /// <summary>
+        /// 检索已选中并且可用的服务项目列表(标准)
+        /// </summary>
+        /// <param name="model">查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableProjectListCommon")]
+        public async Task<DataResult<List<ServiceProjectWithStatusDto>>> GetEnableProjectListCommon([FromBody] EmbedQueryServiceProjectWithStatus model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableProjectListCommon(model);
+        }
+        #endregion
+
+        #region 单票检索服务项目下的状态列表(标准)
+        /// <summary>
+        /// 单票检索服务项目下的状态列表(标准)
+        /// </summary>
+        /// <param name="model">查询服务项目和状态详情</param>
+        /// <returns>返回回执</returns>
+        [HttpPost("GetEnableStatusListByBusinessCommon")]
+        public async Task<DataResult<List<ServiceProjectStatusDto>>> GetEnableStatusListByBusinessCommon([FromBody] EmbedQueryServiceProjectWithStatus model)
+        {
+            return await _serviceWorkFlowManageService.GetEnableStatusListByBusinessCommon(model);
+        }
+        #endregion
+    }
+}