| MES.Service/Dto/webApi/ErpRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Dto/webApi/ErpRohinData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohIn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/Modes/MesRohInData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| MES.Service/service/BasicData/MesRohInManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
MES.Service/Dto/webApi/ErpRohIn.cs
@@ -36,9 +36,19 @@ public string? FTContact { get; set; } public string? Fmobilephone { get; set; } public string? FixedTelephone { get; set; } public string? FixedTelephone { get; set; }// public string? Address { get; set; } public string? FProviderAddress { get; set; }//供货方地址 public string? Acctype { get; set; } public string? F_UNW_GYSLXR { get; set; }// 供应商联系人 public string? F_UNW_LXRDH { get; set; }// 联系人电话 public string? FProviderJob { get; set; }// 职务 public string? FProviderPhone { get; set; }// 手机 public string? FACCTYPE { get; set; }// 验收方式 public string? F_UNW_Remarks_zlyq { get; set; }// 质量要求 public string? F_UNW_Text_ysfs { get; set; }// 运输方式 public string? F_UNW_BZ { get; set; }// 备注 public string? F_UNW_Combo_zjmj { get; set; }// 治具丶模具加工及采购 public string? FUrgent_Material { get; set; }// 急料 } MES.Service/Dto/webApi/ErpRohinData.cs
@@ -13,9 +13,9 @@ public string? FStockUnitID { get; set; } public string? FPriceUnitId { get; set; } public string? FPriceUnitQty { get; set; } public string? FDeliveryDate { get; set; } public string? FDeliveryEarlyDate { get; set; } public string? FDeliveryLastDate { get; set; } public string? FDeliveryDate { get; set; }//交货日期 public string? FDeliveryEarlyDate { get; set; }//最早交货日期 public string? FDeliveryLastDate { get; set; }//最晚交货日期 public string? FRequireOrgId { get; set; } public string? FRequireDeptId { get; set; } public string? FReceiveOrgId { get; set; } @@ -43,7 +43,7 @@ public string? FStockInQty { get; set; } //累计入库数 public string? FCHECKRETQTY { get; set; } //收料可退数 public string? FSTOCKRETQTY { get; set; } //库存可退数 public string? FSrcBillTypeId { get; set; } public string? FBillTypeID { get; set; }//采购单别 public string? FSrcBillNo { get; set; } public string? FReqTraceNo { get; set; } public string? FMtoNo { get; set; } @@ -51,5 +51,9 @@ public string? FDEMANDTYPE { get; set; } public string? FDEMANDBILLENTRYSEQ { get; set; } public string? FDEMANDBILLENTRYSEQ { get; set; }// 采购订单行号 public string? FUrgent_Material { get; set; }//急料 public string? DELIVERY_DATE { get; set; }//交货日期 public string? F_UNW_Text_xsddh { get; set; } // 销售订单号 } MES.Service/Modes/MesRohIn.cs
@@ -214,25 +214,25 @@ public string? Remark1 { get; set; } /// <summary> /// 自定义字段2 /// 自定义字段2，供应商联系人 /// </summary> [SugarColumn(ColumnName = "REMARK2")] public string? Remark2 { get; set; } /// <summary> /// 自定义字段3 /// 自定义字段3，联系人电话 /// </summary> [SugarColumn(ColumnName = "REMARK3")] public string? Remark3 { get; set; } /// <summary> /// 自定义字段4 /// 自定义字段4，职务 /// </summary> [SugarColumn(ColumnName = "REMARK4")] public string? Remark4 { get; set; } /// <summary> /// 自定义字段5 /// 自定义字段5，联系电话 /// </summary> [SugarColumn(ColumnName = "REMARK5")] public string? Remark5 { get; set; } @@ -302,4 +302,10 @@ /// </summary> [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")] public DateTime? SynchronousDate { get; set; } /// <summary> /// 急料 /// </summary> [SugarColumn(ColumnName = "urgent_material")] public string? urgent_material { get; set; } } MES.Service/Modes/MesRohInData.cs
@@ -353,4 +353,10 @@ /// </summary> [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")] public string? FdemandbillnoLine { get; set; } /// <summary> /// 自定义字段5，急料 /// </summary> [SugarColumn(ColumnName = "REMARK5")] public string? Remark5 { get; set; } } MES.Service/service/BasicData/MesRohInManager.cs
@@ -4,6 +4,7 @@ using MES.Service.Modes; using SqlSugar; using System.Globalization; using System.Security.AccessControl; namespace MES.Service.service.BasicData; @@ -19,6 +20,11 @@ var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas); //1 | 未实现 | 抛出异常 //2 | 审核 | 调用 SaveOrUpdateData，正常插入/更新 //3 | 反审核 | 调用 SaveOrUpdateData，BillNo 一定加后缀 //4 | 手工同步 | 调用 SaveOrUpdateData，正常插入/更新 //5 | 未注释 | 调用 SaveOrUpdateData，正常插入/更新 return UseTransaction(db => { return rohInErpRohIn.Type switch @@ -159,9 +165,20 @@ mesRohIn.Anred = rohIn.FTContact; mesRohIn.Telf1 = rohIn.Fmobilephone; mesRohIn.FixedTelephone = rohIn.FixedTelephone; mesRohIn.Address = rohIn.Address; mesRohIn.Acctype = rohIn.Acctype; mesRohIn.Address = rohIn.FProviderAddress;//供货方地址 mesRohIn.SynchronousDate = DateTime.Now; mesRohIn.Remark2= rohIn.F_UNW_GYSLXR;// 供应商联系人 mesRohIn.Remark3= rohIn.F_UNW_LXRDH;// 联系人电话 mesRohIn.Remark4 = rohIn.FProviderJob;// 职务 mesRohIn.Remark5 = rohIn.FProviderPhone;// 手机 mesRohIn.QtyAcceptance = rohIn.FACCTYPE;//验收方式 mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;//质量要求 mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;//运输方式 mesRohIn.Remarks = rohIn.F_UNW_BZ;//备注 mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;//治具丶模具加工及采购 mesRohIn.urgent_material = rohIn.FUrgent_Material;//急料 return mesRohIn; } @@ -204,21 +221,21 @@ BusinessClose = s.FMRPCloseStatus, BusinessFreeze = s.FMRPFreezeStatus, Freezer = s.FFreezerId, //FreezeTime = !string.IsNullOrEmpty(s.FFreezeDate) // && DateTime.TryParseExact(s.FFreezeDate, // new[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd" }, // 支持多种格式 // CultureInfo.InvariantCulture, // DateTimeStyles.None, // out var parsedDate) // && parsedDate > new DateTime(1900, 1, 1) // ? parsedDate // : (DateTime?)null, FreezeTime = !string.IsNullOrEmpty(s.FFreezeDate) && DateTime.TryParseExact(s.FFreezeDate, new[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd" }, // 支持多种格式 CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate) && parsedDate > new DateTime(1900, 1, 1) ? parsedDate : (DateTime?)null, BusinessTerminate = s.FMRPTerminateStatus, Terminator = s.FTerminaterId, //TerminateTime = s.FTerminateDate != null // ? DateTime.ParseExact(s.FTerminateDate, // "yyyy-MM-dd HH:mm:ss", null) // : null, 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), @@ -228,7 +245,7 @@ ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), //收料可退数 ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), //库存可退数 SourceDocumentType = s.FSrcBillTypeId, SourceDocumentType = s.FBillTypeID,//采购单别 SourceDocumentId = s.FSrcBillNo, DemandTrackingId = s.FReqTraceNo, PlanTrackingId = s.FMtoNo, @@ -244,7 +261,10 @@ Receiving = s.FReceiveOrgId, Settlement = s.FSETTLEORGID, DemandDepartment = s.FRequireDeptId, ReceivingDepartment = s.FReceiveDeptId ReceivingDepartment = s.FReceiveDeptId, Remark5 = s.FUrgent_Material, //急料 SalesOrderId = s.F_UNW_Text_xsddh }; if (s.FFreezeDate != null)
