From 283a985dede9fd09cb820a79bb603d7ea34050fc Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 23 12月 2024 14:26:17 +0800 Subject: [PATCH] 22 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs index 4f70a84..cd631f5 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs @@ -71,7 +71,7 @@ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim())) .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd")) - .Where(x => x.IsKitting == false) + .Where(x => x.IsUnline == null || x.IsUnline == false) .OrderBy(g => g.Id) .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List @@ -504,6 +504,7 @@ { if (!listDaoUbi.Contains(item.UPI)) // 浣跨敤 HashSet 杩涜鏌ユ壘 { + var pc = await _mesPackageGatherRep.GetFirstAsync(x => x.PackageCode == item.PackageCode); listRes.Add(new WmsShortageListOutput { UPI = item.UPI, @@ -513,10 +514,10 @@ PlanNo = item.PlanNo, Info5 = item.Info5, Info4 = item.Info4, - Info10 = item.Info10, - Info11 = item.Info11, - Info12 = item.Info12, - Info13 = item.Info13, + Info10 = pc.Info10, + Info11 = pc.Info11, + Info12 = pc.Info12, + Info13 = pc.Info13, //Info14 = item.Info14, Info15 = item.Info15, Info16 = item.Info16, @@ -770,7 +771,7 @@ DateTime currentDate = DateTime.Now; // 璁$畻涓�鍛ㄤ箣鍓嶇殑鏃堕棿 //DateTime oneWeekAgo = currentDate.AddDays(-7); - + // 鑾峰彇褰撳墠鏂囧寲淇℃伅 CultureInfo cultureInfo = CultureInfo.CurrentCulture; -- Gitblit v1.9.3