ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heshaofeng
6 天以前 094889f27d4bda5116747a2dcc57724a9d5e90d7 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs


@@ -1,4 +1,5 @@


using Microsoft.Extensions.Logging;


using MailKit.Search;


using Microsoft.Extensions.Logging;


using Newtonsoft.Json;


using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;


using System;


@@ -581,28 +582,33 @@


        {


            try


            {


                var allocorder = _allocateOrderRepository.Db.Queryable<Dt_AllocateOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.Id == orderDetailId)).First();


                //var allocorder = _allocateOrderDetailRepository.Db.Queryable<Dt_AllocateOrderDetail>()


                //               .LeftJoin<Dt_AllocateOrder>((detail, order) => detail.OrderId == order.Id)


                //               .Where((detail, order) => order.Id == orderDetailId)


                //               .Select((detail, order) => order)


                //               .First();


                if (allocorder == null)


                {


                    return WebResponseContent.Instance.Error("找不到单据");


                }


                var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == allocorder.OrderNo);


                //var allocorder = _allocateOrderRepository.Db.Queryable<Dt_AllocateOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.Id == orderDetailId)).First();


                ////var allocorder = _allocateOrderDetailRepository.Db.Queryable<Dt_AllocateOrderDetail>()


                ////               .LeftJoin<Dt_AllocateOrder>((detail, order) => detail.OrderId == order.Id)


                ////               .Where((detail, order) => order.Id == orderDetailId)


                ////               .Select((detail, order) => order)


                ////               .First();


                //if (allocorder == null)


                //{


                //    return WebResponseContent.Instance.Error("找不到单据");


                //}




                var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.Id == orderDetailId)).First();


 


                if (outboundOrder == null)


                {


                    return WebResponseContent.Instance.Error("找不到出库单据");


                }




                var orderdetail = outboundOrder.Details.Where(outItem => allocorder.Details.Any(allocItem => allocItem.MaterielCode == outItem.MaterielCode && allocItem.LineNo == outItem.lineNo


                 && allocItem.BarcodeQty == outItem.BarcodeQty && allocItem.WarehouseCode == outItem.WarehouseCode && allocItem.BarcodeUnit == outItem.BarcodeUnit)).First();


                if (orderdetail == null)


                if (outboundOrder.Details == null || !outboundOrder.Details.Any()) 


                {


                    return WebResponseContent.Instance.Error("找不到出库明细单据");


                }


                //var orderdetail = outboundOrder.Details.Where(outItem => allocorder.Details.Any(allocItem => allocItem.MaterielCode == outItem.MaterielCode && allocItem.LineNo == outItem.lineNo


                // && allocItem.BarcodeQty == outItem.BarcodeQty && allocItem.WarehouseCode == outItem.WarehouseCode && allocItem.BarcodeUnit == outItem.BarcodeUnit)).First();


                //if (orderdetail == null)


                //{


                //    return WebResponseContent.Instance.Error("找不到出库明细单据");


                //}




                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews, station);