From 9e256f6ac53316f51c06e2ec3d9ee686b51ad435 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:29 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs | 91 +++++++++++++++++++++------------------------
1 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs b/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
index dfe1746..03b5cb2 100644
--- a/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,10 +1,8 @@
-锘縰sing AngleSharp.Dom;
+锘縰sing System.Globalization;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Data;
-using System.Globalization;
namespace MES.Service.service.BasicData;
@@ -13,6 +11,7 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
+
//ErpSalesOrder
public bool Save(ErpSalesOrder SalesOrder)
{
@@ -25,49 +24,49 @@
switch (erpSalesOrderDto.Type)
{
case "3":
- return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ return DeleteData(db, mesSalesOrder, mesSalesOrderDatas)
+ ? 1
+ : 0;
case "2":
case "4":
case "5":
- return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type) ? 1: 0;
+ return SaveOrUpdateData(db, mesSalesOrder,
+ mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0;
default:
- throw new NotImplementedException( $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas)
+ 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 insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals)
+ .ExecuteCommand() > 0;
- if (update && insertOrUpdate)
- {
- return true;
- }
+ if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas, string type)
{
- if (mesSalesOrder.Id != null)
- {
- base.DeleteById(mesSalesOrder.Id);
- }
+ if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
if (mesSalesOrderDatas.Count > 0)
- {
- db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
- }
+ db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
var orUpdate = base.Insert(mesSalesOrder);
- var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
- if (orUpdate && baOrUpdate)
- {
- return true;
- }
+ var baOrUpdate =
+ _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
+ if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -86,10 +85,9 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍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
}
@@ -103,23 +101,22 @@
CustId = erpDto.FCustId, // 瀹㈡埛
SaleDeptId = erpDto.FSaleDeptId, // 閿�鍞儴闂�
EntryNote = erpDto.FEntryNote, // 澶囨敞
- FSalesPerson= erpDto.FSalesPerson,
- FProject= erpDto.FProject,
+ FSalesPerson = erpDto.FSalesPerson,
+ FProject = erpDto.FProject,
FDemandCategory = erpDto.FDemandCategory,
FStartDate = erpDto.FStartDate,
FEndDate = erpDto.FEndDate
};
- var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
- if (single != null)
- {
- salesOrder.Id = single.Id;
- }
+ var single =
+ base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null) salesOrder.Id = single.Id;
return salesOrder;
}
- private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
+ List<ErpSalesOrderDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesOrderDetail>();
@@ -137,27 +134,25 @@
EntryNote = erpDto.FEntryNote,
Lot = erpDto.FLot,
ItemNo = erpDto.FMapId,
- FLineNo= erpDto.FLineNo,
+ FLineNo = erpDto.FLineNo,
FLineStatus = erpDto.FLineStatus,
FExtendField = erpDto.FExtendField,
FCustomer = erpDto.FCustomer,
- FReceiveLocation= erpDto.FReceiveLocation,
- FSupplyOrg= erpDto.FSupplyOrg,
+ FReceiveLocation = erpDto.FReceiveLocation,
+ FSupplyOrg = erpDto.FSupplyOrg,
FDepartment = erpDto.FDepartment,
FSalesPerson = erpDto.FSalesPerson,
FProject = erpDto.FProject,
FDemandCategory = erpDto.FDemandCategory
};
- var single = _SalesOrderDetailManager.GetSingle(it =>it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
- if (single != null)
- {
- salesOrderSub.Id = single.Id;
- }
+ var single = _SalesOrderDetailManager.GetSingle(it =>
+ it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null) salesOrderSub.Id = single.Id;
var mesLinkU9 = Db.Queryable<MesLinkU9>()
- .Where(x => x.U9Id == erpDto.FMaterialId
- && x.OrgId == erpDto.FSupplyOrg
- && x.TableType == "MES_ITEMS").First();
+ .Where(x => x.U9Id == erpDto.FMaterialId
+ && x.OrgId == erpDto.FSupplyOrg
+ && x.TableType == "MES_ITEMS").First();
if (mesLinkU9 != null) salesOrderSub.MaterialId = mesLinkU9.MesId;
--
Gitblit v1.9.3