dengjunjie
2025-04-26 18d2f40bbf40469b033de6f07ca8a8e3bc191132
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs
@@ -1,4 +1,5 @@
//using SqlSugar.Extensions;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -25,23 +26,22 @@
        {
            return BaseDal.QueryFirst(x => SerialNumbers.Contains(x.SerialNumber)) != null;
        }
        /// <summary>
        /// æ ¹æ®æ‰¹æ¬¡å·å’Œå•据号获取库存明细信息
        /// </summary>
        /// <param name="OrderNo">订单号</param>
        /// <param name="BatchNo">批次号</param>
        /// <returns></returns>
        public Dt_StockInfoDetail Get_StockInfoDetail(string OrderNo, string BatchNo = null)
        public Dt_StockInfoDetail? Get_StockInfoDetail(string OrderNo, string BatchNo = null)
        {
            Dt_StockInfoDetail stockInfoDetail = null;
            Dt_StockInfoDetail? stockInfoDetail = null;
            if (BatchNo != null)
            {
                stockInfoDetail = BaseDal.QueryFirst(x => x.OrderNo == OrderNo && x.BatchNo == BatchNo && (x.Status == StockStatusEmun.入库中.ObjToInt() || x.Status == StockStatusEmun.已入库.ObjToInt()));
                stockInfoDetail = BaseDal.QueryData(x => x.OrderNo == OrderNo && x.BatchNo.Contains(BatchNo) && (x.Status == StockStatusEmun.入库中.ObjToInt() || x.Status == StockStatusEmun.已入库.ObjToInt())).OrderByDescending(x => x.ModifyDate).FirstOrDefault();
            }
            else
            {
                stockInfoDetail = BaseDal.QueryFirst(x => x.OrderNo == OrderNo && (x.Status == StockStatusEmun.入库中.ObjToInt() || x.Status == StockStatusEmun.已入库.ObjToInt()));
                stockInfoDetail = BaseDal.QueryData(x => x.OrderNo == OrderNo && (x.Status == StockStatusEmun.入库中.ObjToInt() || x.Status == StockStatusEmun.已入库.ObjToInt())).OrderByDescending(x => x.ModifyDate).FirstOrDefault();
            }
            return stockInfoDetail;
        }