From a4e262ad5d6b8631e25e3cc0872b590a7dbdb480 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期六, 07 六月 2025 09:56:35 +0800
Subject: [PATCH] 采购订单加字段
---
MESApplication/MESApplication.csproj | 11 +++++++----
MES.Service/Modes/MesRohInData.cs | 14 ++++++++++++--
MES.Service/service/BasicData/MesRohInManager.cs | 4 +++-
MES.Service/Dto/webApi/ErpRohinData.cs | 2 ++
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 8cbe8bc..e0c6931 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -52,4 +52,6 @@
public string? FDemandType { get; set; }
public string? FDemandBillNo { get; set; }
public string? FDemandBillEntrySeq { get; set; }
+ public string? PromiseDate { get; set; }
+ public string? IsNewProduct { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 0e7a344..968afe6 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -35,14 +35,12 @@
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
- // [SugarColumn(ColumnName = "ITEM_NAME")]
[SugarColumn(IsIgnore = true)]
public string? ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
- // [SugarColumn(ColumnName = "ITEM_SPEC")]
[SugarColumn(IsIgnore = true)]
public string? ItemSpec { get; set; }
@@ -365,4 +363,16 @@
/// </summary>
[SugarColumn(ColumnName = "ARRIVE_DATE")]
public DateTime? ArriveDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏂板搧
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_NEW")]
+ public decimal? IsNew { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鎵胯浜ゆ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "PROMISE_DATE")]
+ public DateTime? PromiseDate { 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 640ff4c..7e03d4f 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -181,7 +181,9 @@
Settlement = s.FEntrySettleOrgId,
SettlementOrg = s.FEntrySettleOrgId,
DemandDept = s.FRequireDeptId,
- ReceivingDept = s.FReceiveDeptId
+ ReceivingDept = s.FReceiveDeptId,
+ IsNew = Convert.ToDecimal(s.IsNewProduct),
+ PromiseDate = s.PromiseDate != null ? DateTime.ParseExact(s.PromiseDate, "yyyy-MM-dd HH:mm:ss", null) : null
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MESApplication/MESApplication.csproj b/MESApplication/MESApplication.csproj
index fe80c55..074ace4 100644
--- a/MESApplication/MESApplication.csproj
+++ b/MESApplication/MESApplication.csproj
@@ -9,6 +9,13 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="Controllers\TestReport\**" />
+ <Content Remove="Controllers\TestReport\**" />
+ <EmbeddedResource Remove="Controllers\TestReport\**" />
+ <None Remove="Controllers\TestReport\**" />
+ </ItemGroup>
+
+ <ItemGroup>
<Content Remove="Config\appsettings.json" />
</ItemGroup>
@@ -32,10 +39,6 @@
<ItemGroup>
<ProjectReference Include="..\MES.Service\MES.Service.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Folder Include="Controllers\TestReport\" />
</ItemGroup>
</Project>
--
Gitblit v1.9.3