Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutProStockInfoService.cs

@@ -35,8 +35,8 @@
                Customer = proOutOrderDetail.Customer,
                PCode = proOutOrderDetail.PCode,
                PVer = proOutOrderDetail.PVer,
                PLot = proOutOrderDetail.PLot,
                DateCode = proOutOrderDetail.DateCode,
                PLot = proStockInfo.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
                DateCode = proStockInfo.proStockInfoDetails.FirstOrDefault()?.DateCode ?? "",
                StockId = proStockInfo.Id,
                OrderQuantity = proOutOrderDetail.QtyPcs,
                OriginalQuantity = proStockInfo.proStockInfoDetails.Sum(x => x.StockPcsQty),
@@ -77,5 +77,39 @@

            return outProStockInfo;
        }
        /// <summary>
        /// æˆå“æŠ¥åºŸå‡ºåº“详情
        /// </summary>
        /// <returns></returns>
        public Dt_OutProStockInfo GetOutStockLockInfo(Dt_ErpProScrapSheet proScrapSheet, Dt_ErpProScrapSheetDetail scrapSheetDetail, Dt_ProStockInfo proStockInfo, float assignQty, int? taskNum = null)
        {
            Dt_OutProStockInfo outProStockInfo = new Dt_OutProStockInfo()
            {
                OrderNo = proScrapSheet.ProScrapSheetOrderNo,
                OrderDetailId = scrapSheetDetail.Id,
                OrderType = 1,
                BatchNo = scrapSheetDetail.ScrapProLotNo,
                SaleOrder = "",
                Customer = "",
                PCode = scrapSheetDetail.ScrapProCode,
                PVer = scrapSheetDetail.ScrapProVersion,
                PLot = proStockInfo.proStockInfoDetails.FirstOrDefault()?.LotNumber ?? "",
                DateCode = proStockInfo.proStockInfoDetails.FirstOrDefault()?.DateCode ?? "",
                StockId = proStockInfo.Id,
                OrderQuantity = scrapSheetDetail.ScrapPcsQty,
                OriginalQuantity = proStockInfo.proStockInfoDetails.Sum(x => x.StockPcsQty),
                AssignQuantity = assignQty,
                LocationCode = proStockInfo.LocationCode,
                PalletCode = proStockInfo.PalletCode,
                Unit = "PCS",
                TaskNum = taskNum,
                Status = taskNum == null ? OutLockStockStatusEnum.已分配.ObjToInt() : OutLockStockStatusEnum.出库中.ObjToInt()
            };
            return outProStockInfo;
        }
        public List<Dt_OutProStockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus)
        {
            return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && outStockStatus == null ? true : x.Status == outStockStatus.ObjToInt());
        }
    }
}