From 569bb53b544e2e178b64e229d45f047da032af36 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期五, 27 六月 2025 10:25:14 +0800
Subject: [PATCH] 销售退货，发货，采购退货申请反审核防呆
---
StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
index 42e41b0..04a5146 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
@@ -39,14 +39,29 @@
private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder, List<SalesOrderDetail> mesSalesOrderDatas)
{
var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
- var update = base.DeleteById(mesSalesOrder.Id);
- var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+
+ var update = true;
+ if (mesSalesOrder != null) {
+ if (mesSalesOrder.Id != null)
+ {
+ update = base.DeleteById(mesSalesOrder.Id);
+ }
+ }
+ var insertOrUpdate = true;
+ if (decimals != null || decimals .Length>0)
+ {
+ insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+ }
if (update && insertOrUpdate)
{
return true;
}
throw new NotImplementedException("鏇存柊澶辫触");
+
+
+
+
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
@@ -164,7 +179,8 @@
OutLmtUnitId = erpDto.FOutLmtUnitID,
MrpCloseStatus = erpDto.FMrpCloseStatus,
MrpTerminateStatus = erpDto.FMrpTerminateStatus,
- TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
+ //TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
+ TerminateDate = erpDto.FTerminateDate,
TerminaterId = erpDto.FTerminatorId,
SrcType = erpDto.FSrcType,
SrcBillNo = erpDto.FSrcBillNo,
--
Gitblit v1.9.3