From 9af04222e7449442f1d1cc1a80b6e07a90f4c9bf Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 26 八月 2025 09:57:31 +0800
Subject: [PATCH] 1.采购、生产、委外、销售清单优化，取消反审核删除。
---
MES.Service/service/BasicData/MesRohInManager.cs | 5 ++++-
MES.Service/service/WomcaaManager.cs | 16 +++++++++++++---
MES.Service/service/BasicData/SalesOrderManager.cs | 4 +++-
MES.Service/service/BasicData/ProductionOrderManager.cs | 11 ++++++++++-
4 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index fd0edbc..a9de51d 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -27,7 +27,10 @@
mesRohInDatas)
? 1
: 0,
- "3" => UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,
+ "3" => SaveOrUpdateData(db, mesRohIn,
+ mesRohInDatas)
+ ? 1
+ : 0, //UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0,//鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
_ => throw new NotImplementedException(
$"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷")
};
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index 28b494d..d07e188 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -35,7 +35,11 @@
// ? 1
// : 0;
case "3":
- return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
+ //return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;//鏀逛负涓嶅垹闄�
+ return SaveOrUpdateData(db, mesRohIn, mesRohInDatas,
+ erpProductionOrderDto.Type)
+ ? 1
+ : 0;
case "2":
case "4":
return SaveOrUpdateData(db, mesRohIn, mesRohInDatas,
@@ -70,6 +74,11 @@
private bool SaveOrUpdateData(SqlSugarScope db, ProductionOrder mesRohIn,
List<ProductionOrderSub> mesRohInDatas, string type)
{
+ if(type == "3")
+ {
+ mesRohIn.Typea = "3"; // 鏂板瀛楁璧嬪��
+ }
+
if (StringUtil.CheckGuid(mesRohIn.Guid))
db.Deleteable<ProductionOrder>()
.Where(s => s.Guid == mesRohIn.Guid)
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index ff6b3f2..1358bad 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -37,7 +37,9 @@
// ? 1
// : 0;
case "3":
- return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0; ;//UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;//鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
case "2":
case "4":
case "5":
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 946d7e2..970982a 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -33,12 +33,15 @@
switch (womErpCaa.Type)
{
case "3":
- return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ return SaveOrUpdateData(db, mesWomcaa, mesWomcabs,womErpCaa.Type)
+ ? 1
+ : 0;
+ //return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; //鍙嶅鏍镐笉鍒犻櫎锛屽仛update銆�
case "2":
case "4":
//kyy 2024-09-13 鍙樻洿
case "5":
- return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
+ return SaveOrUpdateData(db, mesWomcaa, mesWomcabs,womErpCaa.Type)
? 1
: 0;
default:
@@ -49,8 +52,15 @@
}
private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
- List<Womcab> mesWomcabs)
+ List<Womcab> mesWomcabs, string type)
{
+ if(type == "3")
+ {
+ mesWomcaa.Typea = "3"; // 鏂板瀛楁璧嬪��
+ }
+
+
+
if (StringUtil.CheckGuid(mesWomcaa.Guid))
base.DeleteById(mesWomcaa.Guid);
--
Gitblit v1.9.3