diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
index 5d9649f..5bb56ae 100644
--- a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
@@ -5,86 +5,86 @@ namespace TaskManager.Entity
///
/// 供应商共享库存
///
- public class SUPPLIER_SINV_DATA_DTO
- {
- ///
- /// 供应商代码
- ///
- [ExporterHeader(DisplayName = "供应商代码")]
- [ImporterHeader(Name = "供应商代码")]
- public string SupplierCode { get; set; }
- ///
- /// 供应商名称
- ///
- [ExporterHeader(DisplayName = "供应商名称")]
- [ImporterHeader(Name = "供应商名称")]
- public string SupplierName { get; set; }
- ///
- /// 零件号
- ///
- [ExporterHeader(DisplayName = "零件号")]
- [ImporterHeader(Name = "零件号")]
- public string MaterialCode { get; set; }
- ///
- /// 零件名称
- ///
- [ExporterHeader(DisplayName = "零件名称")]
- [ImporterHeader(Name = "零件名称")]
- public string MaterialDescription { get; set; }
- ///
- /// 物料类型(成品,半成品,原材料)
- ///
- [ExporterHeader(DisplayName = "物料类型")]
- [ImporterHeader(Name = "物料类型")]
- public string MaterialType { get; set; }
- ///
- /// 当前库存数量
- ///
- [ExporterHeader(DisplayName = "当前库存数量")]
- [ImporterHeader(Name = "当前库存数量")]
- public decimal QuantityCurrent { get; set; }
- ///
- /// 原材料在途数量
- ///
- [ExporterHeader(DisplayName = "原材料在途数量")]
- [ImporterHeader(Name = "原材料在途数量")]
- public decimal QuantityPlan { get; set; }
- ///
- /// 库存状态(生产件,呆滞件,备件,KD件)
- ///
- [ExporterHeader(DisplayName = "库存状态")]
- [ImporterHeader(Name = "库存状态")]
- public string InventoryStatus { get; set; }
- ///
- /// 安全库存
- ///
- [ExporterHeader(DisplayName = "安全库存")]
- [ImporterHeader(Name = "安全库存")]
- public decimal SafetyStock { get; set; }
- ///
- /// 生产/采购周期:成品即半成品为生产周期(天),原材料为采购周期(天)
- ///
- [ExporterHeader(DisplayName = "生产/采购周期")]
- [ImporterHeader(Name = "生产/采购周期")]
- public string ProductionCycle { get; set; }
- ///
- /// 库存更新时间-格式:yyyy-MM-ddHH:mm:ss
- ///
- [ExporterHeader(DisplayName = "库存更新时间")]
- [ImporterHeader(Name = "库存更新时间")]
- public string DataUpdateTime { get; set; }
- ///
- /// 批次
- ///
- [ExporterHeader(DisplayName = "批次")]
- [ImporterHeader(Name = "批次")]
- public string? SupplierBatch { get; set; }
- ///
- /// 有效期截止日期 非必填
- ///
- [ExporterHeader(DisplayName = "有效期截止日期")]
- [ImporterHeader(Name = "有效期截止日期")]
- public string? SupplieryxqDate { get; set; }
- }
+ //public class SUPPLIER_SINV_DATA_DTO
+ //{
+ // ///
+ // /// 供应商代码
+ // ///
+ // [ExporterHeader(DisplayName = "供应商代码")]
+ // [ImporterHeader(Name = "供应商代码")]
+ // public string SupplierCode { get; set; }
+ // ///
+ // /// 供应商名称
+ // ///
+ // [ExporterHeader(DisplayName = "供应商名称")]
+ // [ImporterHeader(Name = "供应商名称")]
+ // public string SupplierName { get; set; }
+ // ///
+ // /// 零件号
+ // ///
+ // [ExporterHeader(DisplayName = "零件号")]
+ // [ImporterHeader(Name = "零件号")]
+ // public string MaterialCode { get; set; }
+ // ///
+ // /// 零件名称
+ // ///
+ // [ExporterHeader(DisplayName = "零件名称")]
+ // [ImporterHeader(Name = "零件名称")]
+ // public string MaterialDescription { get; set; }
+ // ///
+ // /// 物料类型(成品,半成品,原材料)
+ // ///
+ // [ExporterHeader(DisplayName = "物料类型")]
+ // [ImporterHeader(Name = "物料类型")]
+ // public string MaterialType { get; set; }
+ // ///
+ // /// 当前库存数量
+ // ///
+ // [ExporterHeader(DisplayName = "当前库存数量")]
+ // [ImporterHeader(Name = "当前库存数量")]
+ // public decimal QuantityCurrent { get; set; }
+ // ///
+ // /// 原材料在途数量
+ // ///
+ // [ExporterHeader(DisplayName = "原材料在途数量")]
+ // [ImporterHeader(Name = "原材料在途数量")]
+ // public decimal QuantityPlan { get; set; }
+ // ///
+ // /// 库存状态(生产件,呆滞件,备件,KD件)
+ // ///
+ // [ExporterHeader(DisplayName = "库存状态")]
+ // [ImporterHeader(Name = "库存状态")]
+ // public string InventoryStatus { get; set; }
+ // ///
+ // /// 安全库存
+ // ///
+ // [ExporterHeader(DisplayName = "安全库存")]
+ // [ImporterHeader(Name = "安全库存")]
+ // public decimal SafetyStock { get; set; }
+ // ///
+ // /// 生产/采购周期:成品即半成品为生产周期(天),原材料为采购周期(天)
+ // ///
+ // [ExporterHeader(DisplayName = "生产/采购周期")]
+ // [ImporterHeader(Name = "生产/采购周期")]
+ // public string ProductionCycle { get; set; }
+ // ///
+ // /// 库存更新时间-格式:yyyy-MM-ddHH:mm:ss
+ // ///
+ // [ExporterHeader(DisplayName = "库存更新时间")]
+ // [ImporterHeader(Name = "库存更新时间")]
+ // public string DataUpdateTime { get; set; }
+ // ///
+ // /// 批次
+ // ///
+ // [ExporterHeader(DisplayName = "批次")]
+ // [ImporterHeader(Name = "批次")]
+ // public string? SupplierBatch { get; set; }
+ // ///
+ // /// 有效期截止日期 非必填
+ // ///
+ // [ExporterHeader(DisplayName = "有效期截止日期")]
+ // [ImporterHeader(Name = "有效期截止日期")]
+ // public string? SupplieryxqDate { get; set; }
+ //}
}
diff --git a/API/TaskManager.Contracts/Dtos/Dtos.cs b/API/TaskManager.Contracts/Dtos/Dtos.cs
index df0335f..a99f0d6 100644
--- a/API/TaskManager.Contracts/Dtos/Dtos.cs
+++ b/API/TaskManager.Contracts/Dtos/Dtos.cs
@@ -1493,19 +1493,90 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_SINV_DATA_DETAIL_DTO:CherryReadBaseEntityDto
{
- public string SupplierCode { get; set; }
- public string SupplierName { get; set; }
- public string MaterialCode { get; set; }
- public string MaterialDescription { get; set; }
- public string MaterialType { get; set; }
- public int QuantityCurrent { get; set; }
- public int QuantityPlan { get; set; }
- public string InventoryStatus { get; set; }
- public int SafetyStock { get; set; }
- public string ProductionCycle { get; set; }
- public string DataUpdateTime { get; set; }
- public string SupplierBatch { get; set; }
- public string SupplieryxqDate { get; set; }
+ ///
+ /// 供应商共享库存
+ ///
+ public class SUPPLIER_SINV_DATA_DTO
+ {
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 零件号
+ ///
+ [ExporterHeader(DisplayName = "零件号")]
+ [ImporterHeader(Name = "零件号")]
+ public string MaterialCode { get; set; }
+ ///
+ /// 零件名称
+ ///
+ [ExporterHeader(DisplayName = "零件名称")]
+ [ImporterHeader(Name = "零件名称")]
+ public string MaterialDescription { get; set; }
+ ///
+ /// 物料类型(成品,半成品,原材料)
+ ///
+ [ExporterHeader(DisplayName = "物料类型")]
+ [ImporterHeader(Name = "物料类型")]
+ public string MaterialType { get; set; }
+ ///
+ /// 当前库存数量
+ ///
+ [ExporterHeader(DisplayName = "当前库存数量")]
+ [ImporterHeader(Name = "当前库存数量")]
+ public decimal QuantityCurrent { get; set; }
+ ///
+ /// 原材料在途数量
+ ///
+ [ExporterHeader(DisplayName = "原材料在途数量")]
+ [ImporterHeader(Name = "原材料在途数量")]
+ public decimal QuantityPlan { get; set; }
+ ///
+ /// 库存状态(生产件,呆滞件,备件,KD件)
+ ///
+ [ExporterHeader(DisplayName = "库存状态")]
+ [ImporterHeader(Name = "库存状态")]
+ public string InventoryStatus { get; set; }
+ ///
+ /// 安全库存
+ ///
+ [ExporterHeader(DisplayName = "安全库存")]
+ [ImporterHeader(Name = "安全库存")]
+ public decimal SafetyStock { get; set; }
+ ///
+ /// 生产/采购周期:成品即半成品为生产周期(天),原材料为采购周期(天)
+ ///
+ [ExporterHeader(DisplayName = "生产/采购周期")]
+ [ImporterHeader(Name = "生产/采购周期")]
+ public string ProductionCycle { get; set; }
+ ///
+ /// 库存更新时间-格式:yyyy-MM-ddHH:mm:ss
+ ///
+ [ExporterHeader(DisplayName = "库存更新时间")]
+ [ImporterHeader(Name = "库存更新时间")]
+ public string DataUpdateTime { get; set; }
+ ///
+ /// 批次
+ ///
+ [ExporterHeader(DisplayName = "批次")]
+ [ImporterHeader(Name = "批次")]
+ public string? SupplierBatch { get; set; }
+ ///
+ /// 有效期截止日期 非必填
+ ///
+ [ExporterHeader(DisplayName = "有效期截止日期")]
+ [ImporterHeader(Name = "有效期截止日期")]
+ public string? SupplieryxqDate { get; set; }
+ }
}
public class SUPPLIER_SINV_DATA_DTO
diff --git a/API/Wood.Service/Controllers/CherySupplierConDateService.cs b/API/Wood.Service/Controllers/CherySupplierConDateService.cs
index d55f0a4..ff3f455 100644
--- a/API/Wood.Service/Controllers/CherySupplierConDateService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierConDateService.cs
@@ -7,6 +7,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
+ ///
+ /// 日物料需求计划风险确认
+ ///
public class CherySupplierConDateService : CheryRecurringJobInputPageController
{
public CherySupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs b/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
index 77d9b96..d01c45f 100644
--- a/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
@@ -11,6 +11,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
+ ///
+ /// M+6月物料需求计划风险确认
+ ///
public class CherySupplierConMmrpService : CheryRecurringJobInputPageController
{
public CherySupplierConMmrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierConPoService.cs b/API/Wood.Service/Controllers/CherySupplierConPoService.cs
index 545ff5b..162e573 100644
--- a/API/Wood.Service/Controllers/CherySupplierConPoService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierConPoService.cs
@@ -7,6 +7,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
+ ///
+ /// 采购订单风险确认
+ ///
public class CherySupplierConPoService : CheryRecurringJobInputPageController
{
public CherySupplierConPoService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierDelStateService.cs b/API/Wood.Service/Controllers/CherySupplierDelStateService.cs
index 7831d32..4b38ef9 100644
--- a/API/Wood.Service/Controllers/CherySupplierDelStateService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierDelStateService.cs
@@ -6,7 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //看板配送单
+ ///
+ /// 看板送货单
+ ///
public class CherySupplierDelStateService : CheryRecurringJobOutPageController
{
public CherySupplierDelStateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierInvDataService.cs b/API/Wood.Service/Controllers/CherySupplierInvDataService.cs
index 81bcf52..4697e70 100644
--- a/API/Wood.Service/Controllers/CherySupplierInvDataService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierInvDataService.cs
@@ -6,7 +6,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //奇瑞RDC共享库存
+
+ ///
+ /// 奇瑞RDC共享库存
+ ///
public class SupplierInvDataService : CheryRecurringJobOutPageController
{
public SupplierInvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs b/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
index e4f69e0..6a6c10e 100644
--- a/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
@@ -8,7 +8,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //日物料需求计划
+
+ ///
+ /// 日物料需求计划
+ ///
public class CherySupplierMrpDataService : CheryRecurringJobOutPageController
{
public CherySupplierMrpDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierMrpService.cs b/API/Wood.Service/Controllers/CherySupplierMrpService.cs
index bbef44b..5d1c1c2 100644
--- a/API/Wood.Service/Controllers/CherySupplierMrpService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierMrpService.cs
@@ -6,7 +6,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //日MRP状态监控
+
+ ///
+ /// 日MRP状态监控
+ ///
public class CherySupplierMrpService : CheryRecurringJobOutPageController
{
public CherySupplierMrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs b/API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs
index 30e52e2..19fe162 100644
--- a/API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs
@@ -7,6 +7,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//日MRP预警推移
+
+ ///
+ /// 日MRP预警推移
+ ///
public class CherySupplierMrpWarningService : CheryRecurringJobOutPageController
{
public CherySupplierMrpWarningService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs b/API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs
index f0a0ae2..80a1461 100644
--- a/API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs
@@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //过焊装未过总装
+
+ ///
+ /// 过焊装未过总装
+ ///
public class CherySupplierPorHSCHEDULService : CheryRecurringJobOutPageController
{
public CherySupplierPorHSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs b/API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs
index 1280504..c7b9b9e 100644
--- a/API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs
@@ -6,6 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
+ ///
+ /// 排序供货
+ ///
public class CherySupplierProCSCHEDULService : CheryRecurringJobOutPageController
{
public CherySupplierProCSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierProPlanService.cs b/API/Wood.Service/Controllers/CherySupplierProPlanService.cs
index 851af3c..1ad091a 100644
--- a/API/Wood.Service/Controllers/CherySupplierProPlanService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierProPlanService.cs
@@ -6,6 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//整车月度生产计划
+ ///
+ /// 整车月度生产计划
+ ///
public class SupplierProPlaningService : CheryRecurringJobOutPageController
{
public SupplierProPlaningService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs b/API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs
index fa30e32..69465e9 100644
--- a/API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs
@@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //过涂装未过总装
+
+ ///
+ /// 过涂装未过总装
+ ///
public class CherySupplierProTSCHEDULService : CheryRecurringJobOutPageController
{
public CherySupplierProTSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierReturnService.cs b/API/Wood.Service/Controllers/CherySupplierReturnService.cs
index 4f80b7c..3e0d26e 100644
--- a/API/Wood.Service/Controllers/CherySupplierReturnService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierReturnService.cs
@@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- //退货单
+
+ ///
+ /// 退货单
+ ///
public class CherySupplierReturnService : CheryRecurringJobOutPageController
{
public CherySupplierReturnService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
diff --git a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
index 1f0887e..4a32a8d 100644
--- a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
@@ -6,7 +6,7 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- public class CherySupplierSinvDataService : CheryRecurringJobOutPageController
+ public class CherySupplierSinvDataService : CheryRecurringJobInputPageController
{
public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
{