From 84fbd0f072c543f8e6fa82a04562da444b8b27b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Mon, 30 Jun 2025 14:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs | 18 ++++++++++++------
API/TaskManager.Contracts/Dtos/Dtos.cs | 10 +++++++++-
.../PublishProfiles/FolderProfile.pubxml.user | 2 +-
.../CheryRecurringJobInputPageController.cs | 2 ++
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs
index 21ef18b..78580f4 100644
--- a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs
@@ -7,6 +7,7 @@ namespace TaskManager.Entity.Entitys
///
public class SUPPLIER_CON_MMRP_DTO
{
+
///
/// 供应商代码
///
@@ -66,37 +67,37 @@ namespace TaskManager.Entity.Entitys
///
[ExporterHeader(DisplayName = "满足数量1")]
[ImporterHeader(Name = "满足数量1")]
- public decimal QuantityMeet1 { get; set; }
+ public decimal? QuantityMeet1 { get; set; }
///
/// 满足数量2
///
[ExporterHeader(DisplayName = "满足数量2")]
[ImporterHeader(Name = "满足数量2")]
- public decimal QuantityMeet2 { get; set; }
+ public decimal? QuantityMeet2 { get; set; }
///
/// 满足数量3
///
[ExporterHeader(DisplayName = "满足数量3")]
[ImporterHeader(Name = "满足数量3")]
- public decimal QuantityMeet3 { get; set; }
+ public decimal? QuantityMeet3 { get; set; }
///
/// 满足数量4
///
[ExporterHeader(DisplayName = "满足数量4")]
[ImporterHeader(Name = "满足数量4")]
- public decimal QuantityMeet4 { get; set; }
+ public decimal? QuantityMeet4 { get; set; }
///
/// 满足数量5
///
[ExporterHeader(DisplayName = "满足数量5")]
[ImporterHeader(Name = "满足数量5")]
- public decimal QuantityMeet5 { get; set; }
+ public decimal? QuantityMeet5 { get; set; }
///
/// 满足数量6
///
[ExporterHeader(DisplayName = "满足数量6")]
[ImporterHeader(Name = "满足数量6")]
- public decimal QuantityMeet6 { get; set; }
+ public decimal? QuantityMeet6 { get; set; }
///
/// 满足数量7
///
@@ -133,6 +134,11 @@ namespace TaskManager.Entity.Entitys
[ExporterHeader(DisplayName = "满足数量12")]
[ImporterHeader(Name = "满足数量12")]
public decimal? QuantityMeet12 { get; set; }
+
+
+
+
+
}
}
diff --git a/API/TaskManager.Contracts/Dtos/Dtos.cs b/API/TaskManager.Contracts/Dtos/Dtos.cs
index fe6516a..60a4afb 100644
--- a/API/TaskManager.Contracts/Dtos/Dtos.cs
+++ b/API/TaskManager.Contracts/Dtos/Dtos.cs
@@ -1365,7 +1365,6 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
{
-
///
/// 供应商代码
///
@@ -1606,6 +1605,12 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
[ExporterHeader(DisplayName = "满足数量31")]
[ImporterHeader(Name = "满足数量31")]
public decimal? QuantityMeet31 { get; set; }
+
+
+
+
+
+
}
public class SUPPLIER_CON_DATE_DTO
@@ -1645,6 +1650,7 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_CON_PO_DETAIL_DTO
{
+
///
/// 供应商代码
///
@@ -1693,6 +1699,8 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
[ExporterHeader(DisplayName = "应对措施")]
[ImporterHeader(Name = "应对措施")]
public string? Measures { get; set; }
+
+
}
public class SUPPLIER_CON_PO_DTO
diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index a496986..3946d67 100644
--- a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -3,7 +3,7 @@
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\
- True|2025-06-30T01:23:23.0780295Z||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;
+ True|2025-06-30T06:40:36.2678533Z||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;
\ No newline at end of file
diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
index cb48147..91227c3 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
@@ -294,6 +294,8 @@ namespace TaskManager.Controllers
log.TaskId = sub.TaskId;
log.WriteState = true;
log.ReadState = true;
+ log.CreationTime = DateTime.Now;
+
logs.Add(log);
}
_jobDbContext.BulkInsert(logs, options => options.UseTableLock = true);