优化空托出入库逻辑

dengjunjie

2025-04-19 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs

@@ -1,8 +1,10 @@
using System;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -18,29 +20,42 @@
        public OutStockLockInfoService(IOutStockLockInfoRepository BaseDal) : base(BaseDal)
        {
        }

        /// <summary>
        /// æ·»åŠ å‡ºåº“详情
        /// </summary>
        /// <param name="outboundOrder"></param>
        /// <param name="outboundOrderDetail"></param>
        /// <param name="outStocks"></param>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, List<Dt_StockInfo> outStocks, int? taskNum = null)
        {
            List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();

            var OutStockLockInfos = GetByOrderDetailId(outboundOrderDetail.Id);
            foreach (var item in outStocks)
            {
                Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
                Dt_OutStockLockInfo outStockLockInfo = OutStockLockInfos.FirstOrDefault(x => x.StockId == item.Id && x.OrderDetailId == outboundOrderDetail.Id);
                if (outStockLockInfo == null)
                {
                    PalletCode = item.PalletCode,
                    AssignQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
                    MaterielCode = outboundOrderDetail.MaterielCode,
                    BatchNo = outboundOrderDetail.BatchNo,
                    LocationCode = item.LocationCode,
                    MaterielName = outboundOrderDetail.MaterielName,
                    OrderDetailId = outboundOrderDetail.Id,
                    OrderNo = outboundOrder.OrderNo,
                    OrderType = outboundOrder.OrderType,
                    OriginalQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
                    Status = taskNum == null ? OutStockStatus.已分配.ObjToInt() : OutStockStatus.出库中.ObjToInt(),
                    StockId = item.Id,
                    TaskNum = taskNum
                };
                    outStockLockInfo = new Dt_OutStockLockInfo()
                    {
                        PalletCode = item.PalletCode,
                        AssignQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
                        MaterielCode = outboundOrderDetail.MaterielCode,
                        BatchNo = item.Details.Select(x => x.BatchNo).FirstOrDefault(),
                        //BatchNo = outboundOrderDetail.BatchNo,
                        LocationCode = item.LocationCode,
                        MaterielName = outboundOrderDetail.MaterielName,
                        OrderDetailId = outboundOrderDetail.Id,
                        OrderNo = outboundOrder.OrderNo,
                        OrderType = outboundOrder.OrderType,
                        OriginalQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
                        //Status = taskNum == null ? OutStockStatus.已分配.ObjToInt() : OutStockStatus.出库中.ObjToInt(),
                        StockId = item.Id,
                        TaskNum = taskNum
                    };
                }
                outStockLockInfo.Status = taskNum == null ? OutStockStatus.已分配.ObjToInt() : OutStockStatus.出库中.ObjToInt();
                outStockLockInfos.Add(outStockLockInfo);
            }

@@ -60,5 +75,32 @@
        {
            return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && x.Status == outStockStatus.ObjToInt());
        }

        public List<Dt_OutStockLockInfo> GetOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail item, List<Dt_StockInfo> dt_StockInfos, int? taskNum = null, string BatchNo = null)
        {
            List<Dt_OutStockLockInfo> OutStockLockInfos = new List<Dt_OutStockLockInfo>();
            foreach (var dt in dt_StockInfos)
            {
                Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
                {
                    PalletCode = dt.PalletCode,
                    AssignQuantity = 1,
                    MaterielCode = item.MaterielCode,
                    BatchNo = BatchNo,
                    LocationCode = dt.LocationCode,
                    MaterielName = item.MaterielName,
                    OrderDetailId = item.Id,
                    OrderNo = outboundOrder.OrderNo,
                    OrderType = outboundOrder.OrderType,
                    OriginalQuantity = 1,
                    Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt(),
                    StockId = dt.Id,
                    TaskNum = taskNum,
                    OrderQuantity = item.OrderQuantity
                };
                OutStockLockInfos.Add(outStockLockInfo);
            }
            return OutStockLockInfos;
        }
    }
}