ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heshaofeng
2025-12-29 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs


@@ -43,12 +43,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,11 +63,16 @@


            _outboundOrderDetailService = outboundOrderDetailService;


            _taskRepository = taskRepository;


            _task_HtyService = task_HtyService;


            _materialInfoRepository = materialInfoRepository;


        }




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


        public async Task<WebResponseContent> Test()


        {       


        {




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


            //var SDDD= "WSLOT" + DateTime.Now.ToString("yyyyMMdd") + seq.ToString()?.PadLeft(5, '0');




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




            //var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);


@@ -90,7 +96,7 @@


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


            //erpApiService.GetSuppliersAsync();




           // erpApiService.GetMaterialUnitAsync();


            // erpApiService.GetMaterialUnitAsync();




            //var sss = await _invokeMESService.NewMaterielToMes(new WIDESEA_DTO.Basic.MaterielToMesDTO


            //{


@@ -143,7 +149,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)


@@ -152,6 +158,7 @@


                            {


                                lineNo = detailitem.lineNo,


                                MaterielCode = detailitem.materialCode,


                                MaterielName = materialName,


                                SupplyCode = detailitem.supplyCode,


                                BatchNo = detailitem.batchNo,


                                Unit = detailitem.unit,


@@ -180,6 +187,7 @@


                            OrderQuantity = detailitem.qty,


                            BarcodeUnit = detailitem.unit,


                            BarcodeQty = detailitem.qty,


                            MaterielName = materialName


                        };


                        dt_InboundOrder.Details.Add(inboundOrderDetail);


                    }


@@ -213,6 +221,12 @@




        }




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


        public WebResponseContent UnPalletGroupBarcode(string orderNo)


        {


            return Service.UnPalletGroupBarcode(orderNo);


        }




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


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


        {