From 57ff0c03bd101e20742c2ba1e745a7c55deb091b Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期二, 16 九月 2025 10:28:38 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

---
 StandardInterface/MES.Service/service/QC/LljService.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index e907f30..c84c883 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1095,4 +1095,62 @@
             throw new Exception(ex.Message);
         }
     }
+    public List<MesItems> GetWomdab(string daa001)
+    {
+        //if (string.IsNullOrEmpty(ItemNo))
+        //{
+        // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+        //}
+
+        var db = SqlSugarHelper.GetInstance();
+        try
+        {
+            return db.Queryable<Womdab>()
+                    .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+                    .Where((w, m) => w.Dab001 == daa001)
+                    .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+                    // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+                    .Select((w, m) => new MesItems
+                    {
+                           ItemNo = m.ItemNo,
+                           ItemName = m.ItemName,
+                           ItemModel = m.ItemModel
+                    }).ToList();
+        }
+        catch (Exception ex)
+        {
+           throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+        }
+
+    }
+
+    public List<MesItems> GetWomdabById(string daa001,string ItemNo)
+    {
+        //if (string.IsNullOrEmpty(ItemNo))
+        //{
+        // throw new ArgumentException("妫�楠屽崟鍙蜂笉鑳戒负绌�");
+        //}
+
+        var db = SqlSugarHelper.GetInstance();
+        try
+        {
+            return db.Queryable<Womdab>()
+                    .LeftJoin<MesItems>((w, m) => w.Dab003 == m.ItemId.ToString()) // 闇�瑕佹浛鎹负瀹為檯鐨勫叧鑱斿瓧娈�
+                    .Where((w, m) => w.Dab001 == daa001 && m.ItemNo.Contains(ItemNo))
+                    .OrderBy((w, m) => w.Dab003, OrderByType.Desc)
+                    // .ThenBy((w, m) => w.CreateDate, OrderByType.Desc)
+                    .Select((w, m) => new MesItems
+                    {
+                        ItemNo = m.ItemNo,
+                        ItemName = m.ItemName,
+                        ItemModel = m.ItemModel
+                    }).ToList();
+        }
+        catch (Exception ex)
+        {
+            throw new Exception($"鏌ヨ闄勪欢淇℃伅澶辫触: {ex.Message}");
+        }
+
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3