1

huangxiaoqiang

2 天以前 5a15fa73d5f6a39917013871a65eb11a8c013391

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs

@@ -154,8 +154,8 @@
                foreach (var orderId in requestOut.orderIds)
                {
                    Dt_AreaInfo areaInfo = null;
                    if (requestOut.AreaId != null)
                        areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(requestOut.AreaId));
                    if (requestOut.Warehouse != "")
                        areaInfo = _areaInfoRepository.QueryFirst(x => x.AreaCode == requestOut.Warehouse);


                    List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
@@ -183,26 +183,30 @@
                                MaterielCode = allocateoutboundOrderdetail.MaterielCode,
                                Position = item.LocationCode,
                                PalletCode = item.PalletCode,
                                AreaId = Convert.ToInt32(requestOut.AreaId),
                                //AreaId = Convert.ToInt32(requestOut.AreaId),
                                AreaId = Convert.ToInt32(2),
                            };
                            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()

                            item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).ForEach(x =>
                            {
                                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),
                                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 = x.OutboundQuantity,
                                });
                            });
                        });
                        List<Dt_Task> taskNews = new List<Dt_Task>();
@@ -210,10 +214,13 @@
                        foreach (var item in taskDtos)
                        {
                            taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));

                        }
                        List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
                        List<DtLocationInfo> locations = new List<DtLocationInfo>();
                        if(taskNews.Count <= 0)
                        {
                            throw new Exception($"{allocateoutboundOrderdetail.MaterielCode}未找到可出库托盘");
                        }
                        foreach (var item in taskNews)
                        {
                            taskDTOs.Add(CreateTaskDTO(item));
@@ -224,9 +231,10 @@
                            locations.AddRange(result1.Item2);
                            locations.AddRange(result2.Item2);
                        }

                        outboundOrder.OrderStatus = (int)OrderStateEmun.开始;
                        await _unitOfWorkManage.UseTranAsync(async () =>
                        {
                            BaseDal.UpdateData(outboundOrder);
                            _taskRepository.AddData(taskNews);
                            _stockInfoRepository.UpdateDataNav(result.Item1);
                            await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
@@ -316,11 +324,16 @@

            }
            allocateoutboundOrderdetail.OverOutQuantity = allocateoutboundOrderdetail.OrderQuantity - needQuantity;
            allocateoutboundOrderdetail.NotOutQuantity = allocateoutboundOrderdetail.OrderQuantity - allocateoutboundOrderdetail.OverOutQuantity;

            if (allocateoutboundOrderdetail.OverOutQuantity != 0)
            {
                allocateoutboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.开始;
            }
            if (allocateoutboundOrderdetail.OverOutQuantity == allocateoutboundOrderdetail.OrderQuantity)
            {
                allocateoutboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.已完成;
            }
            return (outStockNews, allocateoutboundOrderdetail);
        }