MES.Service/Modes/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/Modes/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Modes/MesRohIn.cs
@@ -16,12 +16,6 @@ public Guid Guid { get; set; } /// <summary> /// SEQ_BASEINFO_ID ///</summary> [SugarColumn(ColumnName = "ID")] public long? Id { get; set; } /// <summary> /// 采购单号 ///</summary> [SugarColumn(ColumnName = "BILL_NO")] @@ -244,37 +238,31 @@ public string? Remark5 { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "CHANGEREASON")] public string? Changereason { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "Prearrivaldate")] public DateTime? Prearrivaldate { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ReceiveOrgId")] public string? ReceiveOrgId { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "Provider_Id")] public string? ProviderId { get; set; } MES.Service/Modes/MesRohInData.cs
@@ -9,7 +9,6 @@ public class MesRohInData { /// <summary> /// /// 默认值: (newid()) ///</summary> [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)] @@ -304,50 +303,37 @@ public string? Remark4 { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")] public string? PurchaseOrderLineNumber { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "DEMAND")] public string? Demand { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "RECEIVING")] public string? Receiving { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "SETTLEMENT")] public string? Settlement { get; set; } /// <summary> /// /// 默认值: ((0)) ///</summary> [SugarColumn(ColumnName = "CGB014")] public decimal? Cgb014 { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")] public string? DemandDepartment { get; set; } @@ -359,13 +345,11 @@ public string? ReceivingDepartment { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "FPREARRIVALDATE")] public DateTime? Fprearrivaldate { get; set; } /// <summary> /// ///</summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string? FdemandbillnoLine { get; set; } MES.Service/service/BasicData/MesRohInManager.cs
@@ -37,15 +37,15 @@ private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); var decimals = mesRohInDatas.Select(s => s.Guid).ToArray(); var update = db.Deleteable<MesRohIn>() .Where(a => a.Id == mesRohIn.Id) .Where(a => a.Guid == mesRohIn.Guid) .ExecuteCommand() > 0; var insertOrUpdate = db .Deleteable<MesRohInData>() .Where(s => decimals.Contains(s.Id)) .Where(s => decimals.Contains(s.Guid)) .ExecuteCommand() > 0; if (update && insertOrUpdate) return true; @@ -56,16 +56,22 @@ private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { if (mesRohIn.Id != null) db.Deleteable<MesRohIn>().Where(s => s.Id == mesRohIn.Id) if (mesRohIn.Guid != null) db.Deleteable<MesRohIn>().Where(s => s.Guid == mesRohIn.Guid) .ExecuteCommand(); if (mesRohInDatas.Count > 0) db.Deleteable<MesRohInData>() .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); var orUpdate = db.Insertable(mesRohIn) .IgnoreColumns(true).ExecuteCommand() > 0; var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1) .IgnoreColumnsNull() .ExecuteCommand() > 0; if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("插入或更新失败"); } @@ -83,8 +89,9 @@ var eid = long.Parse(rohIn.id); var mesRohIn = new MesRohIn(); var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; if (single != null) mesRohIn.Guid = single.Guid; mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; @@ -201,7 +208,8 @@ TotalStoredQty = Convert.ToDecimal(s.FStockInQty), //累计入库数 RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数 SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSrcBillNo, @@ -224,7 +232,7 @@ var single = rohInDataManager.GetSingle(it => it.EbelnK3id == entity.EbelnK3id); if (single != null) entity.Id = single.Id; if (single != null) entity.Guid = single.Guid; return entity; }).ToList();