明和堆垛机立库与二楼平库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
1
huangxiaoqiang
9 天以前 644cbe3e4eba765affa25454d69fee6286bb6094 
 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs


@@ -11,6 +11,7 @@


using WIDESEA_DTO.Order;


using WIDESEA_DTO.Stock;


using WIDESEA_DTO.WMS;


using WIDESEA_IBusinessesRepository;


using WIDESEA_IOrderRepository;


using WIDESEA_IOrderServices;


using WIDESEA_IStorageBasicRepository;


@@ -18,6 +19,7 @@


using WIDESEA_IStorageTaskRepository;


using WIDESEA_IStorageTaskServices;


using WIDESEA_Model.Models;


using WIDESEA_Model.Models.ERP;


using WIDESEA_Model.Models.Order;


using WIDESEA_OrderRepository;


using WIDESEA_StorageTaskRepository;


@@ -36,6 +38,8 @@


        private readonly ILocationInfoRepository _locationRepository;


        private readonly IDt_TaskRepository _taskRepository;


        private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;


        private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;


        private readonly IDt_AreaInfoRepository _areaInfoRepository;




        public Dt_AllocateOutboundOrderService(IDt_AllocateOutboundOrderRepository BaseDal,


                                        IUnitOfWorkManage unitOfWorkManage,


@@ -46,7 +50,9 @@


                                        IDt_TaskService taskService,


                                        ILocationInfoRepository locationRepository,


                                        IDt_TaskRepository taskRepository,


                                        ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)


                                        ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,


                                        IDt_OrderOutDetailsRepository outDetailsRepository,


                                        IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)


        {


            _unitOfWorkManage = unitOfWorkManage;


            _allocateoutboundOrderDetailRepository = allocateoutboundOrderDetailRepository;


@@ -57,8 +63,9 @@


            _locationRepository = locationRepository;


            _taskRepository = taskRepository;


            _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;


            _outDetailsRepository = outDetailsRepository;


            _areaInfoRepository = areaInfoRepository;


        }




        public WebResponseContent GetAllocateOutboundOrder(OutboundOrderGetDTO outboundOrderGetDTO)


        {


            WebResponseContent content = new WebResponseContent();


@@ -146,6 +153,11 @@


            {


                foreach (var orderId in requestOut.orderIds)


                {


                    Dt_AreaInfo areaInfo = null;


                    if (requestOut.AreaId != null)


                        areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(requestOut.AreaId));






                    List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();


                    Dt_AllocateOutboundOrderDetail allocateoutboundOrderdetail = _allocateoutboundOrderDetailRepository.QueryFirst(x => x.Id == orderId);


                    Dt_AllocateOutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.Id == allocateoutboundOrderdetail.OrderId);


@@ -159,9 +171,9 @@




                        if (result.Item1.Count <= 0)


                        {


                            return content.Error("未找到库存分配，请确认是否存在库存或单据数量已出完");


                            return content.Error($"订单{outboundOrder.UpperOrderNo}物料编码{allocateoutboundOrderdetail.MaterielCode}未找到库存分配，请确认是否存在库存或单据数量已出完");


                        }




                        List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();


                        result.Item1.Distinct().ForEach(item =>


                        {


                            RequestTaskDto task = new RequestTaskDto


@@ -176,6 +188,22 @@


                            taskDtos.Add(task);


                            item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.出库锁定;


                            item.StockStatus = (int)StockStateEmun.出库锁定;


                            item.Remark = requestOut.Warehouse;


                            item.OrderNo = outboundOrder.UpperOrderNo;


                            outDetails.Add(new Dt_OrderOutDetails()


                            {


                                OrderNo = outboundOrder.UpperOrderNo,


                                PalletCode = item.PalletCode,


                                OrderType = outboundOrder.OrderType,


                                ERPOrderId = allocateoutboundOrderdetail.ERPOrderId,


                                MaterielCode = allocateoutboundOrderdetail.MaterielCode,


                                MaterielName = allocateoutboundOrderdetail.MaterielName,


                                AllocateWarehouse = areaInfo == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().Warehouse : areaInfo.AreaName,


                                AllocateWarehouseId = areaInfo == null ? item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).FirstOrDefault().WareHouseId : areaInfo.AreaCode,


                                Warehouse = "智能立库",


                                WareHouseId = "107",


                                OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).Sum(x => x.Quantity),


                            });


                        });


                        List<Dt_Task> taskNews = new List<Dt_Task>();


                        List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();


@@ -204,6 +232,7 @@


                            await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);


                            await _locationRepository.UpdateDataAsync(locations);


                            _allocateoutboundOrderDetailRepository.UpdateData(result.Item2);


                            _outDetailsRepository.AddData(outDetails);


                        });


                        content = await _taskService.SendWCSTask(taskDTOs);


                    }