1

yangpeixing

2026-02-04 dccc001554c6c5376482df77f929c0d49b258844

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -154,13 +154,14 @@
            {
                Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
                (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = new();
                if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
                if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
                {
                   result = _outboundService.OutboundOrderDetailService.DWANDYSAssignStockOutbound(outboundOrderDetails);

                    result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                }
                else
                {
                   result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                    result = _outboundService.OutboundOrderDetailService.DWANDYSAssignStockOutbound(outboundOrderDetails);
                }
                if (result.Item1 != null && result.Item1.Count > 0)
                {
@@ -177,10 +178,26 @@
                    {
                        x.OrderNo = outboundOrder.OrderNo;
                    });
                    result.Item2.ForEach(x =>
                    if (dt_OutboundOrder.OutWareHouse.Contains("BC"))
                    {
                        x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                    });
                        result.Item2.ForEach(x =>
                        {
                            x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        });
                    }
                    else
                    {
               

                        result.Item2.ForEach(x =>
                        {
                            if (x.LockQuantity == x.OrderQuantity)
                            {
                                x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                            }
                        });
                    }

                    result.Item3.ForEach(x =>
                    {

@@ -280,7 +297,7 @@


        /// <summary>
        /// 立库出库指令上传，出库任务下发
        /// 出库单据下发
        /// </summary>
        /// <param name="orderAddDTO"></param>
        /// <returns></returns>
@@ -297,7 +314,7 @@
                }
                if (warehouse.WarehouseCode.Contains("CP"))
                {

                    
                    Dt_Production production1 = new Dt_Production();
                    OutboundOrderAddDTO orderAddDTO1 = new OutboundOrderAddDTO();
                    orderAddDTO1.OrderNo = orderAddDTO.No;
@@ -319,6 +336,16 @@
                    inboundOrder.CreateDate = DateTime.Now;
                    inboundOrder.CreateType = CreateType.UpperSystemPush.ObjToInt();
                    _unitOfWorkManage.BeginTran();

                    Dt_NewOutboundOrder dt_NewOutboundOrder = BaseDal.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == inboundOrder.OrderNo).Includes(x => x.Details).First();
                    if(dt_NewOutboundOrder != null)
                    {
                        if (dt_NewOutboundOrder.OrderStatus > 0)
                        {
                            return WebResponseContent.Instance.Error($"该出库单在进行中，无法更新该出库单");
                        }
                        Db.DeleteNav(dt_NewOutboundOrder).Include(x => x.Details).ExecuteCommand();
                    }
                    bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();

                    foreach (var item in orderAddDTO1.Details)
@@ -403,6 +430,7 @@
                                BatchNo = details.BatchNo,
                                MaterielCode = details.MaterielCode,
                                MaterielName = details.MaterielName,
                                MaterielType = details.MaterielType,
                                MaterieSpec = details.MaterieSpec,
                                OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                                OrderQuantity = details.OrderQuantity,
@@ -670,7 +698,7 @@
            }
        }
        /// <summary>
        /// 生成出库任务
        /// 生成‘任务
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
@@ -926,7 +954,7 @@
                foreach (int key in keys)
                {

                   (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
@@ -937,24 +965,27 @@
                    }
                    if (result.Item4 != null && result.Item4.Count > 0)
                    {
                        outStockLockInfos.AddRange(result.Item4); 
                        outStockLockInfos.AddRange(result.Item4);
                    }
                    if (result.Item5 != null && result.Item5.Count > 0)
                    {
                        if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
                        if (result.Item5.Any(x => x.RoadwayNo.Contains("DW")) || result.Item5.Any(x => x.RoadwayNo.Contains("YS")))
                        {
                            locationInfos.AddRange(result.Item5.Distinct());
                            locationInfos.AddRange(result.Item5.DistinctBy(x => x.LocationCode));

                        }
                        else
                        {
                            locationInfos.AddRange(result.Item5);

                        }

                    }
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks.AddRange(result.Item1);
                    }
                    if(locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
                    if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
                    {
                        break;
                    }