From a94ae062ca9d2edd0a667526cfac359b2d1b3fb5 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期五, 12 九月 2025 18:25:08 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/BasicData/SalesOrderManager.cs | 255 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 193 insertions(+), 62 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index b466f00..9ce59de 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,6 +1,10 @@
锘縰sing MES.Service.DB;
+using System.Data;
+using System.Globalization;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using DbType = System.Data.DbType;
namespace MES.Service.service.BasicData;
@@ -8,71 +12,198 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
+ private readonly SalesOrderDetailManager _SalesOrderDetailManager =
+ new();
+ //ErpSalesOrder
+ public bool Save(ErpSalesOrder SalesOrder)
{
- /*********鏌ヨ*********/
+ var erpSalesOrderDto = SalesOrder.OrderDto;
+ var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
+ var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(SalesOrder.Items);
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
+ return UseTransaction(db =>
{
- FieldName = typeof(SalesOrder).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesOrder(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ 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":
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
}
- #endregion
+ private bool UpdateData(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;
+
+ if (update && insertOrUpdate) 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 (mesSalesOrderDatas.Count > 0)
+ 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;
+
+
+ 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
+ {
+ 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, // 浜よ揣鍦扮偣
+ 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, // 瀹㈡埛浜よ揣鍦扮偣
+ SettleId = erpDto.FSettleId, // 缁撶畻鏂�
+ ApproverId = erpDto.FApproverId, // 瀹℃牳浜�
+ LinkMan = erpDto.FLinkMan, // 鏀惰揣浜哄鍚�
+ ChargeId = erpDto.FChargeId, // 浠樻鏂�
+ LinkPhone = erpDto.FLinkPhone, // 鑱旂郴鐢佃瘽
+ CreatorId = erpDto.FCreatorId, // 鍒涘缓浜�
+ CreateDate = ParseDateTime(erpDto.FCreateDate) ?? 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, // 鍙樻洿鏃ユ湡
+ CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
+ CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
+ VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
+ ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
+ EntryNote = erpDto.FEntryNote, // 澶囨敞
+ FBILLTYPE = erpDto.FBILLTYPE // 鍗曟嵁绫诲瀷
+ //ParseDateTime() ?? null
+ //long.Parse()
+ //Convert.ToDecimal()
+ //Convert.ToDouble()
+ };
+
+ 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)
+ {
+ var salesOrderSubList =
+ new List<SalesOrderDetail>();
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var salesOrderSub = new SalesOrderDetail
+ {
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ EHID = Convert.ToDecimal(erpDto.EHID),
+ MaterialId = erpDto.FMaterialId,
+ UnitId = erpDto.FUnitID,
+ Qty = Convert.ToDecimal(erpDto.FQty),
+ PriceUnitId = erpDto.FPriceUnitId,
+ PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
+ DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
+ IsFree = erpDto.FIsFree,
+ 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),
+ CUST_INO = erpDto.FCUST_INO,
+ CUST_INM = erpDto.FCUST_INM,
+ CUST_IMD = erpDto.FCUST_IMD,
+ };
+
+ var single = _SalesOrderDetailManager.GetSingle(it =>
+ it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null) salesOrderSub.Id = single.Id;
+
+ salesOrderSubList.Add(salesOrderSub);
+ }
+
+ return salesOrderSubList;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3