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/SalesReturnNoticeManager.cs | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs index 9175278..b1f0a77 100644 --- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs +++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs @@ -47,13 +47,37 @@ private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn, List<SalesReturnNoticeDetail> mesSalesReturnDatas) { - var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray(); - var update = base.DeleteById(mesSalesReturn.Id); - var insertOrUpdate = db - .Deleteable<SalesReturnNoticeDetail>().In(decimals) - .ExecuteCommand() > 0; + // var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray(); + var decimals = mesSalesReturnDatas + ?.Where(x => x.Id.HasValue) + .Select(x => x.Id.Value) + .ToArray() ?? new decimal[0]; + //鎵爜涓嶅厑璁稿垹闄� + var hasMaterialOut = db.Queryable<MesInvItemIns>() + .Any(x => x.CbillNo == mesSalesReturn.BillNo); - if (update && insertOrUpdate) return true; + if (hasMaterialOut) + { + throw new Exception($"MES鏈夐鏂欒褰曪紝鍗曞彿锛歿mesSalesReturn.BillNo}锛屼笉鑳藉垹闄わ紒"); + } + var update = true; + if (mesSalesReturn != null) + { + if (mesSalesReturn.Id != null) + { + update = base.DeleteById(mesSalesReturn.Id); + } + } + var insertOrUpdate = true; + if (decimals != null || decimals.Length > 0) + { + insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0; + } + + if (update && insertOrUpdate) + { + return true; + } throw new NotImplementedException("鏇存柊澶辫触"); } -- Gitblit v1.9.3