From 18d2f40bbf40469b033de6f07ca8a8e3bc191132 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 26 四月 2025 19:21:40 +0800
Subject: [PATCH] 优化代码

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs"
index d037e5f..de9c018 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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;
         }

--
Gitblit v1.9.3