Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-19 79edcd87697f5cce97e461443fac1e4e655f6dae

 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs

@@ -1,13 +1,11 @@
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CmsQueryExtensions;
using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Controller
{
@@ -20,10 +18,12 @@
    public class LMesOperateController : ControllerBase
    {
        private readonly ILMesOperateAppService _mesOperateAppService;
        private readonly IWmsMaterialStockAppService _wmsmaterialstockAppService;

        public LMesOperateController(ILMesOperateAppService mesOperateAppService)
        public LMesOperateController(ILMesOperateAppService mesOperateAppService, IWmsMaterialStockAppService wmsmaterialstockAppService)
        {
            _mesOperateAppService = mesOperateAppService;
            _wmsmaterialstockAppService = wmsmaterialstockAppService;
        }

        /// <summary>
@@ -37,6 +37,7 @@
        {
            try
            {

                var list = await _mesOperateAppService.LMesCallMaterialAsync(input);
                return new CmsApiResponse<List<CallMaterialOutput>>()
                {
@@ -44,6 +45,17 @@
                    Code = 200,
                    Message = "LMes叫料成功"
                };
                //*/
                /*
               //模拟返回数据
               List<CallMaterialOutput> list = new List<CallMaterialOutput>();
               return new CmsApiResponse<List<CallMaterialOutput>>()
               {
                   Data = list,
                   Code = 200,
                   Message = "LMes叫料成功"
               };
               //*/
            }
            catch (Exception ex)
            {
@@ -57,5 +69,119 @@
            }

        }





        /// <summary>
        /// LMes组盘
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("LMesPick")]
        public async Task<CmsApiResponse<WmsMaterialStockDto>> LMesPickAsync([FromBody] WmsMaterialStockCreateDto input)
        {
            try
            {
                var list = await _wmsmaterialstockAppService.CreateAsync(input);
                return new CmsApiResponse<WmsMaterialStockDto>()
                {
                    Data = list,
                    Code = 200,
                    Message = "LMes组盘成功"
                };
            }
            catch (Exception ex)
            {
                //throw; //不要抛出异常，否则对方会接收失败呢
                return new CmsApiResponse<WmsMaterialStockDto>()
                {
                    Data = null,
                    Code = 500,
                    Message = ex.Message
                };
            }

        }

        /// <summary>  
        /// 根据条件获取出入库单据详情 
        /// </summary>  
        /// <param name="input">查询参数</param>  
        /// <returns></returns>  
        [HttpPost]
        [Route("FindListByFilter")]
        public virtual async Task<CmsApiResponse<List<WmsMaterialStockDto>>> FindListByFilterAsync([FromBody] GetWmsMaterialStockInput input)
        {
            try
            {
                var list = await _wmsmaterialstockAppService.FindListByFilterAsync(input);
                return new CmsApiResponse<List<WmsMaterialStockDto>>()
                {
                    Data = list,
                    Code = 200,
                    Message = ""
                };

                /*
                //模拟返回数据
                List<WmsMaterialStockDto> list = new List<WmsMaterialStockDto>();
                list.Add(new WmsMaterialStockDto<List<WmsMaterialStockDto>>()
                {
                    ContainerNo = "TP202",
                    PlaceNo = "FJKW01"
                });
                return new CmsApiResponse<List<WmsMaterialStockDto>>()
                {
                    Data = list,
                    Code = 200,
                    Message = ""
                };
                //*/
            }
            catch (Exception ex)
            {
                //throw; //不要抛出异常，否则对方会接收失败呢
                return new CmsApiResponse<List<WmsMaterialStockDto>>()
                {
                    Data = null,
                    Code = 500,
                    Message = ex.Message
                };
            }
        }
        /// <summary>  
        /// 根据条件获取单个出入库单据详情 
        /// </summary>  
        /// <param name="input">查询参数</param>  
        /// <returns></returns>  
        [HttpPost]
        [Route("FindSingleByFilter")]
        public virtual async Task<CmsApiResponse<WmsMaterialStockDto>> FindSingleByFilterAsync([FromBody] GetWmsMaterialStockInput input)
        {

            try
            {
                var list = await _wmsmaterialstockAppService.FindSingleByFilterAsync(input);
                return new CmsApiResponse<WmsMaterialStockDto>()
                {
                    Data = list,
                    Code = 200,
                    Message = ""
                };
            }
            catch (Exception ex)
            {
                //throw; //不要抛出异常，否则对方会接收失败呢
                return new CmsApiResponse<WmsMaterialStockDto>()
                {
                    Data = null,
                    Code = 500,
                    Message = ex.Message
                };
            }
        }
    }
}