From 7b84eb64d11b12b6fb41ae7f7085452512ad5d3f Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期五, 20 六月 2025 08:18:08 +0800 Subject: [PATCH] 1.采购入库优化 --- service/Wom/WomdaaManager.cs | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs index 1f552d6..1436d92 100644 --- a/service/Wom/WomdaaManager.cs +++ b/service/Wom/WomdaaManager.cs @@ -204,7 +204,7 @@ // .ToList(); var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty , - dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw + dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw FROM WOMDAB B LEFT JOIN WOMDAA A ON A.guid = B.daaGuid LEFT JOIN MES_ITEMS C ON B.dab003 = C.item_id @@ -678,7 +678,8 @@ { a.Daa001, a.CaaGuid, - a.Daa008 + a.Daa008, + a.Daa021 }).First(); if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪"); @@ -745,6 +746,7 @@ var dto = new XcslResultDto { GD_Num = womdaa.Daa008, + workNo = womdaa.Daa021, XcslItemList = XcslItem, XcslWjsBarList = XcslWjsBar, XcslYjsBarList = XcslYjsBar @@ -758,6 +760,7 @@ public class XcslResultDto { public int? GD_Num { get; set; } + public string? workNo { get; set; } public List<dynamic> XcslItemList { get; set; } public List<dynamic> XcslWjsBarList { get; set; } public List<dynamic> XcslYjsBarList { get; set; } @@ -899,7 +902,7 @@ var sql2 = new StringBuilder(@" SELECT '['+DAA001+']['+DAA021+']' AS daaInfo,DAA001,DAA021 FROM WOMDAA - WHERE daa018 NOT IN ('W:瀹屽伐', 'D:寰呭紑宸�')"); + WHERE daa018 <>'W:瀹屽伐'"); if (!string.IsNullOrWhiteSpace(unity.selectKey?.ToString())) { @@ -933,7 +936,8 @@ { a.Daa001, a.CaaGuid, - a.Daa008 + a.Daa008, + a.Daa021 }).First(); if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪"); @@ -1009,6 +1013,7 @@ var dto = new XcslResultDto { GD_Num = womdaa.Daa008, + workNo = womdaa.Daa021, XcslItemList = XcslItem, XcslWjsBarList = XcslWjsBar, XcslYjsBarList = XcslYjsBar -- Gitblit v1.9.3