From c09e27ad225db06c1ebff340635654c76acc4d2d Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 12 三月 2025 14:56:23 +0800
Subject: [PATCH] 1.生产退补料优化,日志

---
 service/Wom/WomdaaManager.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index b14e0c2..425e39d 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -17,9 +17,9 @@
     public List<string> GetProductionPickDaa001(WarehouseQuery query)
     {
         var sql =
-            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID                     FROM WOMDAB                    WHERE DAB006 > DAB007                   GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
+            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB  WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
             query.daa001 +
-            "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
+            " and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
 
         return Db.Ado.SqlQuery<string>(sql);
     }
@@ -163,7 +163,8 @@
         var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
                 new JoinQueryInfos(JoinType.Left,
                     a.Daa002 == i.ItemId.ToString()))
-            .Where((a, i) => a.Daa001 == query.daa001)
+            .Where((a, i) => a.Daa001 == query.daa001
+                    && a.Fstatus == 1)
             .Select((a, i) => new
             {
                 a.Daa001, a.CaaGuid
@@ -185,7 +186,7 @@
                 a.Daa001 == query.daa001 && d.IssueType == "1")
             .Select((a, b, c, d) => new Womdab
             {
-                Pid = b.Pid,
+                //Pid = b.Pid,
                 Dab003 = b.Dab003,
                 Dab006 = b.Dab006,
                 Dab007 = b.Dab007,

--
Gitblit v1.9.3