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,12 +183,12 @@
                                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;

                            item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == allocateoutboundOrderdetail.MaterielCode).ForEach(x =>
@@ -205,46 +205,8 @@
                                    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),
                                    OutboundQuantity = x.OutboundQuantity,
                                });
                            });

                            item.StockInfoDetails.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
                            {
                                if (x.MaterielCode == allocateoutboundOrderdetail.MaterielCode)
                                {
                                    outDetails.Add(new Dt_OrderOutDetails()
                                    {
                                        OrderNo = "",
                                        PalletCode = item.PalletCode,
                                        OrderType = (int)OrderTypeEmun.调拨出库单,
                                        ERPOrderId = "",
                                        MaterielCode = x.MaterielCode,
                                        MaterielName = x.MaterielName,
                                        AllocateWarehouse = "WMS出库缓存区",
                                        Warehouse = "智能立库",
                                        WareHouseId = "107",
                                        AllocateWarehouseId = "205",
                                        OutboundQuantity = x.Quantity - x.OutboundQuantity,
                                    });
                                }
                                else
                                {
                                    outDetails.Add(new Dt_OrderOutDetails()
                                    {
                                        OrderNo = "",
                                        PalletCode = item.PalletCode,
                                        OrderType = (int)OrderTypeEmun.调拨出库单,
                                        ERPOrderId = "",
                                        MaterielCode = x.MaterielCode,
                                        MaterielName = x.MaterielName,
                                        AllocateWarehouse = "WMS出库缓存区",
                                        Warehouse = "智能立库",
                                        WareHouseId = "107",
                                        AllocateWarehouseId = "205",
                                        OutboundQuantity = x.Quantity,
                                    });
                                }
                            });
                        });
                        List<Dt_Task> taskNews = new List<Dt_Task>();
@@ -269,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);
@@ -361,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);
        }