From f1deb7b024e17cba204de5fcb0dac15801436b90 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 28 七月 2025 20:56:41 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 77 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index bb891dd..907735e 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -10,34 +10,26 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- private readonly SalesReturnDetailManager _SalesReturnDetailManager =
- new();
+ private readonly SalesReturnDetailManager _SalesReturnDetailManager = new();
//ErpSalesRerurn
public bool Save(ErpSalesRerurn SalesReturn)
{
var erpSalesReturnDto = SalesReturn.OrderDto;
var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
- var mesSalesReturnDatas =
- ConvertErpToSalesReturnDetail(SalesReturn.Items);
+ var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
return UseTransaction(db =>
{
switch (erpSalesReturnDto.Type)
{
case "3":
- return UpdateData(db, mesSalesReturn, mesSalesReturnDatas)
- ? 1
- : 0;
+ return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesReturn,
- mesSalesReturnDatas, erpSalesReturnDto.Type)
- ? 1
- : 0;
+ return SaveOrUpdateData(db, mesSalesReturn,mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1 : 0;
default:
- throw new NotImplementedException(
- $"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException($"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
@@ -47,28 +39,29 @@
{
var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesReturn.Id);
- var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>()
- .In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate) return true;
+ if (update && insertOrUpdate)
+ {
+ return true;
+ }
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db,
- SalesReturnNotice mesSalesReturn,
- List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
+ private bool SaveOrUpdateData(SqlSugarScope db,SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
{
- if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
+ if (mesSalesReturn.Id != null)
+ {
+ base.DeleteById(mesSalesReturn.Id);
+ }
if (mesSalesReturnDatas.Count > 0)
- db.Deleteable<SalesReturnNoticeDetail>()
- .Where(s => s.ErpHeadId == mesSalesReturn.ErpId)
- .ExecuteCommand();
-
+ {
+ db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+ }
var orUpdate = base.Insert(mesSalesReturn);
- var baOrUpdate =
- _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
+ var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
if (orUpdate && baOrUpdate) return true;
@@ -89,9 +82,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -133,13 +127,15 @@
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null) salesOrder.Id = single.Id;
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
return salesOrder;
}
- private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
- List<ErpSalesReturnDetailDto> erpDtoList)
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesReturnNoticeDetail>();
@@ -149,11 +145,10 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
- CultureInfo.InvariantCulture, DateTimeStyles.None,
- out parsedDate)) return parsedDate;
-
-
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate))
+ {
+ return parsedDate;
+ }
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -188,9 +183,11 @@
CustOrder = erpDto.F_ZJXF_Text_re5_lee
};
- var single = _SalesReturnDetailManager.GetSingle(it =>
- it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null) salesOrderSub.Id = single.Id;
+ var single = _SalesReturnDetailManager.GetSingle(it => it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
salesOrderSubList.Add(salesOrderSub);
}
--
Gitblit v1.9.3