老厂排程单页面增加用纸顺序号和是否缺料

liulijun

2026-03-12 fe256a7afaa132910875d3dc73783d9ab2d7ace5

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

@@ -66,7 +66,7 @@
            return outStockLockInfo;
        }
        /// <summary>
        /// ç”ŸæˆMES出库详情
        /// ç”ŸæˆMES出库详情(原料)
        /// </summary>
        public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null)
        {
@@ -75,20 +75,51 @@
                PalletCode = outStock.PalletCode,
                AssignQuantity = assignQuantity,
                MaterielCode = ouMESOrder.MaterialCode,
                BatchNo = ouMESOrder.MaterialLot,
                BatchNo = outStock.BatchNo ?? "",
                LocationCode = outStock.LocationCode,
                MaterielName = outStock.MaterielName,
                OrderDetailId = ouMESOrder.OutDetailId,
                OrderNo = ouMESOrder.OutMESOrderNo,
                MakeCode = ouMESOrder.MakeCode,
                MachineName=ouMESOrder.MakeArea.ToString(),
                OrderType=OutOrderTypeEnum.OutMESPick.ObjToInt(),
                MaterielId = outStock.MaterielId,
                OriginalQuantity = outStock.StockLength,
                Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt(),
                StockId = outStock.Id,
                TaskNum = taskNum,
                OrderQuantity = ouMESOrder.ReqQuantity,
                Unit = outStock.Unit
                Unit = outStock.Unit,
                AssistUnit= ouMESOrder.AssistUnitCode
            };

            return outStockLockInfo;
        }
        /// <summary>
        /// ç”ŸæˆMES出库详情(成品)
        /// </summary>
        public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutMESOrder ouMESOrder, Dt_ProStockInfo outStock, decimal assignQuantity, int? taskNum = null)
        {
            Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
            {
                PalletCode = outStock.PalletCode,
                AssignQuantity = assignQuantity,
                MaterielCode = ouMESOrder.MaterialCode,
                BatchNo = outStock.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
                LocationCode = outStock.LocationCode,
                MaterielName = outStock.proStockInfoDetails.FirstOrDefault()?.ProductName,
                OrderDetailId = ouMESOrder.OutDetailId,
                OrderNo = ouMESOrder.OutMESOrderNo,
                MakeCode = ouMESOrder.MakeCode,
                MachineName = ouMESOrder.MakeArea.ToString(),
                OrderType = OutOrderTypeEnum.OutMESPick.ObjToInt(),
                OriginalQuantity = outStock.proStockInfoDetails.Sum(x=>x.StockQty),
                Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt(),
                StockId = outStock.Id,
                TaskNum = taskNum,
                OrderQuantity = ouMESOrder.ReqQuantity,
                Unit = outStock.proStockInfoDetails.FirstOrDefault()?.ProductUnit,
                AssistUnit = ouMESOrder.AssistUnitCode
            };

            return outStockLockInfo;
@@ -105,7 +136,7 @@
                OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
                MaterielCode = outSGOrderDetail.MaterialNo,
                BatchNo = outSGOrderDetail.BoardFluteNo, //楞别批次
                LocationCode = outStock.LocationCode,
                LocationCode = outStock.LocationCode.IsNullOrEmpty() ? "老厂缓存区": outStock.LocationCode,
                MaterielName = outStock.MaterielName,
                OrderDetailId = outSGOrderDetail.Id,
                OrderNo = outSGOrder.OrderId,