wangxinhui
2025-11-18 b513ce3a4527e998da66c6f179a279472c7262a8
ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -65,7 +66,35 @@
            return outStockLockInfo;
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“详情
        /// ç”ŸæˆMES出库详情
        /// </summary>
        public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
        {
            Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
            {
                PalletCode = outStock.PalletCode,
                AssignQuantity = assignQuantity,
                MaterielCode = ouMESOrder.MaterialCode,
                BatchNo = ouMESOrder.MaterialLot,
                LocationCode = outStock.LocationCode,
                MaterielName = outStock.MaterielName,
                OrderDetailId = ouMESOrder.OutDetailId,
                OrderNo = ouMESOrder.OutMESOrderNo,
                MakeCode = ouMESOrder.MakeCode,
                MachineName=ouMESOrder.MakeArea.ToString(),
                MaterielId = outStock.MaterielId,
                OriginalQuantity = outStock.StockLength,
                Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt(),
                StockId = outStock.Id,
                TaskNum = taskNum,
                OrderQuantity = ouMESOrder.ReqQuantity,
                Unit = outStock.Unit
            };
            return outStockLockInfo;
        }
        /// <summary>
        /// ç”Ÿæˆç”Ÿç®¡å‡ºåº“详情
        /// </summary>
        public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutSGOrder outSGOrder, Dt_OutSGOrderDetail outSGOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
        {
@@ -73,20 +102,23 @@
            {
                PalletCode = outStock.PalletCode,
                AssignQuantity = assignQuantity,
                OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
                MaterielCode = outSGOrderDetail.MaterialNo,
                BatchNo = "",
                BatchNo = outSGOrderDetail.BoardFluteNo, //楞别批次
                LocationCode = outStock.LocationCode,
                MaterielName = outStock.MaterielName,
                OrderDetailId = outSGOrderDetail.Id,
                OrderNo = outSGOrder.OutSGOrderNo,
                OrderNo = outSGOrder.OrderId,
                MaterielId = outStock.MaterielId,
                OriginalQuantity = outStock.StockLength,
                Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt(),
                StockId = outStock.Id,
                TaskNum = taskNum,
                OrderQuantity = outSGOrderDetail.XqLen,
                MaterialWeight=outStock.MaterielWeight,
                MaterialWide=outStock.MaterielWide,
                Unit = outStock.Unit,
                MachineName=outSGOrderDetail.MachineName
                MachineName=outSGOrderDetail.MachineName,
            };
            return outStockLockInfo;