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/WomcaaManager.cs |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 8ef9312..0498475 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -158,6 +158,7 @@
             Reasonforrework = dto.FReasonForRework,
             Isforcewholeset = dto.FIsForceWholeSet,
             PREVMO = dto.FPrevMO,
+            TsDate = DateTime.Now,
             Typea = dto.TypeA
         };
 
@@ -171,7 +172,13 @@
                         && x.OrgId == dto.FPrdOrgId
                         && x.TableType == "MES_ITEMS").First();
 
+        var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+           .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+                       && x.OrgId == dto.FPrdOrgId
+                       && x.TableType == "MES_PROJECT").First();
+
         if (mesLinkU9 != null) entity.Caa006 = mesLinkU9.MesId;
+        if (mesLinkU9_xm != null) entity.Project = Convert.ToInt64(mesLinkU9_xm.MesId);
 
         return entity;
     }
@@ -270,7 +277,19 @@
                             && x.OrgId == "1002011210000095"
                             && x.TableType == "MES_ITEMS").First();
 
+            var mesLinkU9_TDL = Db.Queryable<MesLinkU9>()
+               .Where(x => x.U9Id == Convert.ToString(dto.FSubstitutedItem)
+                           && x.OrgId == "1002011210000095"
+                           && x.TableType == "MES_ITEMS").First();
+
+            var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+         .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+                     && x.OrgId == "1002011210000095"
+                     && x.TableType == "MES_PROJECT").First();
+
             if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId;
+            if (mesLinkU9_TDL != null) womcab.Substituteditem = Convert.ToInt64(mesLinkU9_TDL.MesId);
+            if (mesLinkU9_xm != null) womcab.Project = mesLinkU9_xm.MesId;
 
             womcabList.Add(womcab);
         }

--
Gitblit v1.9.3