diff --git a/API/TaskManager.Contracts/Dtos/Dtos.cs b/API/TaskManager.Contracts/Dtos/Dtos.cs
index af50e28..fe6516a 100644
--- a/API/TaskManager.Contracts/Dtos/Dtos.cs
+++ b/API/TaskManager.Contracts/Dtos/Dtos.cs
@@ -1363,48 +1363,249 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_CON_DATE_DETAIL_DTO
{
+
+
+
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
public string SupplierCode { get; set; }
+ ///
+ /// 需求发布版次,取自日物料需求计划接口中的需求发布版次,针对与这个版次的需求进行风险反馈
+ ///
+ [ExporterHeader(DisplayName = "需求发布版次")]
+ [ImporterHeader(Name = "需求发布版次")]
public string ReleaseEdition { get; set; }
+ ///
+ /// 零件号,奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "零件号,奇瑞零件号")]
+ [ImporterHeader(Name = "零件号,奇瑞零件号")]
public string MaterialCode { get; set; }
+ ///
+ /// 工厂代码
+ ///
+ [ExporterHeader(DisplayName = "工厂代码")]
+ [ImporterHeader(Name = "工厂代码")]
public string PlantId { get; set; }
+ ///
+ /// 反馈结果,1-异常;0-无异常(匹配峰值需求缺口,如果可满足峰值,即选择无异常)
+ ///
+ [ExporterHeader(DisplayName = "反馈结果")]
+ [ImporterHeader(Name = "反馈结果")]
public string FeedbackResults { get; set; }
- public string VentureType { get; set; }
- public string VentureSpecific { get; set; }
- public string Measures { get; set; }
+ ///
+ /// 风险类型,当反馈结果=1时,此字段必输1.生产节拍不足2.人员不足3.原材料不足4.设备异常5.其他
+ ///
+ [ExporterHeader(DisplayName = "风险类型")]
+ [ImporterHeader(Name = "风险类型")]
+ public string? VentureType { get; set; }
+ ///
+ /// 具体风险,当反馈结果=1时,此字段必输描述具体风险
+ ///
+ [ExporterHeader(DisplayName = "具体风险")]
+ [ImporterHeader(Name = "具体风险")]
+ public string? VentureSpecific { get; set; }
+ ///
+ /// 应对措施,当反馈结果=1时,此字段必输描述具体应对措施
+ ///
+ [ExporterHeader(DisplayName = "应对措施")]
+ [ImporterHeader(Name = "应对措施")]
+ public string? Measures { get; set; }
+ ///
+ /// 起始日期,格式:yyyy-MM-dd
+ ///
+ [ExporterHeader(DisplayName = "起始日期")]
+ [ImporterHeader(Name = "起始日期")]
public DateTime? StartDate { get; set; }
-
- // QuantityMeet from 1 to 31
- public int QuantityMeet1 { get; set; }
- public int QuantityMeet2 { get; set; }
- public int QuantityMeet3 { get; set; }
- public int QuantityMeet4 { get; set; }
- public int QuantityMeet5 { get; set; }
- public int QuantityMeet6 { get; set; }
- public int QuantityMeet7 { get; set; }
- public int QuantityMeet8 { get; set; }
- public int QuantityMeet9 { get; set; }
- public int QuantityMeet10 { get; set; }
- public int QuantityMeet11 { get; set; }
- public int QuantityMeet12 { get; set; }
- public int QuantityMeet13 { get; set; }
- public int QuantityMeet14 { get; set; }
- public int QuantityMeet15 { get; set; }
- public int QuantityMeet16 { get; set; }
- public int QuantityMeet17 { get; set; }
- public int QuantityMeet18 { get; set; }
- public int QuantityMeet19 { get; set; }
- public int QuantityMeet20 { get; set; }
- public int QuantityMeet21 { get; set; }
- public int QuantityMeet22 { get; set; }
- public int QuantityMeet23 { get; set; }
- public int QuantityMeet24 { get; set; }
- public int QuantityMeet25 { get; set; }
- public int QuantityMeet26 { get; set; }
- public int QuantityMeet27 { get; set; }
- public int QuantityMeet28 { get; set; }
- public int QuantityMeet29 { get; set; }
- public int QuantityMeet30 { get; set; }
- public int QuantityMeet31 { get; set; }
+ ///
+ /// 满足数量1,数量锁定,7日内满足数量必须等于需求数量
+ ///
+ [ExporterHeader(DisplayName = "满足数量1")]
+ [ImporterHeader(Name = "满足数量1")]
+ public decimal? QuantityMeet1 { get; set; }
+ ///
+ /// 满足数量2,
+ ///
+ [ExporterHeader(DisplayName = "满足数量2")]
+ [ImporterHeader(Name = "满足数量2")]
+ public decimal? QuantityMeet2 { get; set; }
+ ///
+ /// 满足数量3,
+ ///
+ [ExporterHeader(DisplayName = "满足数量3")]
+ [ImporterHeader(Name = "满足数量3")]
+ public decimal? QuantityMeet3 { get; set; }
+ ///
+ /// 满足数量4,
+ ///
+ [ExporterHeader(DisplayName = "满足数量4")]
+ [ImporterHeader(Name = "满足数量4")]
+ public decimal? QuantityMeet4 { get; set; }
+ ///
+ /// 满足数量5,
+ ///
+ [ExporterHeader(DisplayName = "满足数量5")]
+ [ImporterHeader(Name = "满足数量5")]
+ public decimal? QuantityMeet5 { get; set; }
+ ///
+ /// 满足数量6,
+ ///
+ [ExporterHeader(DisplayName = "满足数量6")]
+ [ImporterHeader(Name = "满足数量6")]
+ public decimal? QuantityMeet6 { get; set; }
+ ///
+ /// 满足数量7,
+ ///
+ [ExporterHeader(DisplayName = "满足数量7")]
+ [ImporterHeader(Name = "满足数量7")]
+ public decimal? QuantityMeet7 { get; set; }
+ ///
+ /// 满足数量8,根据物料需求计划接口发布的需求天数,针对企业自身产能情况反馈可满足数量注:目前发送数据为滚动12天的数据,13至31天的字段为预留,未来可能会增加至31天
+ ///
+ [ExporterHeader(DisplayName = "满足数量8")]
+ [ImporterHeader(Name = "满足数量8")]
+ public decimal? QuantityMeet8 { get; set; }
+ ///
+ /// 满足数量9,
+ ///
+ [ExporterHeader(DisplayName = "满足数量9")]
+ [ImporterHeader(Name = "满足数量9")]
+ public decimal? QuantityMeet9 { get; set; }
+ ///
+ /// 满足数量10,
+ ///
+ [ExporterHeader(DisplayName = "满足数量10")]
+ [ImporterHeader(Name = "满足数量10")]
+ public decimal? QuantityMeet10 { get; set; }
+ ///
+ /// 满足数量11,
+ ///
+ [ExporterHeader(DisplayName = "满足数量11")]
+ [ImporterHeader(Name = "满足数量11")]
+ public decimal? QuantityMeet11 { get; set; }
+ ///
+ /// 满足数量12,
+ ///
+ [ExporterHeader(DisplayName = "满足数量12")]
+ [ImporterHeader(Name = "满足数量12")]
+ public decimal? QuantityMeet12 { get; set; }
+ ///
+ /// 满足数量13,
+ ///
+ [ExporterHeader(DisplayName = "满足数量13")]
+ [ImporterHeader(Name = "满足数量13")]
+ public decimal? QuantityMeet13 { get; set; }
+ ///
+ /// 满足数量14,
+ ///
+ [ExporterHeader(DisplayName = "满足数量14")]
+ [ImporterHeader(Name = "满足数量14")]
+ public decimal? QuantityMeet14 { get; set; }
+ ///
+ /// 满足数量15,
+ ///
+ [ExporterHeader(DisplayName = "满足数量15")]
+ [ImporterHeader(Name = "满足数量15")]
+ public decimal? QuantityMeet15 { get; set; }
+ ///
+ /// 满足数量16,
+ ///
+ [ExporterHeader(DisplayName = "满足数量16")]
+ [ImporterHeader(Name = "满足数量16")]
+ public decimal? QuantityMeet16 { get; set; }
+ ///
+ /// 满足数量17,
+ ///
+ [ExporterHeader(DisplayName = "满足数量17")]
+ [ImporterHeader(Name = "满足数量17")]
+ public decimal? QuantityMeet17 { get; set; }
+ ///
+ /// 满足数量18,
+ ///
+ [ExporterHeader(DisplayName = "满足数量18")]
+ [ImporterHeader(Name = "满足数量18")]
+ public decimal? QuantityMeet18 { get; set; }
+ ///
+ /// 满足数量19,
+ ///
+ [ExporterHeader(DisplayName = "满足数量19")]
+ [ImporterHeader(Name = "满足数量19")]
+ public decimal? QuantityMeet19 { get; set; }
+ ///
+ /// 满足数量20,
+ ///
+ [ExporterHeader(DisplayName = "满足数量20")]
+ [ImporterHeader(Name = "满足数量20")]
+ public decimal? QuantityMeet20 { get; set; }
+ ///
+ /// 满足数量21,
+ ///
+ [ExporterHeader(DisplayName = "满足数量21")]
+ [ImporterHeader(Name = "满足数量21")]
+ public decimal? QuantityMeet21 { get; set; }
+ ///
+ /// 满足数量22,
+ ///
+ [ExporterHeader(DisplayName = "满足数量22")]
+ [ImporterHeader(Name = "满足数量22")]
+ public decimal? QuantityMeet22 { get; set; }
+ ///
+ /// 满足数量23,
+ ///
+ [ExporterHeader(DisplayName = "满足数量23")]
+ [ImporterHeader(Name = "满足数量23")]
+ public decimal? QuantityMeet23 { get; set; }
+ ///
+ /// 满足数量24,
+ ///
+ [ExporterHeader(DisplayName = "满足数量24")]
+ [ImporterHeader(Name = "满足数量24")]
+ public decimal? QuantityMeet24 { get; set; }
+ ///
+ /// 满足数量25,
+ ///
+ [ExporterHeader(DisplayName = "满足数量25")]
+ [ImporterHeader(Name = "满足数量25")]
+ public decimal? QuantityMeet25 { get; set; }
+ ///
+ /// 满足数量26,
+ ///
+ [ExporterHeader(DisplayName = "满足数量26")]
+ [ImporterHeader(Name = "满足数量26")]
+ public decimal? QuantityMeet26 { get; set; }
+ ///
+ /// 满足数量27,
+ ///
+ [ExporterHeader(DisplayName = "满足数量27")]
+ [ImporterHeader(Name = "满足数量27")]
+ public decimal? QuantityMeet27 { get; set; }
+ ///
+ /// 满足数量28,
+ ///
+ [ExporterHeader(DisplayName = "满足数量28")]
+ [ImporterHeader(Name = "满足数量28")]
+ public decimal? QuantityMeet28 { get; set; }
+ ///
+ /// 满足数量29,
+ ///
+ [ExporterHeader(DisplayName = "满足数量29")]
+ [ImporterHeader(Name = "满足数量29")]
+ public decimal? QuantityMeet29 { get; set; }
+ ///
+ /// 满足数量30,
+ ///
+ [ExporterHeader(DisplayName = "满足数量30")]
+ [ImporterHeader(Name = "满足数量30")]
+ public decimal? QuantityMeet30 { get; set; }
+ ///
+ /// 满足数量31,
+ ///
+ [ExporterHeader(DisplayName = "满足数量31")]
+ [ImporterHeader(Name = "满足数量31")]
+ public decimal? QuantityMeet31 { get; set; }
}
public class SUPPLIER_CON_DATE_DTO
@@ -1444,14 +1645,54 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_CON_PO_DETAIL_DTO
{
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
public string SupplierCode { get; set; }
+ ///
+ /// 采购订单号
+ ///
+ [ExporterHeader(DisplayName = "采购订单号")]
+ [ImporterHeader(Name = "采购订单号")]
public string PurchaseOrder { get; set; }
+ ///
+ /// 行项目号
+ ///
+ [ExporterHeader(DisplayName = "行项目号")]
+ [ImporterHeader(Name = "行项目号")]
public string SerialNumber { get; set; }
- public int QuantityMeet { get; set; }
+ ///
+ /// 满足数量
+ ///
+ [ExporterHeader(DisplayName = "满足数量")]
+ [ImporterHeader(Name = "满足数量")]
+ public decimal? QuantityMeet { get; set; }
+ ///
+ /// 反馈结果,1-异常;0-无异常(匹配峰值需求缺口,如果可满足峰值,即选择无异常)
+ ///
+ [ExporterHeader(DisplayName = "反馈结果")]
+ [ImporterHeader(Name = "反馈结果")]
public string FeedbackResults { get; set; }
- public string VentureType { get; set; }
- public string VentureSpecific { get; set; }
- public string Measures { get; set; }
+ ///
+ /// 风险类型,当反馈结果=1时,此字段必输1.生产节拍不足2.人员不足3.原材料不足4.设备异常5.其他
+ ///
+ [ExporterHeader(DisplayName = "风险类型")]
+ [ImporterHeader(Name = "风险类型")]
+ public string? VentureType { get; set; }
+ ///
+ /// 具体风险,当反馈结果=1时,此字段必输描述具体风险
+ ///
+ [ExporterHeader(DisplayName = "具体风险")]
+ [ImporterHeader(Name = "具体风险")]
+ public string? VentureSpecific { get; set; }
+ ///
+ /// 应对措施,当反馈结果=1时,此字段必输描述具体应对措施
+ ///
+ [ExporterHeader(DisplayName = "应对措施")]
+ [ImporterHeader(Name = "应对措施")]
+ public string? Measures { get; set; }
}
public class SUPPLIER_CON_PO_DTO
diff --git a/API/Wood.Service/Controllers/CherySupplierEmployeeService.cs b/API/Wood.Service/Controllers/CherySupplierEmployeeService.cs
index 8643e30..061b523 100644
--- a/API/Wood.Service/Controllers/CherySupplierEmployeeService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierEmployeeService.cs
@@ -17,7 +17,7 @@ namespace TaskManager.Controllers
protected override async Task UpdateAfter(List list)
{
- var infolist = await _jobDbContext.SUPPLIER_EMPLOYEE.ToListAsync();
+ var infolist = await _jobDbContext.SUPPLIER_EMPLOYEE_DT.ToListAsync();
var query = from itm in infolist
diff --git a/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs b/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs
index da25f19..0cdcbc2 100644
--- a/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierProProcessEquipmentService.cs
@@ -19,7 +19,7 @@ namespace TaskManager.Controllers
protected override async Task UpdateAfter(List list)
{
- var infolist = await _jobDbContext.SUPPLIER_PRO_PROCESS_EQUIPMENT.ToListAsync();
+ var infolist = await _jobDbContext.SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.ToListAsync();
var query = from itm in infolist