From fa9f16425917cbf3ea5524120dbe004f091745e3 Mon Sep 17 00:00:00 2001 From: zjh <2207896513@qq.com> Date: 星期三, 23 七月 2025 08:37:07 +0800 Subject: [PATCH] 采购订单接口添加孙表,存储关于采购订单计划行的数据 --- StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs index f185e91..620f582 100644 --- a/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs +++ b/StandardPda/MES.Service/service/BasicData/MesRohInManager.cs @@ -3,6 +3,7 @@ using MES.Service.Modes; using MES.Service.util; using SqlSugar; +using System.Collections.Generic; namespace MES.Service.service.BasicData; @@ -17,13 +18,14 @@ var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); + var erpLineDetailsDB = GetErpLineDetailsDB(rohIn.ErpLineDetails, rohInErpRohIn.Type); return UseTransaction(db => { return rohInErpRohIn.Type switch { "2" or "4" or "5" => SaveOrUpdateData(db, mesRohIn, - mesRohInDatas) + mesRohInDatas, erpLineDetailsDB) ? 1 : 0, "3" => DeleteData(db, mesRohIn, mesRohInDatas) ? 1 : 0, @@ -58,14 +60,16 @@ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶 private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, - List<MesRohInData> mesRohInDatas) + List<MesRohInData> mesRohInDatas, List<ErpLineDetailsDB> erpLineDetails) { if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); if (mesRohInDatas.Count > 0) db.Deleteable<MesRohInData>() .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); - + if (mesRohInDatas.Count > 0) + db.Deleteable<ErpLineDetailsDB>() + .Where(s => s.Eid == mesRohIn.EbelnK3id).ExecuteCommand(); //var orUpdate = base.Insert(mesRohIn); //var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); var orUpdate = db.Insertable(mesRohIn) @@ -76,8 +80,15 @@ .IgnoreColumnsNull() .ExecuteCommand() > 0; + var ba1OrUpdate = db.Insertable(erpLineDetails).PageSize(1) + .IgnoreColumnsNull() + .ExecuteCommand() > 0; + if (erpLineDetails.Count==0) + { + ba1OrUpdate = true; + } - if (orUpdate && baOrUpdate) return true; + if (orUpdate && baOrUpdate&& ba1OrUpdate) return true; throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�"); } @@ -229,4 +240,37 @@ return entity; }).ToList(); } + + private List<ErpLineDetailsDB> GetErpLineDetailsDB( + List<ErpLineDetails> erpLineDetails, string type) + { + return erpLineDetails.Select(s => + { + var entity = new ErpLineDetailsDB + { + Mid= s.Mid, + Eid = s.Eid, + FlineNo = s.FlineNo, + FMaterialId = s.FMaterialId, + ReqQty = s.ReqQty, + PlannedQty = s.PlannedQty, + SupplierConfirmsQty = s.SupplierConfirmsQty, + RequestDeliveryDate = s.RequestDeliveryDate, + ActualArrivalQty = s.ActualArrivalQty + + + }; + + //ItemId = s.FMaterialId, + var mesLinkU9 = Db.Queryable<MesLinkU9>() + .Where(x => x.U9Id == s.FMaterialId + && x.OrgId == s.FMaterialId + && x.TableType == "MES_ITEMS").First(); + + if (mesLinkU9 != null) entity.FMaterialId = mesLinkU9.MesId; + + + return entity; + }).ToList(); + } } \ No newline at end of file -- Gitblit v1.9.3