ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
647556386
3 天以前 696edbff3c8812e4b820f624d66a02ae6ddb1a06 
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs


@@ -5,6 +5,7 @@


using Microsoft.AspNetCore.Mvc;


using Newtonsoft.Json;


using SqlSugar;


using SqlSugar.Extensions;


using System.Net;


using System.Threading.Tasks;


using WIDESEA_BasicService;


@@ -43,12 +44,13 @@


        private readonly ILocationInfoService _locationInfoService;


        private readonly IDailySequenceService _dailySequenceService;


        private readonly IMaterialUnitService _materialUnitService;


        private readonly IRepository<Dt_MaterielInfo> _materialInfoRepository;


        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)


        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, IRepository<Dt_MaterielInfo> materialInfoRepository) : base(service)


        {


            this.erpApiService = erpApiService;


            _invokeMESService = invokeMESService;


@@ -62,6 +64,7 @@


            _outboundOrderDetailService = outboundOrderDetailService;


            _taskRepository = taskRepository;


            _task_HtyService = task_HtyService;


            _materialInfoRepository = materialInfoRepository;


        }




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


@@ -147,7 +150,7 @@


                Dt_InboundOrder dt_InboundOrder = new Dt_InboundOrder() { Details = new List<Dt_InboundOrderDetail>() };


                foreach (var detailitem in item.details)


                {




                    var materialName = _materialInfoRepository.QueryFirst(x => x.MaterielCode == detailitem.materialCode).MaterielName;


                    if (detailitem.barcodes != null && detailitem.barcodes.Any())


                    {


                        foreach (var barcode in detailitem.barcodes)


@@ -156,6 +159,7 @@


                            {


                                lineNo = detailitem.lineNo,


                                MaterielCode = detailitem.materialCode,


                                MaterielName = materialName,


                                SupplyCode = detailitem.supplyCode,


                                BatchNo = detailitem.batchNo,


                                Unit = detailitem.unit,


@@ -164,7 +168,9 @@


                                OutBoxbarcodes = barcode.outBoxbarcodes,


                                BarcodeUnit = barcode.unit,


                                BarcodeQty = barcode.qty,


                                OrderQuantity = barcode.qty


                                OrderQuantity = barcode.qty,


                                Remark = detailitem.remark??"",


                                


                            };




                            dt_InboundOrder.Details.Add(inboundOrderDetail);


@@ -184,6 +190,8 @@


                            OrderQuantity = detailitem.qty,


                            BarcodeUnit = detailitem.unit,


                            BarcodeQty = detailitem.qty,


                            MaterielName = materialName,


                            Remark = detailitem.remark??""


                        };


                        dt_InboundOrder.Details.Add(inboundOrderDetail);


                    }


@@ -193,7 +201,8 @@


                dt_InboundOrder.BusinessType = item.business_type;


                dt_InboundOrder.IsBatch = item.isBatch;


                dt_InboundOrder.FactoryArea = item.factoryArea;




                dt_InboundOrder.CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt();


                dt_InboundOrder.IsTestMaterials = item.isTestMaterials;


                inboundOrders.Add(dt_InboundOrder);


            }




@@ -224,9 +233,9 @@


        }




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


        public WebResponseContent UndoPalletGroup(string palletCode,string barcode="")


        public WebResponseContent UndoPalletGroup(string code)


        {


            return Service.UndoPalletGroup(palletCode,barcode);


            return Service.UndoPalletGroup(code);


        }


        /// <summary>


        /// 


@@ -254,5 +263,17 @@


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


        }






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


        public WebResponseContent HandCloseOrder(List<string> orderIds)


        {


            return Service.HandCloseOrder(orderIds);


        }




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


        public WebResponseContent GetLocationType(string code)


        {


            return Service.GetLocationType(code);


        }


    }


}