From 976d08d7fcea6165717b1ac407cd24dc11fa5d29 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 26 七月 2024 14:52:33 +0800
Subject: [PATCH] 111

---
 MESApplication/bin/Debug/net8.0/MESApplication.pdb |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.exe |    0 
 MESApplication/bin/Debug/net8.0/MES.Service.pdb    |    0 
 MESApplication/bin/Debug/net8.0/MESApplication.dll |    0 
 MES.Service/bin/Debug/net8.0/MES.Service.dll       |    0 
 MES.Service/service/WomcaaManager.cs               |    3 ++-
 MESApplication/bin/Debug/net8.0/MES.Service.dll    |    0 
 MES.Service/bin/Debug/net8.0/MES.Service.pdb       |    0 
 8 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index ae1034e..0970187 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 65ec66a..661251c 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 3e98070..6b7e989 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -78,8 +78,9 @@
         {
             Erpid = Convert.ToDecimal(dto.Id),
             Caa001 = dto.FBillNo,
-            WorkShopId = dto.FWorkShopID0,
+            Caa021 = dto.FWorkShopID0,
             RoutingId = dto.FRoutingId,
+            WorkShopId = dto.FREMWorkShopId,
             DepotCode = dto.FStockId,
             CreateDate = dto.FDate,
             Caa004 = dto.FBillType,
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index ae1034e..0970187 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 65ec66a..661251c 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 4654c5b..559915f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index bca230a..712a67a 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index c82b3bd..d994cb3 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ

--
Gitblit v1.9.3