From ab43b53a9257daadad2027e1a349d4ec03c41eb7 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 七月 2025 13:08:29 +0800
Subject: [PATCH] Update XJService getPage method to return total count like LljService

---
 StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
index 5a11494..602a24d 100644
--- a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -22,11 +22,19 @@
         {
             OracleSQLHelper SQLHelper = new();
             //鏌ュ伐鍗曚俊鎭�
-            var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A 
+            //var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A 
+            //            join MES_LINE b on A.LINEID=b.ID
+            //            left join WOMDAA C on C.DAA015=B.LINE_NO
+            //            left join mes_items s on s.id = C.daa002
+            //            where LOGINID='" + id+ "' and DAA018='宸插紑宸�'  order by DAA016 asc";
+
+            //鏀逛负鎸夌珯浣嶅彿鍙嶆煡浜х嚎锛屽啀閫氳繃浜х嚎鏌ュ嚭宸ュ崟淇℃伅
+            var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
+                        left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
                         join MES_LINE b on A.LINEID=b.ID
                         left join WOMDAA C on C.DAA015=B.LINE_NO
                         left join mes_items s on s.id = C.daa002
-                        where LOGINID='" + id+ "' and DAA018='宸插紑宸�'  order by DAA016 asc";
+                       where WORKSNO='" + id+ "' and DAA018='宸插紑宸�'  order by DAA016 asc";
 
             return SQLHelper.ExecuteQuery(sql1);
         }

--
Gitblit v1.9.3