From 528d0370cb57f07e291fbf8fb0052718c3fe584c Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期六, 13 九月 2025 15:14:50 +0800
Subject: [PATCH] 合并接口
---
MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
index 54f1fe3..d100147 100644
--- a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
+++ b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -20,8 +20,7 @@
{
var deliveryNote = deliveryNoteWrapper.DeliveryNote;
var mesDeliveryNote = GetMesDeliveryNote(deliveryNote);
- var mesDeliveryNoteDetails =
- GetMesDeliveryNoticeDetails(deliveryNoteWrapper.DeliveryNoteDetails, mesDeliveryNote.DeliveryNo);
+ var mesDeliveryNoteDetails = GetMesDeliveryNoticeDetails(deliveryNoteWrapper.DeliveryNoteDetails, mesDeliveryNote.DeliveryNo);
return UseTransaction(db =>
{
@@ -37,59 +36,50 @@
/// <summary>
/// 鏇存柊閫佽揣鍗曟暟鎹�
/// </summary>
- private bool UpdateData(SqlSugarScope db, MesDeliveryNotice mesDeliveryNote,
- List<MesDeliveryNoticeDetail> mesDeliveryNoteDetails)
+ private bool UpdateData(SqlSugarScope db, MesDeliveryNotice mesDeliveryNote, List<MesDeliveryNoticeDetail> mesDeliveryNoteDetails)
{
var detailIds = mesDeliveryNoteDetails.Select(s => s.Guid).ToArray();
// 鍒犻櫎涓昏〃鏁版嵁
- var deleteMain = db.Deleteable<MesDeliveryNotice>()
- .Where(a => a.DeliveryNo == mesDeliveryNote.DeliveryNo)
- .ExecuteCommand() > 0;
+ var deleteMain = db.Deleteable<MesDeliveryNotice>().Where(a => a.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand() > 0;
// 鍒犻櫎鏄庣粏鏁版嵁
- var deleteDetails = db.Deleteable<MesDeliveryNoticeDetail>()
- .Where(s => detailIds.Contains(s.Guid))
- .ExecuteCommand() > 0;
+ var deleteDetails = db.Deleteable<MesDeliveryNoticeDetail>().Where(s => detailIds.Contains(s.Guid)).ExecuteCommand() > 0;
- if (deleteMain && deleteDetails) return true;
+ if (deleteMain && deleteDetails)
+ {
+ return true;
+ }
throw new NotImplementedException("閫佽揣鍗曟洿鏂板け璐�");
}
/// <summary>
/// 淇濆瓨鎴栨洿鏂伴�佽揣鍗曟暟鎹�
/// </summary>
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNotice mesDeliveryNote,
- List<MesDeliveryNoticeDetail> mesDeliveryNoteDetails)
+ private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNotice mesDeliveryNote, List<MesDeliveryNoticeDetail> mesDeliveryNoteDetails)
{
// 鑻ュ瓨鍦ㄥ垯鍏堝垹闄や富琛ㄦ暟鎹�
if (!mesDeliveryNote.DeliveryNo.IsNullOrEmpty())
{
- db.Deleteable<MesDeliveryNotice>()
- .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
- .ExecuteCommand();
+ db.Deleteable<MesDeliveryNotice>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
}
// 鍒犻櫎鍏宠仈鐨勬槑缁嗘暟鎹�
if (mesDeliveryNoteDetails.Count > 0)
{
- db.Deleteable<MesDeliveryNoticeDetail>()
- .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
- .ExecuteCommand();
+ db.Deleteable<MesDeliveryNoticeDetail>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
}
// 鎻掑叆涓昏〃鏁版嵁
- var insertMain = db.Insertable(mesDeliveryNote)
- .IgnoreColumns(true)
- .ExecuteCommand() > 0;
+ var insertMain = db.Insertable(mesDeliveryNote).IgnoreColumns(true).ExecuteCommand() > 0;
// 鎻掑叆鏄庣粏鏁版嵁
- var insertDetails = db.Insertable(mesDeliveryNoteDetails)
- .PageSize(1)
- .IgnoreColumnsNull()
- .ExecuteCommand() > 0;
+ var insertDetails = db.Insertable(mesDeliveryNoteDetails).PageSize(1).IgnoreColumnsNull().ExecuteCommand() > 0;
- if (insertMain && insertDetails) return true;
+ if (insertMain && insertDetails)
+ {
+ return true;
+ }
throw new NotImplementedException("閫佽揣鍗曚繚瀛樺け璐�");
}
@@ -141,8 +131,7 @@
return deliveryNoteDetails.Select(detail =>
{
// 鏌ユ壘宸叉湁鏄庣粏璁板綍
- var existingDetail = deliveryNoteDetailManager.GetSingle(it =>
- it.DeliveryNo == deliveryNo && it.LineNo == detail.LineNo);
+ var existingDetail = deliveryNoteDetailManager.GetSingle(it => it.DeliveryNo == deliveryNo && it.LineNo == detail.LineNo);
var mesDetail = existingDetail ?? new MesDeliveryNoticeDetail();
// 鏄庣粏瀛楁鏄犲皠
--
Gitblit v1.9.3