From 8467a224aaac3dfe516fb72a2eaf7e443311a910 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 01 十二月 2025 14:42:35 +0800
Subject: [PATCH] 采购订单(委外+采购)新增+变更共用 ERP->MES
---
MES.Service/Modes/MesRohInData.cs | 6 +++
MES.Service/service/BasicData/MesRohInManager.cs | 54 ++++++++++++++++++--------
MES.Service/Dto/webApi/ErpRohIn.cs | 16 ++++++-
MES.Service/Dto/webApi/ErpRohinData.cs | 14 ++++--
MES.Service/Modes/MesRohIn.cs | 14 +++++--
5 files changed, 75 insertions(+), 29 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index 9140ed1..4f3e79c 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/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; }// 鎬ユ枡
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 4a6d0ab..aa4bc04 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/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; } // 閿�鍞鍗曞彿
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index ceb9209..7713a62 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index c9e1bd5..fd96cd9 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/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; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 758b087..a08107d 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/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锛孊illNo 涓�瀹氬姞鍚庣紑
+ //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)
--
Gitblit v1.9.3