From 6761b0ed84fd7a03400b557244d0835f671dad94 Mon Sep 17 00:00:00 2001 From: sjz <1240968267@qq.com> Date: 星期一, 14 七月 2025 18:02:59 +0800 Subject: [PATCH] 修改多组织 --- MES.Service/service/BasicData/MesRohInManager.cs | 199 +++++++++++++++++-------------------------------- 1 files changed, 68 insertions(+), 131 deletions(-) diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs index cd79236..9b395ea 100644 --- a/MES.Service/service/BasicData/MesRohInManager.cs +++ b/MES.Service/service/BasicData/MesRohInManager.cs @@ -8,8 +8,6 @@ public class MesRohInManager : Repository<MesRohIn> { private readonly MesRohInDataManager rohInDataManager = new(); - - // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔 public bool Save(RohIn rohIn) { var rohInErpRohIn = rohIn.ErpRohIn; @@ -20,87 +18,46 @@ { switch (rohInErpRohIn.Type) { + case "3": + return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; case "2": case "4": case "5": + case "B": return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; - case "3": - return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; default: - throw new NotImplementedException( - $"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷"); + throw new NotImplementedException($"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷"); } }) > 0; } - - // 鎻掑叆鏁版嵁鐨勬柟娉� - private bool InsertData(SqlSugarScope db, MesRohIn mesRohIn, - List<MesRohInData> mesRohInDatas, string FBILLTYPE) - { - switch (FBILLTYPE) - { - case "A": - { - var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); - - if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); - - if (decimals.Length > 0) - db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand(); - - var insert = base.Insert(mesRohIn); - var insertRange = - rohInDataManager.InsertRange(mesRohInDatas); - - if (insert && insertRange) return true; - throw new NotImplementedException("鎻掑叆澶辫触"); - } - case "B": - { - var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); - if (base.DeleteById(mesRohIn.Id) && db - .Deleteable<MesRohInData>().In(decimals) - .ExecuteCommand() > 0) - { - var insert = base.Insert(mesRohIn); - var insertRange = - rohInDataManager.InsertRange(mesRohInDatas); - - if (insert && insertRange) return true; - throw new NotImplementedException("鎻掑叆澶辫触"); - } - - break; - } - } - - throw new NotImplementedException("閲囪喘璁㈠崟绫诲瀷閿欒"); - } + // 鏇存柊鏁版嵁鐨勬柟娉� - private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, - List<MesRohInData> mesRohInDatas) + private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn,List<MesRohInData> mesRohInDatas) { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); var update = base.DeleteById(mesRohIn.Id); - var insertOrUpdate = db - .Deleteable<MesRohInData>().In(decimals) - .ExecuteCommand() > 0; + var insertOrUpdate = db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand() > 0; - if (update && insertOrUpdate) return true; + if (update && insertOrUpdate) + { + return true; + } throw new NotImplementedException("鏇存柊澶辫触"); } // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶 - private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, - List<MesRohInData> mesRohInDatas) + private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn,List<MesRohInData> mesRohInDatas) { - if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); + if (mesRohIn.Id != null) + { + base.DeleteById(mesRohIn.Id); + } if (mesRohInDatas.Count > 0) - db.Deleteable<MesRohInData>() - .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); - + { + db.Deleteable<MesRohInData>().Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); + } var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); if (orUpdate && baOrUpdate) return true; @@ -121,62 +78,54 @@ var mesRohIn = new MesRohIn(); var single = base.GetSingle(it => it.EbelnK3id == eid); - if (single != null) mesRohIn.Id = single.Id; + if (single != null) + { + mesRohIn.Id = single.Id; + } mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; mesRohIn.DocumentStatus = rohIn.FDocumentStatus; mesRohIn.DocumentType = rohIn.FBillTypeID; mesRohIn.BusinessType = rohIn.FBusinessType; - if (rohIn.FDate != null) - mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate, - "yyyy-MM-dd HH:mm:ss", null); - + { + mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate, "yyyy-MM-dd HH:mm:ss", null); + } mesRohIn.Supplier = rohIn.FSupplierId; mesRohIn.CloseStatus = rohIn.FCloseStatus; mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId; mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId; mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId; - mesRohIn.QtyAcceptance = rohIn.Facctype; mesRohIn.Purchaser = rohIn.FPurchaserId; - //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq; mesRohIn.SettlementParty = rohIn.FSettleId; mesRohIn.PaymentParty = rohIn.FChargeId; - // mesRohIn.Email = rohIn.FProviderEMail; - // mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs; - mesRohIn.Remarks = rohIn.FHEADNOTE; - // mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj; + mesRohIn.Email = rohIn.FProviderEMail; mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.CancellationPerson = rohIn.FCancellerId; if (rohIn.FCancelDate != null) - mesRohIn.CancellationDate = - DateTime.ParseExact(rohIn.FCancelDate, - "yyyy-MM-dd HH:mm:ss", null); - + { + mesRohIn.CancellationDate = DateTime.ParseExact(rohIn.FCancelDate, "yyyy-MM-dd HH:mm:ss", null); + } mesRohIn.CreateBy = rohIn.FCreatorId; - - if (rohIn.FCreateDate != null) - mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate, - "yyyy-MM-dd HH:mm:ss", null); - mesRohIn.LastupdateBy = rohIn.FModifierId; if (rohIn.FModifyDate != null) - mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate, - "yyyy-MM-dd HH:mm:ss", null); - + { + mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate, "yyyy-MM-dd HH:mm:ss", null); + } mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; - mesRohIn.Changereason = rohIn.FCHANGEREASON; + mesRohIn.Changereason = rohIn.FChangeReason; + mesRohIn.CreateDate = DateTime.Now; + mesRohIn.ReceiveOrg = Convert.ToDecimal(rohIn.FReceiveOrgId); return mesRohIn; } // 灏� ErpRohinData 瀵硅薄杞崲涓� MesRohInData 瀵硅薄鐨勬柟娉� - public List<MesRohInData> GetMesRohInDatas( - List<ErpRohinData> erpRohinDatas, string type) + public List<MesRohInData> GetMesRohInDatas(List<ErpRohinData> erpRohinDatas, string type) { return erpRohinDatas.Select(s => { @@ -185,73 +134,61 @@ EbelnK3id = Convert.ToDecimal(s.id), ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, - SalesOrderId=s.FDEMANDBILLNO, - OrderLineId=s.FSEQ, + OrderLineId=s.FSeq, + PurchaseOrderLineNumber = s.FSeq, + SalesOrderId = s.FXSHTH, ItemId = s.FMaterialId, PurchaseUnit = s.FUnitId, PurchaseQty = Convert.ToDecimal(s.FQty), InventoryUnit = s.FStockUnitID, - DeliveryDate = s.FDeliveryDate != null - ? DateTime.ParseExact(s.FDeliveryDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, - EarliestDeliveryDate = s.FDeliveryEarlyDate != null - ? DateTime.ParseExact(s.FDeliveryEarlyDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, - LatestDeliveryDate = s.FDeliveryLastDate != null - ? DateTime.ParseExact(s.FDeliveryLastDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, + PricingUnit = s.FPriceUnitId, + PricingQty = Convert.ToDecimal(s.FPriceUnitQty), + DeliveryDate = s.FDeliveryDate != null ? DateTime.ParseExact(s.FDeliveryDate,"yyyy-MM-dd HH:mm:ss", null) : null, + EarliestDeliveryDate = s.FDeliveryEarlyDate != null ? DateTime.ParseExact(s.FDeliveryEarlyDate,"yyyy-MM-dd HH:mm:ss", null) : null, + LatestDeliveryDate = s.FDeliveryLastDate != null ? DateTime.ParseExact(s.FDeliveryLastDate, "yyyy-MM-dd HH:mm:ss", null) : null, IsGift = s.FGiveAway, - Remarks = s.Fnote, + Remarks = s.FNote, SupplierItemCode = s.FSupMatId, SupplierItemName = s.FSupMatName, - OutsourcingOrderId = s.FSUBREQBILLNO, + OutsourcingOrderId = s.FSubreqBillNo, BatchNumber = s.FLot, BusinessClose = s.FMRPCloseStatus, BusinessFreeze = s.FMRPFreezeStatus, Freezer = s.FFreezerId, - FreezeTime = s.FFreezeDate != null - ? DateTime.ParseExact(s.FFreezeDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, + FreezeTime = s.FFreezeDate != null ? DateTime.ParseExact(s.FFreezeDate,"yyyy-MM-dd HH:mm:ss", null) : null, BusinessTerminate = s.FMRPTerminateStatus, Terminator = s.FTerminaterId, - TerminateTime = s.FTerminateDate != null - ? DateTime.ParseExact(s.FTerminateDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, - TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), - RemainingReceivedQty = - Convert.ToDecimal(s.FRemainReceiveQty), - TotalStoredQty = Convert.ToDecimal(s.FStockInQty), + TerminateTime = s.FTerminateDate != null ? DateTime.ParseExact(s.FTerminateDate,"yyyy-MM-dd HH:mm:ss", null) : null, + TotalReceivedQty = Convert.ToDecimal(s.FQty)-Convert.ToDecimal(s.FRemainReceiveQty), + RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty), + TotalStoredQty = Convert.ToDecimal(s.FQty) - Convert.ToDecimal(s.FRemainStockINQty), RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), - ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), - ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), + ReturnableReceivedQty = Convert.ToDecimal(s.Fcheckretqty), + ReturnableStoredQty = Convert.ToDecimal(s.Fstockretqty), SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSrcBillNo, DemandTrackingId = s.FReqTraceNo, PlanTrackingId = s.FMtoNo, ChangeFlag = s.FChangeFlag, - DemandSource = s.FDEMANDTYPE, - DemandDocumentId = s.FDEMANDBILLNO, - DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ, + DemandSource = s.FDemandType, + DemandDocumentId = s.FDemandBillNo, + DemandDocumentLineId = s.FDemandBillEntrySeq, + Demand = s.FRequireOrgId, DemandOrg = s.FRequireOrgId, - ReceivingOrg = s.FReceiveOrgId, - SettlementOrg = s.FSETTLEORGID, - PurchaseOrderLineNumber = s.FSEQ, - Demand =s.FRequireOrgId, Receiving = s.FReceiveOrgId, - Settlement =s.FSETTLEORGID, - DemandDepartment = s.FRequireDeptId, - ReceivingDepartment = s.FReceiveDeptId + ReceivingOrg = s.FReceiveOrgId, + Settlement = s.Fsettleorgid, + SettlementOrg = s.Fsettleorgid, + DemandDept = s.FRequireDeptId, + ReceivingDept = s.FReceiveDeptId }; - var single = rohInDataManager.GetSingle(it => - it.EbelnK3id == entity.EbelnK3id); - if (single != null) entity.Id = single.Id; + var single = rohInDataManager.GetSingle(it =>it.EbelnK3id == entity.EbelnK3id); + if (single != null) + { + entity.Id = single.Id; + } return entity; }).ToList(); -- Gitblit v1.9.3