Browse Source

更新版本

master
赵新宇 2 weeks ago
parent
commit
84fbd0f072
  1. 18
      API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs
  2. 10
      API/TaskManager.Contracts/Dtos/Dtos.cs
  3. 2
      API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
  4. 2
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

18
API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs

@ -7,6 +7,7 @@ namespace TaskManager.Entity.Entitys
/// </summary>
public class SUPPLIER_CON_MMRP_DTO
{
/// <summary>
/// 供应商代码
/// </summary>
@ -66,37 +67,37 @@ namespace TaskManager.Entity.Entitys
/// </summary>
[ExporterHeader(DisplayName = "满足数量1")]
[ImporterHeader(Name = "满足数量1")]
public decimal QuantityMeet1 { get; set; }
public decimal? QuantityMeet1 { get; set; }
/// <summary>
/// 满足数量2
/// </summary>
[ExporterHeader(DisplayName = "满足数量2")]
[ImporterHeader(Name = "满足数量2")]
public decimal QuantityMeet2 { get; set; }
public decimal? QuantityMeet2 { get; set; }
/// <summary>
/// 满足数量3
/// </summary>
[ExporterHeader(DisplayName = "满足数量3")]
[ImporterHeader(Name = "满足数量3")]
public decimal QuantityMeet3 { get; set; }
public decimal? QuantityMeet3 { get; set; }
/// <summary>
/// 满足数量4
/// </summary>
[ExporterHeader(DisplayName = "满足数量4")]
[ImporterHeader(Name = "满足数量4")]
public decimal QuantityMeet4 { get; set; }
public decimal? QuantityMeet4 { get; set; }
/// <summary>
/// 满足数量5
/// </summary>
[ExporterHeader(DisplayName = "满足数量5")]
[ImporterHeader(Name = "满足数量5")]
public decimal QuantityMeet5 { get; set; }
public decimal? QuantityMeet5 { get; set; }
/// <summary>
/// 满足数量6
/// </summary>
[ExporterHeader(DisplayName = "满足数量6")]
[ImporterHeader(Name = "满足数量6")]
public decimal QuantityMeet6 { get; set; }
public decimal? QuantityMeet6 { get; set; }
/// <summary>
/// 满足数量7
/// </summary>
@ -133,6 +134,11 @@ namespace TaskManager.Entity.Entitys
[ExporterHeader(DisplayName = "满足数量12")]
[ImporterHeader(Name = "满足数量12")]
public decimal? QuantityMeet12 { get; set; }
}
}

10
API/TaskManager.Contracts/Dtos/Dtos.cs

@ -1365,7 +1365,6 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
{
/// <summary>
/// 供应商代码
/// </summary>
@ -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
{
/// <summary>
/// 供应商代码
/// </summary>
@ -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

2
API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
<History>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||;</History>
<History>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||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

2
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);

Loading…
Cancel
Save