StandardPda/MES.Service/Dto/webApi/ErpLineDetails.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Dto/webApi/RohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/Modes/ErpLineDetailsDB.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
StandardPda/MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardPda/MES.Service/Dto/webApi/ErpLineDetails.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,56 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace MES.Service.Dto.webApi; public class ErpLineDetails { /// <summary> /// ä»è¡¨id /// </summary> public string Mid { get; set; } /// <summary> /// 主表erpid /// </summary> public string Eid { get; set; } /// <summary> /// åè¡å·ï¼è®¢å项ä¸çç»ååºå·ï¼é常ä¸ç¶é¡¹å ³èï¼ /// </summary> public string FlineNo { get; set; } /// <summary> /// æåIDï¼å ³èç©æä¸»æ°æ®è¡¨çå¤é®ï¼ /// </summary> public string FMaterialId { get; set; } /// <summary> /// éæ±æ°éï¼ä¸å¡é¨é¨æåºçåå§éæ±éï¼ /// </summary> public decimal? ReqQty { get; set; } /// <summary> /// 计åå°è´§æ°éï¼ç»MRPè¿ç®åç计åéï¼ /// </summary> public decimal? PlannedQty { get; set; } /// <summary> /// ä¾åºå确认å°è´§æ°éï¼ä¾åºåæ¿è¯ºç交货éï¼ /// </summary> public decimal? SupplierConfirmsQty { get; set; } /// <summary> /// è¦æ±äº¤è´§æ¥æï¼éè´ç³è¯·æè®¢åè¦æ±çå°è´§æ¥æï¼ /// 注æï¼æ°æ®åºåå¨ä¸ºåç¬¦ä¸²æ ¼å¼ï¼éæ ¹æ®ä¸å¡æ ¼å¼è½¬æ¢ /// </summary> public string RequestDeliveryDate { get; set; } /// <summary> /// å®é å°è´§æ°éï¼ä»åºå®é æ¶è´§æ°éï¼ /// </summary> public decimal? ActualArrivalQty { get; set; } } StandardPda/MES.Service/Dto/webApi/RohIn.cs
@@ -4,4 +4,9 @@ { public ErpRohIn ErpRohIn { get; set; } public List<ErpRohinData> ErpRohinDatas { get; set; } /// <summary> /// åè¡¨è¡æç»æ°æ® /// </summary> public List<ErpLineDetails>? ErpLineDetails { get; set; } } StandardPda/MES.Service/Modes/ErpLineDetailsDB.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,71 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// ERPè¡æç»è¡¨ - åå¨éè´/ç产订åè¡é¡¹ç®è¯¦æ /// </summary> [SugarTable("ERPLINEDETAILS")] // Oracle表åé»è®¤å¤§å public class ErpLineDetailsDB { /// <summary> /// 主é®ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_ERPLINEDETAILS_ID")] public long Id { get; set; } /// <summary> /// ä»è¡¨ID /// </summary> [SugarColumn(ColumnName = "MID")] public string Mid { get; set; } /// <summary> /// 主表ERPID /// </summary> [SugarColumn(ColumnName = "EID")] public string Eid { get; set; } /// <summary> /// åè¡å·ï¼è®¢å项ä¸çç»ååºå·ï¼ /// </summary> [SugarColumn(ColumnName = "FLINENO", IsNullable = false)] public string FlineNo { get; set; } /// <summary> /// æåIDï¼å ³èç©æä¸»æ°æ®è¡¨çå¤é®ï¼ /// </summary> [SugarColumn(ColumnName = "FMATERIALID", IsNullable = false)] public string FMaterialId { get; set; } /// <summary> /// éæ±æ°éï¼ä¸å¡é¨é¨æåºçåå§éæ±éï¼ /// </summary> [SugarColumn(ColumnName = "REQQTY")] public decimal? ReqQty { get; set; } /// <summary> /// 计åå°è´§æ°éï¼ç»MRPè¿ç®åç计åéï¼ /// </summary> [SugarColumn(ColumnName = "PLANNEDQTY")] public decimal? PlannedQty { get; set; } /// <summary> /// ä¾åºå确认å°è´§æ°éï¼ä¾åºåæ¿è¯ºç交货éï¼ /// </summary> [SugarColumn(ColumnName = "SUPPLIERCONFIRMSQTY")] public decimal? SupplierConfirmsQty { get; set; } /// <summary> /// è¦æ±äº¤è´§æ¥æï¼éè´ç³è¯·æè®¢åè¦æ±çå°è´§æ¥æï¼ /// </summary> [SugarColumn(ColumnName = "REQUESTDELIVERYDATE")] public string RequestDeliveryDate { get; set; } /// <summary> /// å®é å°è´§æ°éï¼ä»åºå®é æ¶è´§æ°éï¼ /// </summary> [SugarColumn(ColumnName = "ACTUALARRIVALQTY")] public decimal? ActualArrivalQty { get; set; } } 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(); } }