ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
647556386
9 天以前 70aa9b5ca249a84e5867912d551cdafbec76e54e 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs


@@ -1,21 +1,30 @@


using Autofac.Core;


using MailKit.Search;


using Microsoft.AspNetCore.Authorization;


using Microsoft.AspNetCore.Http;


using Microsoft.AspNetCore.Mvc;


using Newtonsoft.Json;


using SqlSugar;


using System.Net;


using System.Threading.Tasks;


using WIDESEA_BasicService;


using WIDESEA_Common.OrderEnum;


using WIDESEA_Common.StockEnum;


using WIDESEA_Core;


using WIDESEA_Core.Attributes;


using WIDESEA_Core.BaseController;


using WIDESEA_Core.BaseRepository;


using WIDESEA_Core.Enums;


using WIDESEA_DTO.Allocate;


using WIDESEA_DTO.Inbound;


using WIDESEA_DTO.Mes;


using WIDESEA_IBasicService;


using WIDESEA_IInboundService;


using WIDESEA_InboundService;


using WIDESEA_IOutboundService;


using WIDESEA_ITaskInfoService;


using WIDESEA_Model.Models;


using WIDESEA_OutboundService;




namespace WIDESEA_WMSServer.Controllers.Inbound


{


@@ -29,22 +38,57 @@


        private readonly WIDESEA_IBasicService.IErpApiService erpApiService;




        private readonly WIDESEA_IBasicService.IInvokeMESService _invokeMESService;




        public readonly IInboundService _inboundService;


        private readonly IESSApiService _eSSApiService;




        private readonly ILocationInfoService _locationInfoService;


        private readonly IDailySequenceService _dailySequenceService;


        public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService, IDailySequenceService dailySequenceService) : base(service)


        private readonly IMaterialUnitService _materialUnitService;


        private readonly IOutStockLockInfoService _outStockLockInfoService;


        private readonly IOutboundOrderDetailService _outboundOrderDetailService;


        private readonly IRepository<Dt_Task> _taskRepository;


        private readonly ITask_HtyService _task_HtyService;


        private readonly ILogger<InboundOrderController> _logger;


        public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService, IDailySequenceService dailySequenceService, ILocationInfoService locationInfoService, ILogger<InboundOrderController> logger, IMaterialUnitService materialUnitService, IInboundService inboundService, IOutStockLockInfoService outStockLockInfoService, IOutboundOrderDetailService outboundOrderDetailService, IRepository<Dt_Task> taskRepository, ITask_HtyService task_HtyService) : base(service)


        {


            this.erpApiService = erpApiService;


            _invokeMESService = invokeMESService;


            _eSSApiService = eSSApiService;


            _dailySequenceService = dailySequenceService;


            _locationInfoService = locationInfoService;


            _logger = logger;


            _materialUnitService = materialUnitService;


            _inboundService = inboundService;


            _outStockLockInfoService = outStockLockInfoService;


            _outboundOrderDetailService = outboundOrderDetailService;


            _taskRepository = taskRepository;


            _task_HtyService = task_HtyService;


        }




        [HttpPost, Route("Test"), AllowAnonymous, MethodParamsValidate]


        public async Task<WebResponseContent> Test()


        {


            await _dailySequenceService.GetNextSequenceAsync();




            var originalTask = _taskRepository.Db.Queryable<Dt_Task>().First();




            var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.人工删除);


            if (result)


            {


                var sddd = "trueee";


            }


            //var originalTask = _taskRepository.Db.Queryable<Dt_Task>().First();


            //_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


            // Service.Db.Deleteable<Dt_InboundOrder>().Where(x=>x.UpperOrderNo== "12020251100040").ExecuteCommand();


            //_inboundService.InboundOrderDetailService.Db.Deleteable<Dt_InboundOrderDetail>()


            // .Where(p => SqlFunc.Subqueryable<Dt_InboundOrder>().Where(s => s.Id == p.OrderId && s.UpperOrderNo == "12020251100040").Any()).ExecuteCommand();




            //var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync("100513-00303", 1);




            //var pdddurchaseToStockResult = await _materialUnitService.ConvertFromToStockAsync("100513-00303", "W013", 1);




            //var sddd = _locationInfoService.AssignLocation(1);


            //var code = sddd.LocationCode;


            //var ssss=await _dailySequenceService.GetNextSequenceAsync();


            //var  ddddssss = "WSLOT" + DateTime.Now.ToString("yyyyMMddHHmmss") + ssss.ToString().PadLeft(5, '0');


            //erpApiService.GetSuppliersAsync();




            //erpApiService.GetMaterialUnitAsync();


@@ -64,13 +108,18 @@


            //      qty = "20.0",


            //  });




            await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest


            {


                slotCode = "3-5",


                containerCode = "A000008006"


            });


            //  erpApiService.GetMaterialInfoAsy2nc(new WIDESEA_DTO.Basic.MaterialRequest());


            return WebResponseContent.Instance.OK();


            //await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest


            //{


            //    slotCode = "3-5",


            //    containerCode = "A000008009"


            //});




            //await erpApiService.GetSuppliersAsync();


            //await erpApiService.GetMaterialUnitAsync();


            //await  erpApiService.GetMaterialInfoAsync(new WIDESEA_DTO.Basic.MaterialRequest());






            return WebResponseContent.Instance.OK(result?1:0 );


        }




        /// <summary>


@@ -79,10 +128,14 @@


        /// <param name="model"></param>


        /// <returns></returns>


        [HttpPost, Route("ReceiveInboundOrder"), AllowAnonymous, MethodParamsValidate]


        public WebResponseContent ReceiveInboundOrder([FromBody] InboundRequestModel model)


        public async Task<WebResponseContent> ReceiveInboundOrder([FromBody] InboundRequestModel model)


        {


            if (model.inBounds == null || !model.inBounds.Any())


            {


                return WebResponseContent.Instance.Error("入库单不能为空");


            }






            _logger.LogInformation("InboundOrderController ReceiveInboundOrder:  " + JsonConvert.SerializeObject(model));


            List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();




            foreach (var item in model.inBounds)


@@ -124,7 +177,9 @@


                            BatchNo = detailitem.batchNo,


                            Unit = detailitem.unit,


                            WarehouseCode = detailitem.warehouseCode,


                            OrderQuantity = detailitem.qty


                            OrderQuantity = detailitem.qty,


                            BarcodeUnit = detailitem.unit,


                            BarcodeQty = detailitem.qty,


                        };


                        dt_InboundOrder.Details.Add(inboundOrderDetail);


                    }


@@ -138,7 +193,7 @@


                inboundOrders.Add(dt_InboundOrder);


            }




            var content = Service.ReceiveInboundOrder(inboundOrders, model.operationType);


            var content = await Service.ReceiveInboundOrder(inboundOrders, model.operationType);




            if (content.Status) return WebResponseContent.Instance.OK(200);


            else return WebResponseContent.Instance.Error(content.Message);


@@ -157,6 +212,12 @@


            return content;




        }




        [HttpPost, Route("UndoPalletGroup"), AllowAnonymous, MethodParamsValidate]


        public WebResponseContent UndoPalletGroup(string palletCode)


        {


            return Service.UndoPalletGroup(palletCode);


        }


        /// <summary>


        /// 


        /// </summary>


@@ -171,5 +232,17 @@




        }




        [HttpPost, Route("UnPalletQuantity"), AllowAnonymous, MethodParamsValidate]


        public WebResponseContent UnPalletQuantity(string orderNo)


        {


            return Service.UnPalletQuantity(orderNo);


        }




        [HttpPost, Route("BatchOrderFeedbackToMes"), AllowAnonymous]


        public async Task<WebResponseContent> BatchOrderFeedbackToMes([FromBody] BatchOrderFeedbackToMesDto request)


        {


            return await _invokeMESService.BatchOrderFeedbackToMes(request.orderNos, request.inout);


        }




    }


}