1

huangxiaoqiang

10 小时以前 a296223898d61a9838bbd35ed75c87575e308a36

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

@@ -172,7 +172,8 @@
                                MaterielCode = outboundOrderdetail.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 == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.出库锁定;
@@ -193,45 +194,6 @@
                                    OutboundQuantity = x.OutboundQuantity,
                                });
                            });

                            item.StockInfoDetails.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
                            {
                                if(x.MaterielCode == outboundOrderdetail.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>();
                        List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
@@ -245,6 +207,8 @@
                        {
                            throw new Exception($"{outboundOrderdetail.MaterielCode}未找到可出库托盘");
                        }
                        //List<DtStockInfo> stockNew = new List<DtStockInfo>();
                        //List<Dt_OrderOutDetails> outDetailsNew = new List<Dt_OrderOutDetails>();
                        foreach (var item in taskNews)
                        {
                            taskDTOs.Add(CreateTaskDTO(item));
@@ -255,13 +219,14 @@
                            locations.AddRange(result1.Item2);
                            locations.AddRange(result2.Item2);
                        }

                        outboundOrder.OrderStatus = (int)OrderStateEmun.开始;
                        await _unitOfWorkManage.UseTranAsync(async () =>
                        {
                            _taskRepository.AddData(taskNews);
                            _stockInfoRepository.UpdateDataNav(result.Item1);
                            await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
                            await _locationRepository.UpdateDataAsync(locations);
                            BaseDal.UpdateData(outboundOrder);
                            _productionoutboundOrderDetailRepository.UpdateData(result.Item2);
                            _outDetailsRepository.AddData(outDetails);
                        });
@@ -346,11 +311,16 @@

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

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