From 382b3275a3b508f9963188a6a6b0573f3348df5c Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 18 七月 2025 09:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API
---
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache | 2 +-
StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs | 2 +-
StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll | 0
StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs | 2 +-
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache | 2 +-
StandardPda/MES.Service/service/WomcaaManager.cs | 15 ++++++++++++++-
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache | 0
StandardPda/.vs/MESApplication/v17/.suo | 0
StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll | 0
StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll | 0
StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb | 0
StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll | 0
StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll | 0
24 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 b/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
index f39632a..dbe2c59 100644
--- a/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
+++ b/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2
Binary files differ
diff --git a/StandardPda/.vs/MESApplication/v17/.suo b/StandardPda/.vs/MESApplication/v17/.suo
index d4e511f..b89f0f7 100644
--- a/StandardPda/.vs/MESApplication/v17/.suo
+++ b/StandardPda/.vs/MESApplication/v17/.suo
Binary files differ
diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
index aacf094..761f5e9 100644
--- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 5dd5803..9f7f49d 100644
--- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
index 0212967..e29cd56 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f81fe14abe290f73aa783f356d72fa449495293b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7005dbf2453239fadf2d0e3208518791e57ee12")]
[assembly: System.Reflection.AssemblyProductAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
index 836ae7e..8d479f4 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b2e75464d646d4b753d6dd13a873d342520d259de38d8f994fc6dbfb937a3054
+76e543b732515e90142baaa3af7e11fecda3f0d192e869576c3133934e169bfc
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
index aacf094..761f5e9 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
index 5dd5803..9f7f49d 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
index 941dc82..7bcd6ee 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
index 941dc82..7bcd6ee 100644
--- a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
+++ b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs
index 1e62567..c2a8ac2 100644
--- a/StandardPda/MES.Service/service/WomcaaManager.cs
+++ b/StandardPda/MES.Service/service/WomcaaManager.cs
@@ -171,7 +171,14 @@
&& 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;
}
@@ -267,10 +274,16 @@
//Cab003 = dto.FMaterialID
var mesLinkU9 = Db.Queryable<MesLinkU9>()
.Where(x => x.U9Id == dto.FMaterialID
- && x.OrgId == "1002011210000095"
+ && x.OrgId == "1002503270000079"
&& x.TableType == "MES_ITEMS").First();
+ var mesLinkU9_xm = Db.Queryable<MesLinkU9>()
+ .Where(x => x.U9Id == Convert.ToString(dto.FProject)
+ && x.OrgId == "1002503270000079"
+ && x.TableType == "MES_PROJECT").First();
+
if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId;
+ if (mesLinkU9_xm != null) entity.Project = mesLinkU9_xm.MesId;
womcabList.Add(womcab);
}
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
index aacf094..761f5e9 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 5dd5803..9f7f49d 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 64a5205..51e8d80 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 59225a7..0fce05d 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 06c855d..158824a 100644
--- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
index 1f3d3a8..fb68f28 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f81fe14abe290f73aa783f356d72fa449495293b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7005dbf2453239fadf2d0e3208518791e57ee12")]
[assembly: System.Reflection.AssemblyProductAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyTitleAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
index 0844048..c57d4be 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache
@@ -1 +1 @@
-37c130791434ce768814adfb75e478cf705be866c0a4c940640b04e0fe2757c3
+5b6db30e7db3efb381815f17d0f200037e73e41a98315717cee1443f10ce7eac
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
index 240324a..ecc4b4c 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
index 64a5205..51e8d80 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
index 06c855d..158824a 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
index 59225a7..0fce05d 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
index 2cd59fd..33f858b 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll
Binary files differ
diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
index 2cd59fd..33f858b 100644
--- a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
+++ b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll
Binary files differ
--
Gitblit v1.9.3