From 105ee9e867d29a322517888a9c3efb13f3e89961 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期日, 21 九月 2025 22:46:18 +0800
Subject: [PATCH] 1.接口逻辑调整
---
MES.Service/service/BasicData/MesRohInManager.cs | 4 ++--
MES.Service/service/WomcaaManager.cs | 4 ++--
MES.Service/service/BasicData/SalesOrderManager.cs | 4 ++--
MES.Service/service/BasicData/ProductionOrderManager.cs | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 6c318d5..758b087 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -62,9 +62,9 @@
List<MesRohInData> mesRohInDatas, string type)
{
- if (type == "3")
+ if (type == "3" || (mesRohIn.DocumentStatus != null && mesRohIn.DocumentStatus != "C"))
{
- mesRohIn.BillNo = mesRohIn.BillNo + "F";
+ mesRohIn.BillNo = mesRohIn.BillNo + "F" + mesRohIn.EbelnK3id.ToString();
}
if (mesRohIn.Guid != null)
diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs
index de814af..b7e054c 100644
--- a/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -74,10 +74,10 @@
private bool SaveOrUpdateData(SqlSugarScope db, ProductionOrder mesRohIn,
List<ProductionOrderSub> mesRohInDatas, string type)
{
- if(type == "3")
+ if(type == "3" || (mesRohIn.DocumentStatus != null && mesRohIn.DocumentStatus != "C"))
{
mesRohIn.Typea = "3"; // 鏂板瀛楁璧嬪��
- mesRohIn.OrderNo = mesRohIn.OrderNo + "F";
+ mesRohIn.OrderNo = mesRohIn.OrderNo + "F" + mesRohIn.ErpProductionEntryCode;
}
if (StringUtil.CheckGuid(mesRohIn.Guid))
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 24023ab..9b31168 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -88,9 +88,9 @@
{
//if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
- if (type == "3")
+ if (type == "3" || (mesSalesOrder.DocumentStatus != null && mesSalesOrder.DocumentStatus != "C"))
{
- mesSalesOrder.BillNo = mesSalesOrder.BillNo + "F";
+ mesSalesOrder.BillNo = mesSalesOrder.BillNo + "F" + mesSalesOrder.ErpID.ToString();
}
if (mesSalesOrder.ErpID != null)
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 062a5f3..3b03b4f 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -54,10 +54,10 @@
private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
List<Womcab> mesWomcabs, string type)
{
- if(type == "3")
+ if(type == "3" || (mesWomcaa.DocumentStatus != null && mesWomcaa.DocumentStatus != "C"))
{
mesWomcaa.Typea = "3"; // 鏂板瀛楁璧嬪��
- mesWomcaa.Caa001 = mesWomcaa.Caa001 + "F";
+ mesWomcaa.Caa001 = mesWomcaa.Caa001 + "F" + mesWomcaa.Erpid.ToString();
}
--
Gitblit v1.9.3