From aa63e0401cea4e367c9d9fd620d996a688c0a01f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 21 五月 2025 15:18:51 +0800
Subject: [PATCH] 添加PDA人工入库功能
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoDetailService.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 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 aa83889..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"
@@ -32,16 +32,16 @@
/// <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