From a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 06 六月 2025 15:38:14 +0800
Subject: [PATCH] 1.仓库信息储存逻辑调整 2.生产订单接口优化。
---
MES.Service/service/BasicData/SalesOrderManager.cs | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 260 insertions(+), 1 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index b466f00..ff6b3f2 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,6 +1,9 @@
锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System.Globalization;
+using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
@@ -9,7 +12,262 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderManager.cs
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ private readonly SalesOrderDetailManager _SalesOrderDetailManager =
+ new();
+
+ //private Guid Tid = Guid.Empty;
+
+ //ErpSalesOrder
+ public bool Save(ErpSalesOrder SalesOrder)
+ {
+ var erpSalesOrderDto = SalesOrder.OrderDto;
+ var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
+ var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(mesSalesOrder, SalesOrder.Items);
+
+ return UseTransaction(db =>
+ {
+ switch (erpSalesOrderDto.Type)
+ {
+ // case "2":
+ // return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
+ // rohInErpRohIn.FBILLTYPE)
+ // ? 1
+ // : 0;
+ case "3":
+ return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ case "5":
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool UpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas)
+ {
+ int update = 0;
+ int insertOrUpdate = 0;
+
+ if (mesSalesOrder.ErpID != null)
+ {
+ update = db.Deleteable<SalesOrder>()
+ .Where(s => s.ErpID == mesSalesOrder.ErpID)
+ .ExecuteCommand();
+ }
+
+ if (mesSalesOrderDatas.Count > 0 && mesSalesOrder.ErpID != null)
+ {
+ insertOrUpdate = db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID)
+ .ExecuteCommand();
+ }
+
+ // 淇閫昏緫鍒ゆ柇锛屽皢 int 绫诲瀷涓� bool 绫诲瀷姣旇緝鏀逛负瀹為檯鍊煎垽鏂�
+ if (update > 0 && insertOrUpdate > 0)
+ {
+ return true;
+ }
+
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas, string type)
+ {
+ //if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
+
+ if (mesSalesOrder.ErpID != null)
+ db.Deleteable<SalesOrder>()
+ .Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();
+
+ if (mesSalesOrderDatas.Count > 0)
+ db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+
+ //var orUpdate = base.Insert(mesSalesOrder);
+ //var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
+
+
+ var orUpdate = db.Insertable(mesSalesOrder)
+ .IgnoreColumns(true).ExecuteCommand() > 0;
+
+
+ var baOrUpdate = db.Insertable(mesSalesOrderDatas).PageSize(1)
+ .IgnoreColumnsNull()
+ .ExecuteCommand() > 0;
+ if (orUpdate && baOrUpdate) return true;
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpSalesOrder> salesOrder)
+ {
+ var result = salesOrder.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private SalesOrder ConvertErpToSalesOrder(
+ ErpSalesOrderDto erpDto)
+ {
+ DateTime parsedDate;
+
+ // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍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;
+
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
+ }
+
+ var salesOrder = new SalesOrder
+ {
+ Id = Guid.NewGuid(),
+ BillNo = erpDto.FBillNo,
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ FDate = ParseDateTime(erpDto.FDate) ?? null,
+ BillTypeId = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
+ DocumentStatus = erpDto.FDocumentStatus, // 鍗曟嵁鐘舵��
+ BusinessType = erpDto.FBusinessType, // 涓氬姟绫诲瀷
+ HeadDeliveryWay = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
+ HeadLocId = erpDto.FHEADLOCID, // 浜よ揣鍦扮偣
+ SaleOrgId = erpDto.FSaleOrgId,
+ //UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // 瀹㈡埛璁㈠崟
+ //UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // 瀹㈡埛闇�姹備氦鏈�
+ //UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // 瀹㈡埛绛夌骇
+ CustId = erpDto.FCustId, // 瀹㈡埛
+ //UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
+ CloseStatus = erpDto.FCloseStatus, // 鍏抽棴鐘舵��
+ SaleDeptId = erpDto.FSaleDeptId, // 閿�鍞儴闂�
+ SalerId = erpDto.FSalerId, // 閿�鍞憳
+ ChangeReason = erpDto.FChangeReason, // 鍙樻洿鍘熷洜
+ Note = erpDto.FNote, // 澶囨敞
+ //UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // 瀹㈡埛浜よ揣鍦扮偣
+ ///ReceiveId = erpDto.FReceiveId,//鏀惰揣鏂�
+ ///ReceiveContact = erpDto.FReceiveContact,//鏀惰揣鏂硅仈绯讳汉
+ ///SettleId = erpDto.FSettleId, // 缁撶畻鏂�
+ ApproverId = erpDto.FApproverId, // 瀹℃牳浜�
+ ///LinkMan = erpDto.FLinkMan, // 鏀惰揣浜哄鍚�
+ ///ChargeId = erpDto.FChargeId, // 浠樻鏂�
+ ///LinkPhone = erpDto.FLinkPhone, // 鑱旂郴鐢佃瘽
+ CreatorId = erpDto.FCreatorId, // 鍒涘缓浜�
+ //CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ CreateDate = DateTime.TryParse(erpDto.FCreateDate, out var conveyDate)
+ ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate)
+ : null, // 鍒涘缓鏃ユ湡
+ ModifierId = erpDto.FModifierId, // 鏈�鍚庝慨鏀逛汉
+ ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 鏈�鍚庝慨鏀规棩鏈�
+ ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
+ CloserId = erpDto.FCloserId, // 鍏抽棴浜�
+ //CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
+ //ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ ChangeDate = DateTime.TryParse(erpDto.FChangeDate, out var ChangeDate)
+ ? (ChangeDate <= new DateTime(1900, 1, 1) ? null : ChangeDate)
+ : null, // 鍙樻洿鏃ユ湡
+ CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
+ CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
+ VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
+ ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
+ SynchronousDate = DateTime.Now
+ //EntryNote = erpDto.FEntryNote // 澶囨敞
+ //ParseDateTime() ?? null
+ //long.Parse()
+ //Convert.ToDecimal()
+ //Convert.ToDouble()
+ };
+
+ if (!string.IsNullOrEmpty(salesOrder.CloserId))
+ salesOrder.CloseDate = string.IsNullOrEmpty(erpDto.FCloseDate)
+ ? (DateTime?)null
+ : DateTime.ParseExact(erpDto.FCloseDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+
+ var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null) salesOrder.Id = single.Id;
+
+ return salesOrder;
+ }
+
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
+ SalesOrder salesOrder,
+ List<ErpSalesOrderDetailDto> erpDtoList)
+ {
+ var salesOrderSubList =
+ new List<SalesOrderDetail>();
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var salesOrderSub = new SalesOrderDetail
+ {
+ Pid = salesOrder.Id,
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ EHID = Convert.ToDecimal(erpDto.EHID),
+ MaterialId = erpDto.FMaterialId,
+ MapId = erpDto.FMapId,
+ MapName = erpDto.FMapName,
+ MapSpec = erpDto.FMapSpec,
+ Seq = Convert.ToInt32(erpDto.Seq),
+ UnitId = erpDto.FUnitID,
+ Qty = Convert.ToDecimal(erpDto.FQty),
+ PriceUnitId = erpDto.FPriceUnitId,
+ PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
+ DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
+ IsFree = erpDto.FIsFree,
+ SupplyOrgId = erpDto.FSupplyOrgId,
+ StockOrgId = erpDto.FStockOrgId,
+ SettleOrgIds = erpDto.FSettleOrgIds,
+ //SalesOrderNo = erpDto.F_UNW_Text_xsddh,
+ //SalesFollowUp = erpDto.F_UNW_Base_GDY,
+ OwnerTypeId = erpDto.FOwnerTypeId,
+ OwnerId = erpDto.FOwnerId,
+ EntryNote = erpDto.FEntryNote,
+ MtoNo = erpDto.FMtoNo,
+ Lot = erpDto.FLot,
+ DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
+ DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
+ OutLmtUnitId = erpDto.FOutLmtUnitID,
+ MrpCloseStatus = erpDto.FMrpCloseStatus,
+ MrpTerminateStatus = erpDto.FMrpTerminateStatus,
+ //TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
+ TerminaterId = erpDto.FTerminatorId,
+ SrcType = erpDto.FSrcType,
+ SrcBillNo = erpDto.FSrcBillNo,
+ DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
+ StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
+ BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
+ BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
+ BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
+ BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
+
+ };
+
+ if (!string.IsNullOrEmpty(salesOrderSub.TerminaterId))
+ salesOrderSub.TerminateDate = string.IsNullOrEmpty(erpDto.FTerminateDate)
+ ? (DateTime?)null
+ : DateTime.ParseExact(erpDto.FTerminateDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
+
+ var single = _SalesOrderDetailManager.GetSingle(it =>
+ it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null) salesOrderSub.Id = single.Id;
+
+ salesOrderSubList.Add(salesOrderSub);
+ }
+
+ return salesOrderSubList;
+ }
#region 鏁欏鏂规硶
@@ -38,7 +296,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(SalesOrder).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
--
Gitblit v1.9.3