ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs
@@ -1,4 +1,4 @@

using System;
using System.Collections.Generic;
using System.Linq;
@@ -706,7 +706,7 @@
                }
                content.Message = result.Item6;
                //处理出库数据
                return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos);
                return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos, result.Item6);
            }
            catch (Exception ex)
            {
@@ -743,6 +743,14 @@
            //分配库存
            (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>,string) result = _outboundService.OutSGOrderDetailService.AssignStockOutbound(outSGOrderDetails);
            //保存缺料状态,无论是否生成了任务
            var shortageDetails = result.Item2.Where(x => x.OutSGOrderDetailStatus == OutOrderStatusEnum.缺料.ObjToInt()).ToList();
            if (shortageDetails.Any())
            {
                _outboundRepository.OutSGOrderDetailRepository.UpdateData(shortageDetails);
            }
            if (result.Item1 != null && result.Item1.Count > 0)
            {
                //获取任务
@@ -773,7 +781,8 @@
            }
            else
            {
                throw new Exception("无库存");
                //没有库存,但已经在AssignStockOutbound方法中标记了缺料状态,并且已经保存
                orderDetails = result.Item2;
            }
            return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, result.Item5);
@@ -782,7 +791,7 @@
        /// å¤„理出库数据
        /// </summary>
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutSGOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
        public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutSGOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null, string message = "")
        {
            try
            {
@@ -822,7 +831,7 @@
                }
                _unitOfWorkManage.CommitTran();
                PushTasksToWCS(tasks);
                return WebResponseContent.Instance.OK();
                return WebResponseContent.Instance.OK(message);
            }
            catch (Exception ex)
            {