优化

schangxiang@126.com

2025-05-19 ed231e8624dd3b5ad021ea02cb0818d9fdfc4eb1

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanPublicController.cs

@@ -1,44 +1,212 @@
//using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
//using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
//using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
//using Microsoft.AspNetCore.Mvc;
//using System.Reflection;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CMS.Plugin.PipeLineLems.Application.Implements;
using CmsQueryExtensions;
using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Reflection;

//namespace CMS.Plugin.PipeLineLems.Controller
//{
//    /// <summary>
//    /// 作业计划服务
//    /// </summary>
//    [ApiController]
//    [TypeFilter(typeof(CMSLanguageFilter))]
//    [TypeFilter(typeof(CMSUowActionFilter))]
//    [TypeFilter(typeof(CMSAuditActionFilter))]
//    [TypeFilter(typeof(CMSExceptionFilter))]
//    [Route("api/v{version:apiVersion}/PipeLineLems/[controller]")]
//    public class WorkPlanPublicController : ControllerBase
//    {
namespace CMS.Plugin.PipeLineLems.Controller
{
    /// <summary>
    /// 作业计划服务
    /// </summary>
    [ApiController]
    [TypeFilter(typeof(CMSLanguageFilter))]
    [TypeFilter(typeof(CMSUowActionFilter))]
    [TypeFilter(typeof(CMSAuditActionFilter))]
    [TypeFilter(typeof(CMSExceptionFilter))]
    [Route("api/v{version:apiVersion}/PipeLineLems/[controller]")]
    public class WorkPlanPublicController : ControllerBase
    {
        private readonly IWorkPlanAppService _workPlanAppService;
        private readonly IMesAppService _mesAppService;
        private readonly ICurrentUser _currentUser;
        private readonly Application.Implements.SharedService sharedService;
        private IServiceProvider _serviceProvider;

//        private readonly IMesAppService _mesAppService;
//        /// <summary>
//        /// Initializes a new instance of the <see cref="TestEntityNameController"/> class.
//        /// </summary>
//        /// <param name="testentitynameAppService">The testentityname application service.</param>
//        public WorkPlanPublicController(IMesAppService mesAppService)
//        {
//            _mesAppService = mesAppService;
//        }
        /// <summary>
        /// Initializes a new instance of the <see cref="TestEntityNameController"/> class.
        /// </summary>
        /// <param name="testentitynameAppService">The testentityname application service.</param>
        public WorkPlanPublicController(IMesAppService mesAppService, ICurrentUser currentUser, Application.Implements.SharedService _sharedService,
            IServiceProvider serviceProvider, IWorkPlanAppService workPlanAppService)
        {
            _mesAppService = mesAppService;
            _currentUser = currentUser;
            sharedService = _sharedService;
            _serviceProvider = serviceProvider;
            _workPlanAppService = workPlanAppService;
        }

//        /// <summary>
//        /// 获取生产计划.
//        /// </summary>
//        /// <param name="input">标识符.</param>
//        /// <returns></returns>
//        [HttpPost]
//        public virtual async Task<MesOrderResponse> GetWorkPlanAsync([FromBody] List<WorkPlanInput> input)
//        {
//            return await _mesAppService.CreateAsync(input);
//        }
        /// <summary>
        /// 获取生产计划.
        /// </summary>
        /// <param name="input">标识符.</param>
        /// <returns></returns>
        [HttpPost]
        public virtual async Task<MesOrderResponse> GetWorkPlanAsync([FromBody] List<WorkPlanInput> input)
        {
            return await _mesAppService.CreateAsync(input, "", "");
        }

        /// <summary>
        /// 分拣
        /// </summary>
        /// <param name="input">标识符.</param>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("Pick")]
        public virtual async Task<MesOrderResponse> Pick([FromBody] PickInput input)
        {
            try
            {
                MyCurrentUser myCurrentUser = new MyCurrentUser()
                {
                    UserAccount = _currentUser.UserAccount,
                    UserId = _currentUser.UserId
                };
                return await sharedService.CommonPick(_serviceProvider, input, myCurrentUser);
            }
            catch (Exception ex)
            {
                return new MesOrderResponse()
                {
                    Code = "400",
                    Message = ex.Message
                };
            }
        }


//    }
//}
        /// <summary>
        /// 叫料
        /// </summary>
        /// <param name="input">标识符.</param>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("CallMaterial")]
        public virtual async Task<MesOrderResponse> CallMaterial([FromBody] CallMaterialByDataIdentifierInput input)
        {
            try
            {
                MyCurrentUser myCurrentUser = new MyCurrentUser()
                {
                    UserAccount = _currentUser.UserAccount,
                    UserId = _currentUser.UserId
                };
                return await sharedService.CallMaterial(input, _serviceProvider, myCurrentUser);
            }
            catch (Exception ex)
            {
                return new MesOrderResponse()
                {
                    Code = "400",
                    Message = ex.Message
                };
            }
        }

        /// <summary>
        /// 开工
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("StartProduction")]
        public virtual async Task<MesOrderResponse> StartProduction([FromBody] StartProductionInput input)
        {
            try
            {
                MyCurrentUser myCurrentUser = new MyCurrentUser()
                {
                    UserAccount = _currentUser.UserAccount,
                    UserId = _currentUser.UserId
                };
                return await sharedService.StartProduction(input, _serviceProvider, myCurrentUser);
            }
            catch (Exception ex)
            {
                return new MesOrderResponse()
                {
                    Code = "400",
                    Message = ex.Message
                };
            }
        }

        /// <summary>
        /// 完工
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("FinishProduction")]
        public virtual async Task<MesOrderResponse> FinishProduction([FromBody] CompleteAssemblyProcessInput input)
        {
            try
            {
                MyCurrentUser myCurrentUser = new MyCurrentUser()
                {
                    UserAccount = _currentUser.UserAccount,
                    UserId = _currentUser.UserId
                };
                return await sharedService.CompleteAssemblyProcess(_serviceProvider, input, myCurrentUser);
            }
            catch (Exception ex)
            {
                return new MesOrderResponse()
                {
                    Code = "400",
                    Message = ex.Message
                };
            }
        }


        /// <summary> 
        /// 分拣时获取生产计划和分配区域
        /// </summary> 
        /// <param name="input"></param> 
        /// <returns></returns> 
        [HttpPost]
        [Route("GetPickRet")]
        public virtual async Task<CmsApiResponse<PickOutput>> GetPickRetAsync([FromBody] GetWorkPlanInput input)
        {

            //WorkPlanDto workPlanDto = await _workPlanAppService.FindSingleByFilterAsync(input);
            ////这里要获取wms的库存，来分析 要放到哪个托盘里
            //return new PickOutput()
            //{
            //    WorkPlan = workPlanDto,
            //    PlaceNo = "",
            //    ContinerNo = ""
            //};
            try
            {
                MyCurrentUser myCurrentUser = new MyCurrentUser()
                {
                    UserAccount = _currentUser.UserAccount,
                    UserId = _currentUser.UserId
                };
                return await sharedService.GetPickRetAsync(input, _serviceProvider, myCurrentUser);
            }
            catch (Exception ex)
            {
                return new CmsApiResponse<PickOutput>()
                {
                    Code = 400,
                    Message = ex.Message
                };
            }

        }
    }
}