diff --git a/API/TaskManager.Contracts/Dtos/10_17/Class1.cs b/API/TaskManager.Contracts/Dtos/10_17/Class1.cs
deleted file mode 100644
index c8dfe71..0000000
--- a/API/TaskManager.Contracts/Dtos/10_17/Class1.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TaskManager.Contracts.Dtos._10_17
-{
- internal class Class1
- {
- }
-}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_DATE_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_DATE_DTO.cs
new file mode 100644
index 0000000..e917547
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_DATE_DTO.cs
@@ -0,0 +1,252 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 日物料需求计划风险确认
+ ///
+ public class SUPPLIER_CON_DATE_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; }
+ ///
+ /// 风险类型,当反馈结果=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 string StartDate { 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; }
+ }
+
+}
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
new file mode 100644
index 0000000..21ef18b
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_MMRP_DTO.cs
@@ -0,0 +1,138 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// M+6月物料需求计划风险确认
+ ///
+ public class SUPPLIER_CON_MMRP_DTO
+ {
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 需求发布版次,取自M+6月物料需求计划接口中的需求发布版次,针对与这个版次的需求进行风险反馈
+ ///
+ [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; }
+ ///
+ /// 风险类型,当反馈结果=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
+ ///
+ [ExporterHeader(DisplayName = "起始月份")]
+ [ImporterHeader(Name = "起始月份")]
+ public string StartMonth { get; set; }
+ ///
+ /// 满足数量1
+ ///
+ [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
+ ///
+ [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; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_PO_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_PO_DTO.cs
new file mode 100644
index 0000000..cc67661
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_CON_PO_DTO.cs
@@ -0,0 +1,60 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 采购订单风险确认
+ ///
+ public class SUPPLIER_CON_PO_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; }
+ ///
+ /// 满足数量
+ ///
+ [ExporterHeader(DisplayName = "满足数量")]
+ [ImporterHeader(Name = "满足数量")]
+ public decimal QuantityMeet { get; set; }
+ ///
+ /// 反馈结果,1-异常;0-无异常(匹配峰值需求缺口,如果可满足峰值,即选择无异常)
+ ///
+ [ExporterHeader(DisplayName = "反馈结果")]
+ [ImporterHeader(Name = "反馈结果")]
+ public string FeedbackResults { 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; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs
new file mode 100644
index 0000000..f92f4a9
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs
@@ -0,0 +1,130 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity
+{
+ ///
+ /// 人员资质信息
+ ///
+ public class SUPPLIER_EMPLOYEE_DT_DTO : BaseEntity_NoTask
+ {
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 工厂代码
+ ///
+ [ExporterHeader(DisplayName = "工厂代码")]
+ [ImporterHeader(Name = "工厂代码")]
+ public string PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "车间名称")]
+ [ImporterHeader(Name = "车间名称")]
+ public string WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 工位人员账号
+ ///
+ [ExporterHeader(DisplayName = "工位人员账号")]
+ [ImporterHeader(Name = "工位人员账号")]
+ public string OperatorId { get; set; }
+ ///
+ /// 工位人员姓名
+ ///
+ [ExporterHeader(DisplayName = "工位人员姓名")]
+ [ImporterHeader(Name = "工位人员姓名")]
+ public string OperatorName { get; set; }
+ ///
+ /// 是否有资质(Y,N)
+ ///
+ [ExporterHeader(DisplayName = "是否有资质(Y,N)")]
+ [ImporterHeader(Name = "是否有资质(Y,N)")]
+ public string HaveQuantity { get; set; }
+ ///
+ /// 供应商修改时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "供应商修改时间")]
+ [ImporterHeader(Name = "供应商修改时间")]
+ public string DataUpdateTime { get; set; }
+ ///
+ /// 岗位代码
+ ///
+ [ExporterHeader(DisplayName = "岗位代码")]
+ [ImporterHeader(Name = "岗位代码")]
+ public string PositionId { get; set; }
+ ///
+ /// 岗位名称
+ ///
+ [ExporterHeader(DisplayName = "岗位名称")]
+ [ImporterHeader(Name = "岗位名称")]
+ public string PositionName { get; set; }
+ ///
+ /// 资质等级(Level_4,Level_3,Level_2,Level_1)
+ ///
+ [ExporterHeader(DisplayName = "资质等级")]
+ [ImporterHeader(Name = "资质等级")]
+ public string QualificationLevel { get; set; }
+ ///
+ /// 资质获取时间
+ ///
+ [ExporterHeader(DisplayName = "资质获取时间")]
+ [ImporterHeader(Name = "资质获取时间")]
+ public string CheckInTime { get; set; }
+ ///
+ /// 资质失去时间
+ ///
+ [ExporterHeader(DisplayName = "资质失去时间")]
+ [ImporterHeader(Name = "资质失去时间")]
+ public string CheckOutTime { get; set; }
+ }
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs
new file mode 100644
index 0000000..db4d8cd
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs
@@ -0,0 +1,125 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity
+{
+ ///
+ /// 供应商基础信息
+ ///
+ public class SUPPLIER_INFO_DT_DTO : BaseEntity_NoTask
+ {
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 工厂代码
+ ///
+ [ExporterHeader(DisplayName = "工厂代码")]
+ [ImporterHeader(Name = "工厂代码")]
+ public string PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "车间名称")]
+ [ImporterHeader(Name = "车间名称")]
+ public string WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 是否关键工位(Y/N)
+ ///
+ [ExporterHeader(DisplayName = "是否关键工位(Y/N)")]
+ [ImporterHeader(Name = "是否关键工位(Y/N)")]
+ public string KeyStation { get; set; }
+ ///
+ /// 供应商修改时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "供应商修改时间")]
+ [ImporterHeader(Name = "供应商修改时间")]
+ public string DataUpdateTime { get; set; }
+ ///
+ /// 产线顺序
+ ///
+ [ExporterHeader(DisplayName = "产线顺序")]
+ [ImporterHeader(Name = "产线顺序")]
+ public decimal ProductionLineOrder { get; set; }
+ ///
+ /// 工位顺序
+ ///
+ [ExporterHeader(DisplayName = "工位顺序")]
+ [ImporterHeader(Name = "工位顺序")]
+ public decimal StationOrder { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ATTACHMENT_DATA_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ATTACHMENT_DATA_DTO.cs
new file mode 100644
index 0000000..54f54be
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ATTACHMENT_DATA_DTO.cs
@@ -0,0 +1,115 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 附件类数据
+ ///
+ public class SUPPLIER_PRO_ATTACHMENT_DATA_DTO
+ {
+
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 数据类型(1产前管理;2人员资质;3监控视频)
+ ///
+ [ExporterHeader(DisplayName = "数据类型")]
+ [ImporterHeader(Name = "数据类型")]
+ public string Type { get; set; }
+ ///
+ /// 文件名
+ ///
+ [ExporterHeader(DisplayName = "文件名")]
+ [ImporterHeader(Name = "文件名")]
+ public string FileName { get; set; }
+ ///
+ /// 图文地址
+ ///
+ [ExporterHeader(DisplayName = "图文地址")]
+ [ImporterHeader(Name = "图文地址")]
+ public string FileUrl { get; set; }
+ ///
+ /// 生成时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "生成时间")]
+ [ImporterHeader(Name = "生成时间")]
+ public string DateTime { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 设备名称
+ ///
+ [ExporterHeader(DisplayName = "设备名称")]
+ [ImporterHeader(Name = "设备名称")]
+ public string DeviceName { get; set; }
+ ///
+ /// 设备编码
+ ///
+ [ExporterHeader(DisplayName = "设备编码")]
+ [ImporterHeader(Name = "设备编码")]
+ public string? DeviceId { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 供应商总成SN码
+ ///
+ [ExporterHeader(DisplayName = "供应商总成SN码")]
+ [ImporterHeader(Name = "供应商总成SN码")]
+ public string? VendorProductSn { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ENVIRONMENT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ENVIRONMENT_DTO.cs
new file mode 100644
index 0000000..ae3ae92
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_ENVIRONMENT_DTO.cs
@@ -0,0 +1,115 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 环境业务数据
+ ///
+ public class SUPPLIER_PRO_ENVIRONMENT_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 PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "车间名称")]
+ [ImporterHeader(Name = "车间名称")]
+ public string WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 环境指标名称,例如:温度、湿度、洁净度等
+ ///
+ [ExporterHeader(DisplayName = "环境指标名称")]
+ [ImporterHeader(Name = "环境指标名称")]
+ public string EnvIndicatorName { get; set; }
+ ///
+ /// 指标实测值,(最大支持11位整数+5位小数)
+ ///
+ [ExporterHeader(DisplayName = "指标实测值")]
+ [ImporterHeader(Name = "指标实测值")]
+ public decimal? NumValue { get; set; }
+ ///
+ /// 上限值,(最大支持11位整数+5位小数)
+ ///
+ [ExporterHeader(DisplayName = "上限值")]
+ [ImporterHeader(Name = "上限值")]
+ public decimal UpperLimit { get; set; }
+ ///
+ /// 下限值,(最大支持11位整数+5位小数)
+ ///
+ [ExporterHeader(DisplayName = "下限值")]
+ [ImporterHeader(Name = "下限值")]
+ public decimal LowerLimit { get; set; }
+ ///
+ /// 单位,相应的单位名称,如度数
+ ///
+ [ExporterHeader(DisplayName = "单位")]
+ [ImporterHeader(Name = "单位")]
+ public string ChineseUnit { get; set; }
+ ///
+ /// 采集仪器代码,环境采集的仪器/工具代码
+ ///
+ [ExporterHeader(DisplayName = "采集仪器代码")]
+ [ImporterHeader(Name = "采集仪器代码")]
+ public string EquipmentCode { get; set; }
+ ///
+ /// 采集仪器名称,环境采集的仪器/工具名称
+ ///
+ [ExporterHeader(DisplayName = "采集仪器名称")]
+ [ImporterHeader(Name = "采集仪器名称")]
+ public string EquipmentName { get; set; }
+ ///
+ /// 数据采集的点位
+ ///
+ [ExporterHeader(DisplayName = "数据采集的点位")]
+ [ImporterHeader(Name = "数据采集的点位")]
+ public string? DataCollectionPoint { get; set; }
+ ///
+ /// 数据采集的时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "数据采集的时间")]
+ [ImporterHeader(Name = "数据采集的时间")]
+ public string CollectTime { get; set; }
+ }
+
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_FLAW_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_FLAW_DTO.cs
new file mode 100644
index 0000000..32085fe
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_FLAW_DTO.cs
@@ -0,0 +1,179 @@
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 缺陷业务数据
+ ///
+ public class SUPPLIER_PRO_FLAW_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 PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "车间名称")]
+ [ImporterHeader(Name = "车间名称")]
+ public string WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 缺陷代码
+ ///
+ [ExporterHeader(DisplayName = "缺陷代码")]
+ [ImporterHeader(Name = "缺陷代码")]
+ public string DefectsCode { get; set; }
+ ///
+ /// 缺陷名称
+ ///
+ [ExporterHeader(DisplayName = "缺陷名称")]
+ [ImporterHeader(Name = "缺陷名称")]
+ public string DefectsName { get; set; }
+ ///
+ /// 缺陷分类(外观,尺寸,材料,功能,性能,其他)
+ ///
+ [ExporterHeader(DisplayName = "缺陷分类")]
+ [ImporterHeader(Name = "缺陷分类")]
+ public string ClassOfName { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 供应商总成批次号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成批次号")]
+ [ImporterHeader(Name = "供应商总成批次号")]
+ public string VendorProductBatch { get; set; }
+ ///
+ /// 供应商总成SN码
+ ///
+ [ExporterHeader(DisplayName = "供应商总成SN码")]
+ [ImporterHeader(Name = "供应商总成SN码")]
+ public string VendorProductSn { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 奇瑞SN码
+ ///
+ [ExporterHeader(DisplayName = "奇瑞SN码")]
+ [ImporterHeader(Name = "奇瑞SN码")]
+ public string CheryProductSn { get; set; }
+ ///
+ /// 生产批次号
+ ///
+ [ExporterHeader(DisplayName = "生产批次号")]
+ [ImporterHeader(Name = "生产批次号")]
+ public string ProductBatchNo { get; set; }
+ ///
+ /// 生产工单号,或生产批次(工单业务数据)
+ ///
+ [ExporterHeader(DisplayName = "生产工单号")]
+ [ImporterHeader(Name = "生产工单号")]
+ public string ManufactureNo { get; set; }
+ ///
+ /// 班次(白班,晚班,中班)
+ ///
+ [ExporterHeader(DisplayName = "班次")]
+ [ImporterHeader(Name = "班次")]
+ public string WorkShift { get; set; }
+ ///
+ /// 缺陷件数
+ ///
+ [ExporterHeader(DisplayName = "缺陷件数")]
+ [ImporterHeader(Name = "缺陷件数")]
+ public decimal Numberofdefect { get; set; }
+ ///
+ /// 缺陷描述
+ ///
+ [ExporterHeader(DisplayName = "缺陷描述")]
+ [ImporterHeader(Name = "缺陷描述")]
+ public string DefectsDesc { get; set; }
+ ///
+ /// 缺陷等级,(1.严重、2.一般、3.轻微)
+ ///
+ [ExporterHeader(DisplayName = "缺陷等级")]
+ [ImporterHeader(Name = "缺陷等级")]
+ public string DefectsLevel { get; set; }
+ ///
+ /// 缺陷录入时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "缺陷录入时间")]
+ [ImporterHeader(Name = "缺陷录入时间")]
+ public string StatisticalTime { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_MATERIAL_DATA_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_MATERIAL_DATA_DTO.cs
new file mode 100644
index 0000000..0d272eb
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_MATERIAL_DATA_DTO.cs
@@ -0,0 +1,132 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 物料主数据
+ ///
+ public class SUPPLIER_PRO_MATERIAL_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 VendorProductNo { get; set; }
+ ///
+ /// 供应商物料名称
+ ///
+ [ExporterHeader(DisplayName = "供应商物料名称")]
+ [ImporterHeader(Name = "供应商物料名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 类型(成品,半成品,原材料)
+ ///
+ [ExporterHeader(DisplayName = "类型")]
+ [ImporterHeader(Name = "类型")]
+ public decimal Type { get; set; }
+ ///
+ /// 供应商零件版本号
+ ///
+ [ExporterHeader(DisplayName = "供应商零件版本号")]
+ [ImporterHeader(Name = "供应商零件版本号")]
+ public string? VendorHardwareRevision { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 奇瑞硬件版本号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞硬件版本号")]
+ [ImporterHeader(Name = "奇瑞硬件版本号")]
+ public string OemHardwareRevision { get; set; }
+ ///
+ /// 奇瑞软件版本号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞软件版本号")]
+ [ImporterHeader(Name = "奇瑞软件版本号")]
+ public string? OemSoftwareRevision { get; set; }
+ ///
+ /// 车型
+ ///
+ [ExporterHeader(DisplayName = "车型")]
+ [ImporterHeader(Name = "车型")]
+ public string? OemModel { get; set; }
+ ///
+ /// 项目名称
+ ///
+ [ExporterHeader(DisplayName = "项目名称")]
+ [ImporterHeader(Name = "项目名称")]
+ public string? OemProjectName { get; set; }
+ ///
+ /// 是否SOP(Y/N)
+ ///
+ [ExporterHeader(DisplayName = "是否SOP")]
+ [ImporterHeader(Name = "是否SOP")]
+ public string? Launched { get; set; }
+ ///
+ /// 数据同步执行时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "数据同步执行时间")]
+ [ImporterHeader(Name = "数据同步执行时间")]
+ public string? DateTime { get; set; }
+ ///
+ /// 供应商工厂代码
+ ///
+ [ExporterHeader(DisplayName = "供应商工厂代码")]
+ [ImporterHeader(Name = "供应商工厂代码")]
+ public string? PlantId { get; set; }
+ ///
+ /// 供应商工厂名称
+ ///
+ [ExporterHeader(DisplayName = "供应商工厂名称")]
+ [ImporterHeader(Name = "供应商工厂名称")]
+ public string? PlantName { get; set; }
+ ///
+ /// 芯片采购类型(AVAP,CS,CMcontro)
+ ///
+ [ExporterHeader(DisplayName = "芯片采购类型")]
+ [ImporterHeader(Name = "芯片采购类型")]
+ public string? ProcurementType { get; set; }
+ ///
+ /// 芯片MPN标识码
+ ///
+ [ExporterHeader(DisplayName = "芯片MPN标识码")]
+ [ImporterHeader(Name = "芯片MPN标识码")]
+ public string? MpnCode { get; set; }
+ ///
+ /// 芯片MPN标识名称
+ ///
+ [ExporterHeader(DisplayName = "芯片MPN标识名称")]
+ [ImporterHeader(Name = "芯片MPN标识名称")]
+ public string? MpnName { get; set; }
+ ///
+ /// 物料有效期(天)
+ ///
+ [ExporterHeader(DisplayName = "物料有效期")]
+ [ImporterHeader(Name = "物料有效期")]
+ public string ValidDays { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_DTO.cs
new file mode 100644
index 0000000..778b0a6
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_DTO.cs
@@ -0,0 +1,150 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 设备OEE达成率
+ ///
+ public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_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 PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "车间名称")]
+ [ImporterHeader(Name = "车间名称")]
+ public string WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string ProductionLineName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 设备代码
+ ///
+ [ExporterHeader(DisplayName = "设备代码")]
+ [ImporterHeader(Name = "设备代码")]
+ public string DeviceId { get; set; }
+ ///
+ /// 设备名称
+ ///
+ [ExporterHeader(DisplayName = "设备名称")]
+ [ImporterHeader(Name = "设备名称")]
+ public string? DeviceName { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 生产批次号
+ ///
+ [ExporterHeader(DisplayName = "生产批次号")]
+ [ImporterHeader(Name = "生产批次号")]
+ public string ProductBatchNo { get; set; }
+ ///
+ /// 生产工单号
+ ///
+ [ExporterHeader(DisplayName = "生产工单号")]
+ [ImporterHeader(Name = "生产工单号")]
+ public string ManufactureNo { get; set; }
+ ///
+ /// OEE实际值
+ ///
+ [ExporterHeader(DisplayName = "OEE实际值")]
+ [ImporterHeader(Name = "OEE实际值")]
+ public decimal Rate { get; set; }
+ ///
+ /// OEE目标值
+ ///
+ [ExporterHeader(DisplayName = "OEE目标值")]
+ [ImporterHeader(Name = "OEE目标值")]
+ public decimal RateTagValue { get; set; }
+ ///
+ /// 班次(白班,晚班,中班)
+ ///
+ [ExporterHeader(DisplayName = "班次")]
+ [ImporterHeader(Name = "班次")]
+ public string WorkShift { get; set; }
+ ///
+ /// 生产日期,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "生产日期")]
+ [ImporterHeader(Name = "生产日期")]
+ public string StatisticalTime { get; set; }
+ ///
+ /// 值统计时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "值统计时间")]
+ [ImporterHeader(Name = "值统计时间")]
+ public string DateTime { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_TIME_DETAILS_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_TIME_DETAILS_DTO.cs
new file mode 100644
index 0000000..79bc4b2
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_OEE_TIME_DETAILS_DTO.cs
@@ -0,0 +1,120 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// OEE时间明细
+ ///
+ public class SUPPLIER_PRO_OEE_TIME_DETAILS_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 PlantId { get; set; }
+ ///
+ /// 工厂名称
+ ///
+ [ExporterHeader(DisplayName = "工厂名称")]
+ [ImporterHeader(Name = "工厂名称")]
+ public string PlantName { get; set; }
+ ///
+ /// 车间代码
+ ///
+ [ExporterHeader(DisplayName = "车间代码")]
+ [ImporterHeader(Name = "车间代码")]
+ public string WorkshopId { get; set; }
+ ///
+ /// 车间名称
+ ///
+ [ExporterHeader(DisplayName = "")]
+ [ImporterHeader(Name = "")]
+ public string? WorkshopName { get; set; }
+ ///
+ /// 产线代码
+ ///
+ [ExporterHeader(DisplayName = "产线代码")]
+ [ImporterHeader(Name = "产线代码")]
+ public string ProductionLineId { get; set; }
+ ///
+ /// 产线名称
+ ///
+ [ExporterHeader(DisplayName = "产线名称")]
+ [ImporterHeader(Name = "产线名称")]
+ public string? ProductionLineName { get; set; }
+ ///
+ /// 工位代码
+ ///
+ [ExporterHeader(DisplayName = "工位代码")]
+ [ImporterHeader(Name = "工位代码")]
+ public string StationId { get; set; }
+ ///
+ /// 工位名称
+ ///
+ [ExporterHeader(DisplayName = "工位名称")]
+ [ImporterHeader(Name = "工位名称")]
+ public string StationName { get; set; }
+ ///
+ /// 设备代码
+ ///
+ [ExporterHeader(DisplayName = "设备代码")]
+ [ImporterHeader(Name = "设备代码")]
+ public string DeviceId { get; set; }
+ ///
+ /// 设备名称
+ ///
+ [ExporterHeader(DisplayName = "设备名称")]
+ [ImporterHeader(Name = "设备名称")]
+ public string DeviceName { get; set; }
+ ///
+ /// 记录ID
+ ///
+ [ExporterHeader(DisplayName = "记录ID")]
+ [ImporterHeader(Name = "记录ID")]
+ public string RecId { get; set; }
+ ///
+ /// 大类(1计划工作,2计划停机,3非计划停机)
+ ///
+ [ExporterHeader(DisplayName = "大类")]
+ [ImporterHeader(Name = "大类")]
+ public string Type { get; set; }
+ ///
+ /// 小类编码
+ ///
+ [ExporterHeader(DisplayName = "小类编码")]
+ [ImporterHeader(Name = "小类编码")]
+ public string SubType { get; set; }
+ ///
+ /// 小类描述
+ ///
+ [ExporterHeader(DisplayName = "小类描述")]
+ [ImporterHeader(Name = "小类描述")]
+ public string SubTypeName { get; set; }
+ ///
+ /// 开始时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "开始时间")]
+ [ImporterHeader(Name = "开始时间")]
+ public string StartTime { get; set; }
+ ///
+ /// 结束时间,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "结束时间")]
+ [ImporterHeader(Name = "结束时间")]
+ public string EndTime { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_DTO.cs
new file mode 100644
index 0000000..e8168e0
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_DTO.cs
@@ -0,0 +1,126 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 工艺
+ ///
+ public class SUPPLIER_PRO_PROCESS_DTO
+ {
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 工艺编码
+ ///
+ [ExporterHeader(DisplayName = "工艺编码")]
+ [ImporterHeader(Name = "工艺编码")]
+ public string TechCode { get; set; }
+ ///
+ /// 工艺名称
+ ///
+ [ExporterHeader(DisplayName = "工艺名称")]
+ [ImporterHeader(Name = "工艺名称")]
+ public string TechName { get; set; }
+ ///
+ /// 有效期,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "有效期")]
+ [ImporterHeader(Name = "有效期")]
+ public string ValidPeriod { get; set; }
+ ///
+ /// 工艺版本
+ ///
+ [ExporterHeader(DisplayName = "工艺版本")]
+ [ImporterHeader(Name = "工艺版本")]
+ public string TechVersion { get; set; }
+ ///
+ /// 模具编码
+ ///
+ [ExporterHeader(DisplayName = "模具编码")]
+ [ImporterHeader(Name = "模具编码")]
+ public string MoldCode { get; set; }
+ ///
+ /// 模具名称
+ ///
+ [ExporterHeader(DisplayName = "模具名称")]
+ [ImporterHeader(Name = "模具名称")]
+ public string MoldName { get; set; }
+ ///
+ /// 最大加工能力
+ ///
+ [ExporterHeader(DisplayName = "最大加工能力")]
+ [ImporterHeader(Name = "最大加工能力")]
+ public string MaxProcessingCapacity { get; set; }
+ ///
+ /// 工序编码
+ ///
+ [ExporterHeader(DisplayName = "工序编码")]
+ [ImporterHeader(Name = "工序编码")]
+ public string ProcessCode { get; set; }
+ ///
+ /// 工序名称
+ ///
+ [ExporterHeader(DisplayName = "工序名称")]
+ [ImporterHeader(Name = "工序名称")]
+ public string ProcessName { get; set; }
+ ///
+ /// 工序顺序号
+ ///
+ [ExporterHeader(DisplayName = "工序顺序号")]
+ [ImporterHeader(Name = "工序顺序号")]
+ public decimal ProcessOrder { get; set; }
+ ///
+ /// 设备编码
+ ///
+ [ExporterHeader(DisplayName = "设备编码")]
+ [ImporterHeader(Name = "设备编码")]
+ public string DeviceCode { get; set; }
+ ///
+ /// 工序节拍
+ ///
+ [ExporterHeader(DisplayName = "工序节拍")]
+ [ImporterHeader(Name = "工序节拍")]
+ public decimal Rhythm { get; set; }
+ ///
+ /// 节拍单位
+ ///
+ [ExporterHeader(DisplayName = "节拍单位")]
+ [ImporterHeader(Name = "节拍单位")]
+ public string RhythmUnit { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs
new file mode 100644
index 0000000..3ca0595
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs
@@ -0,0 +1,192 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 工艺装备
+ ///
+ public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT : BaseEntity_NoTask
+ {
+ ///
+ /// 供应商代码
+ ///
+ [ExporterHeader(DisplayName = "供应商代码")]
+ [ImporterHeader(Name = "供应商代码")]
+ public string SupplierCode { get; set; }
+ ///
+ /// 供应商名称
+ ///
+ [ExporterHeader(DisplayName = "供应商名称")]
+ [ImporterHeader(Name = "供应商名称")]
+ public string SupplierName { get; set; }
+ ///
+ /// 奇瑞零件号
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件号")]
+ [ImporterHeader(Name = "奇瑞零件号")]
+ public string CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 工艺装备类型分类(1模具;2检具;3夹具)
+ ///
+ [ExporterHeader(DisplayName = "工艺装备类型分类")]
+ [ImporterHeader(Name = "工艺装备类型分类")]
+ public decimal DeviceType { get; set; }
+ ///
+ /// 工艺装备编码
+ ///
+ [ExporterHeader(DisplayName = "工艺装备编码")]
+ [ImporterHeader(Name = "工艺装备编码")]
+ public string DeviceCode { get; set; }
+ ///
+ /// 工艺装备名称
+ ///
+ [ExporterHeader(DisplayName = "工艺装备名称")]
+ [ImporterHeader(Name = "工艺装备名称")]
+ public string DeviceName { get; set; }
+ ///
+ /// 生产厂家
+ ///
+ [ExporterHeader(DisplayName = "生产厂家")]
+ [ImporterHeader(Name = "生产厂家")]
+ public string Manufacturer { get; set; }
+ ///
+ /// 工艺装备型号
+ ///
+ [ExporterHeader(DisplayName = "工艺装备型号")]
+ [ImporterHeader(Name = "工艺装备型号")]
+ public string ModelNumber { get; set; }
+ ///
+ /// 工艺装备序列号
+ ///
+ [ExporterHeader(DisplayName = "工艺装备序列号")]
+ [ImporterHeader(Name = "工艺装备序列号")]
+ public string SerialNumber { get; set; }
+ ///
+ /// 工艺装备制造日期,格式(yyyy-MM-dd)
+ ///
+ [ExporterHeader(DisplayName = "工艺装备制造日期")]
+ [ImporterHeader(Name = "工艺装备制造日期")]
+ public string ProductionDate { get; set; }
+ ///
+ /// 主要材质
+ ///
+ [ExporterHeader(DisplayName = "主要材质")]
+ [ImporterHeader(Name = "主要材质")]
+ public string Material { get; set; }
+ ///
+ /// 当前存放地点
+ ///
+ [ExporterHeader(DisplayName = "当前存放地点")]
+ [ImporterHeader(Name = "当前存放地点")]
+ public string CurrentLocation { get; set; }
+ ///
+ /// 工艺装备状态
+ ///
+ [ExporterHeader(DisplayName = "工艺装备状态")]
+ [ImporterHeader(Name = "工艺装备状态")]
+ public string DeviceStatus { get; set; }
+ ///
+ /// 穴腔数量
+ ///
+ [ExporterHeader(DisplayName = "穴腔数量")]
+ [ImporterHeader(Name = "穴腔数量")]
+ public decimal CavityCount { get; set; }
+ ///
+ /// 模具尺寸规格
+ ///
+ [ExporterHeader(DisplayName = "模具尺寸规格")]
+ [ImporterHeader(Name = "模具尺寸规格")]
+ public string MoldSize { get; set; }
+ ///
+ /// 设计寿命单位
+ ///
+ [ExporterHeader(DisplayName = "设计寿命单位")]
+ [ImporterHeader(Name = "设计寿命单位")]
+ public string DesignLifeUnits { get; set; }
+ ///
+ /// 设计寿命
+ ///
+ [ExporterHeader(DisplayName = "设计寿命")]
+ [ImporterHeader(Name = "设计寿命")]
+ public string DesignLifeValue { get; set; }
+ ///
+ /// 当前剩余寿命,
+ ///
+ [ExporterHeader(DisplayName = "当前剩余寿命")]
+ [ImporterHeader(Name = "当前剩余寿命")]
+ public string CurrentUsageCount { get; set; }
+ ///
+ /// 模具大修次数
+ ///
+ [ExporterHeader(DisplayName = "模具大修次数")]
+ [ImporterHeader(Name = "模具大修次数")]
+ public decimal OverhaulCount { get; set; }
+ ///
+ /// 图纸编号描述
+ ///
+ [ExporterHeader(DisplayName = "图纸编号描述")]
+ [ImporterHeader(Name = "图纸编号描述")]
+ public string CoolingChannelLayout { get; set; }
+ ///
+ /// 检测精度
+ ///
+ [ExporterHeader(DisplayName = "检测精度")]
+ [ImporterHeader(Name = "检测精度")]
+ public string DetectionAccuracy { get; set; }
+ ///
+ /// 最近校准日期,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "最近校准日期")]
+ [ImporterHeader(Name = "最近校准日期")]
+ public string CalibrationDate { get; set; }
+ ///
+ /// 校准到期天数
+ ///
+ [ExporterHeader(DisplayName = "校准到期天数")]
+ [ImporterHeader(Name = "校准到期天数")]
+ public string CalibrationDueDays { get; set; }
+ ///
+ /// 允许误差范围
+ ///
+ [ExporterHeader(DisplayName = "允许误差范围")]
+ [ImporterHeader(Name = "允许误差范围")]
+ public string ToleranceRange { get; set; }
+ ///
+ /// 磨损阈值
+ ///
+ [ExporterHeader(DisplayName = "磨损阈值")]
+ [ImporterHeader(Name = "磨损阈值")]
+ public string WearThreshold { get; set; }
+ ///
+ /// 检测范围
+ ///
+ [ExporterHeader(DisplayName = "检测范围")]
+ [ImporterHeader(Name = "检测范围")]
+ public string DetectionRange { get; set; }
+ ///
+ /// 检测单位
+ ///
+ [ExporterHeader(DisplayName = "检测单位")]
+ [ImporterHeader(Name = "检测单位")]
+ public string UnitType { get; set; }
+ }
+
+}
diff --git a/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DTO.cs b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DTO.cs
new file mode 100644
index 0000000..0cb3a83
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DTO.cs
@@ -0,0 +1,192 @@
+using Magicodes.ExporterAndImporter.Core;
+
+namespace TaskManager.Entity.Entitys
+{
+ ///
+ /// 工艺装备
+ ///
+ public class SUPPLIER_PRO_PROCESS_EQUIPMENT_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 CheryProductNo { get; set; }
+ ///
+ /// 奇瑞零件名称
+ ///
+ [ExporterHeader(DisplayName = "奇瑞零件名称")]
+ [ImporterHeader(Name = "奇瑞零件名称")]
+ public string CheryProductName { get; set; }
+ ///
+ /// 供应商总成零件号
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件号")]
+ [ImporterHeader(Name = "供应商总成零件号")]
+ public string VendorProductNo { get; set; }
+ ///
+ /// 供应商总成零件名称
+ ///
+ [ExporterHeader(DisplayName = "供应商总成零件名称")]
+ [ImporterHeader(Name = "供应商总成零件名称")]
+ public string VendorProductName { get; set; }
+ ///
+ /// 工艺装备类型分类(1模具;2检具;3夹具)
+ ///
+ [ExporterHeader(DisplayName = "工艺装备类型分类")]
+ [ImporterHeader(Name = "工艺装备类型分类")]
+ public decimal DeviceType { get; set; }
+ ///
+ /// 工艺装备编码
+ ///
+ [ExporterHeader(DisplayName = "工艺装备编码")]
+ [ImporterHeader(Name = "工艺装备编码")]
+ public string DeviceCode { get; set; }
+ ///
+ /// 工艺装备名称
+ ///
+ [ExporterHeader(DisplayName = "工艺装备名称")]
+ [ImporterHeader(Name = "工艺装备名称")]
+ public string DeviceName { get; set; }
+ ///
+ /// 生产厂家
+ ///
+ [ExporterHeader(DisplayName = "生产厂家")]
+ [ImporterHeader(Name = "生产厂家")]
+ public string Manufacturer { get; set; }
+ ///
+ /// 工艺装备型号
+ ///
+ [ExporterHeader(DisplayName = "工艺装备型号")]
+ [ImporterHeader(Name = "工艺装备型号")]
+ public string ModelNumber { get; set; }
+ ///
+ /// 工艺装备序列号
+ ///
+ [ExporterHeader(DisplayName = "工艺装备序列号")]
+ [ImporterHeader(Name = "工艺装备序列号")]
+ public string SerialNumber { get; set; }
+ ///
+ /// 工艺装备制造日期,格式(yyyy-MM-dd)
+ ///
+ [ExporterHeader(DisplayName = "工艺装备制造日期")]
+ [ImporterHeader(Name = "工艺装备制造日期")]
+ public string ProductionDate { get; set; }
+ ///
+ /// 主要材质
+ ///
+ [ExporterHeader(DisplayName = "主要材质")]
+ [ImporterHeader(Name = "主要材质")]
+ public string Material { get; set; }
+ ///
+ /// 当前存放地点
+ ///
+ [ExporterHeader(DisplayName = "当前存放地点")]
+ [ImporterHeader(Name = "当前存放地点")]
+ public string CurrentLocation { get; set; }
+ ///
+ /// 工艺装备状态
+ ///
+ [ExporterHeader(DisplayName = "工艺装备状态")]
+ [ImporterHeader(Name = "工艺装备状态")]
+ public string DeviceStatus { get; set; }
+ ///
+ /// 穴腔数量
+ ///
+ [ExporterHeader(DisplayName = "穴腔数量")]
+ [ImporterHeader(Name = "穴腔数量")]
+ public decimal CavityCount { get; set; }
+ ///
+ /// 模具尺寸规格
+ ///
+ [ExporterHeader(DisplayName = "模具尺寸规格")]
+ [ImporterHeader(Name = "模具尺寸规格")]
+ public string MoldSize { get; set; }
+ ///
+ /// 设计寿命单位
+ ///
+ [ExporterHeader(DisplayName = "设计寿命单位")]
+ [ImporterHeader(Name = "设计寿命单位")]
+ public string DesignLifeUnits { get; set; }
+ ///
+ /// 设计寿命
+ ///
+ [ExporterHeader(DisplayName = "设计寿命")]
+ [ImporterHeader(Name = "设计寿命")]
+ public string DesignLifeValue { get; set; }
+ ///
+ /// 当前剩余寿命,
+ ///
+ [ExporterHeader(DisplayName = "当前剩余寿命")]
+ [ImporterHeader(Name = "当前剩余寿命")]
+ public string CurrentUsageCount { get; set; }
+ ///
+ /// 模具大修次数
+ ///
+ [ExporterHeader(DisplayName = "模具大修次数")]
+ [ImporterHeader(Name = "模具大修次数")]
+ public decimal OverhaulCount { get; set; }
+ ///
+ /// 图纸编号描述
+ ///
+ [ExporterHeader(DisplayName = "图纸编号描述")]
+ [ImporterHeader(Name = "图纸编号描述")]
+ public string CoolingChannelLayout { get; set; }
+ ///
+ /// 检测精度
+ ///
+ [ExporterHeader(DisplayName = "检测精度")]
+ [ImporterHeader(Name = "检测精度")]
+ public string DetectionAccuracy { get; set; }
+ ///
+ /// 最近校准日期,格式(yyyy-MM-ddHH:mm:ss)
+ ///
+ [ExporterHeader(DisplayName = "最近校准日期")]
+ [ImporterHeader(Name = "最近校准日期")]
+ public string CalibrationDate { get; set; }
+ ///
+ /// 校准到期天数
+ ///
+ [ExporterHeader(DisplayName = "校准到期天数")]
+ [ImporterHeader(Name = "校准到期天数")]
+ public string CalibrationDueDays { get; set; }
+ ///
+ /// 允许误差范围
+ ///
+ [ExporterHeader(DisplayName = "允许误差范围")]
+ [ImporterHeader(Name = "允许误差范围")]
+ public string ToleranceRange { get; set; }
+ ///
+ /// 磨损阈值
+ ///
+ [ExporterHeader(DisplayName = "磨损阈值")]
+ [ImporterHeader(Name = "磨损阈值")]
+ public string WearThreshold { get; set; }
+ ///
+ /// 检测范围
+ ///
+ [ExporterHeader(DisplayName = "检测范围")]
+ [ImporterHeader(Name = "检测范围")]
+ public string DetectionRange { get; set; }
+ ///
+ /// 检测单位
+ ///
+ [ExporterHeader(DisplayName = "检测单位")]
+ [ImporterHeader(Name = "检测单位")]
+ public string UnitType { get; set; }
+ }
+
+}
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
new file mode 100644
index 0000000..5d9649f
--- /dev/null
+++ b/API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
@@ -0,0 +1,90 @@
+using Magicodes.ExporterAndImporter.Core;
+
+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; }
+ }
+
+}
diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs
index 6a644a0..9ca138f 100644
--- a/API/TaskManager.Entity/Entity.cs
+++ b/API/TaskManager.Entity/Entity.cs
@@ -252,7 +252,7 @@ namespace TaskManager.Entity
/// 数据总量(任务处理的数据条目数)
///
public int DataCount { get; set; }
- [ExporterHeader(DisplayName = "发布客户")]
+ [ExporterHeader(DisplayName = "客户名")]
///
/// 发布给那个客户
///
diff --git a/API/Wood.Admin.WebApi/appsettings.json b/API/Wood.Admin.WebApi/appsettings.json
index 9fdde1b..abea926 100644
--- a/API/Wood.Admin.WebApi/appsettings.json
+++ b/API/Wood.Admin.WebApi/appsettings.json
@@ -8,7 +8,7 @@
},
"AllowedHosts": "*",
"SystemConfig": {
- "AllowCorsSite": "http://127.0.0.1:7005", // 允许的其他站点访问Api
+ "AllowCorsSite": "http://127.0.0.1:7005,http://localhost:7005,192.168.1.228:7005,192.168.1.228:7630", // 允许的其他站点访问Api
"CacheProvider": "Memory", // 缓存使用方式 Memory Redis
"RedisConnectionString": "127.0.0.1:6379", //redis 链接字符串
"EnableInitDb": true, //是否开启数据库初始化,
diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
index cabf5ca..b5b3faf 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
@@ -217,7 +217,7 @@ namespace TaskManager.Controllers
return new JsonResult(new { Code = 200, Message = "删除成功!" }); ;
}
[HttpGet]
- public async Task>> GetPaged(
+ public async Task GetPaged(
[FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "",
@@ -237,7 +237,7 @@ namespace TaskManager.Controllers
Expression> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
- return Ok(pagedResult);
+ return new JsonResult(pagedResult);
}
[HttpGet]
diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
index 719c98d..fff9825 100644
--- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
+++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
@@ -388,7 +388,7 @@ namespace TaskManager.Controllers
/// 过滤条件
///
[HttpGet]
- public async Task>> GetPaged(
+ public async Task GetPaged(
[FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "",
@@ -408,7 +408,7 @@ namespace TaskManager.Controllers
Expression> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
- return Ok(pagedResult);
+ return new JsonResult(pagedResult);
}
///