1

huangxiaoqiang

7 天以前 4dfe8ece141f05a163cf7d290b6fe4c520d89909

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

@@ -178,29 +178,73 @@
                            item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.出库锁定;
                            item.StockStatus = (int)StockStateEmun.出库锁定;

                            outDetails.Add(new Dt_OrderOutDetails()
                            item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == outboundOrderdetail.MaterielCode).ForEach(x =>
                            {
                                OrderNo = outboundOrder.UpperOrderNo,
                                PalletCode = item.PalletCode,
                                OrderType = outboundOrder.OrderType,
                                ERPOrderId = outboundOrderdetail.ERPOrderId,
                                MaterielCode = outboundOrderdetail.MaterielCode,
                                MaterielName = outboundOrderdetail.MaterielName,
                                Warehouse = "智能立库",
                                WareHouseId = "107",
                                OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
                                outDetails.Add(new Dt_OrderOutDetails()
                                {
                                    OrderNo = outboundOrder.UpperOrderNo,
                                    PalletCode = item.PalletCode,
                                    OrderType = outboundOrder.OrderType,
                                    ERPOrderId = outboundOrderdetail.ERPOrderId,
                                    MaterielCode = outboundOrderdetail.MaterielCode,
                                    MaterielName = outboundOrderdetail.MaterielName,
                                    Warehouse = "智能立库",
                                    WareHouseId = "107",
                                    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>();
                        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($"{outboundOrderdetail.MaterielCode}未找到可出库托盘");
                        }
                        foreach (var item in taskNews)
                        {
                            taskDTOs.Add(CreateTaskDTO(item));
@@ -269,8 +313,7 @@

            foreach (var item in outStocks)
            {
                var stockDetail = item.StockInfoDetails
                .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
                var stockDetail = item.StockInfoDetails.Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
                if (needQuantity <= 0)
                {
                    continue;