From e66255ea9dafedb0bc2c2f0787af2097cca549d6 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 03 六月 2025 09:10:11 +0800
Subject: [PATCH] 更新BOM接口和采购申请接口
---
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
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/service/BOM/MesBomMasterManager.cs | 8 ++++----
MES.Service/service/MesCgsqManager.cs | 7 ++++---
9 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index b12c978..2d86459 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 bdf24df..29cfa2a 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/BOM/MesBomMasterManager.cs b/MES.Service/service/BOM/MesBomMasterManager.cs
index a6fc4f9..063d26d 100644
--- a/MES.Service/service/BOM/MesBomMasterManager.cs
+++ b/MES.Service/service/BOM/MesBomMasterManager.cs
@@ -206,9 +206,9 @@
};
- var single = MesBomDetail1Manager.GetSingle(it =>
+ /*var single = MesBomDetail1Manager.GetSingle(it =>
it.Erpid == MesBomOrderSub.Erpid);
- if (single != null) MesBomOrderSub.Erpid = single.Erpid;
+ if (single != null) MesBomOrderSub.Erpid = single.Erpid;*/
MesBomOrderSubList.Add(MesBomOrderSub);
}
@@ -244,9 +244,9 @@
};
- var single = MesBomDetail2Manager.GetSingle(it =>
+ /*var single = MesBomDetail2Manager.GetSingle(it =>
it.Erpid == MesBomOrderSub.Erpid);
- if (single != null) MesBomOrderSub.Erpid = single.Erpid;
+ if (single != null) MesBomOrderSub.Erpid = single.Erpid;*/
MesBomOrderSubList.Add(MesBomOrderSub);
}
diff --git a/MES.Service/service/MesCgsqManager.cs b/MES.Service/service/MesCgsqManager.cs
index 3ab88dc..528efde 100644
--- a/MES.Service/service/MesCgsqManager.cs
+++ b/MES.Service/service/MesCgsqManager.cs
@@ -60,7 +60,8 @@
private bool SaveOrUpdateData(SqlSugarScope db, Cgsq mesCgsq,
List<CgsqDetail> mesCgsqDatas, string type)
{
- if (mesCgsq.ERPID != null) base.DeleteById(mesCgsq.ERPID);
+ if (mesCgsq.ERPID != null)
+ base.DeleteById(mesCgsq.ERPID);
if (mesCgsqDatas.Count > 0)
db.Deleteable<CgsqDetail>()
@@ -204,9 +205,9 @@
};
- var single = CgsqDetailManager.GetSingle(it =>
+ /*var single = CgsqDetailManager.GetSingle(it =>
it.ERPID == CgsqOrderSub.ERPID);
- if (single != null) CgsqOrderSub.ERPID = single.ERPID;
+ if (single != null) CgsqOrderSub.ERPID = single.ERPID;*/
CgsqOrderSubList.Add(CgsqOrderSub);
}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index b12c978..2d86459 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 bdf24df..29cfa2a 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 66c2953..7071f3b 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 6a8ed35..fbdb39a 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 f050e83..411cb13 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3