From fc983dac3644793b9325428cafe5f0d5ebb3394a Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 29 May 2025 09:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entitys/01_09/SUPPLIER_BOM.cs | 2 +- .../Entitys/01_09/SUPPLIER_EMPLOYEE.cs | 6 +- .../Entitys/01_09/SUPPLIER_INFO.cs | 2 +- .../Entitys/01_09/SUPPLIER_PRO_DATA.cs | 8 +- .../01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs | 4 +- .../01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs | 4 +- .../Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs | 8 +- .../SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs | 4 +- .../SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs | 111 ------------------ .../TaskManager.Entity.csproj | 4 + .../JobDbContext.cs | 1 - 11 files changed, 23 insertions(+), 131 deletions(-) delete mode 100644 API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs index 5161198..863570c 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs @@ -94,6 +94,6 @@ namespace TaskManager.Entity /// /// BOM变更时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs index 6a80c96..9bfa531 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs @@ -79,7 +79,7 @@ namespace TaskManager.Entity /// /// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } /// /// 岗位代码 @@ -99,11 +99,11 @@ namespace TaskManager.Entity /// /// 资质获取时间 /// - public DateTime CheckInTime { get; set; } + public string CheckInTime { get; set; } /// /// 资质失去时间 /// - public DateTime CheckOutTime { get; set; } + public string CheckOutTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs index 8b13507..934d7e5 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs @@ -69,7 +69,7 @@ namespace TaskManager.Entity /// /// 供应商修改时间，格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } /// /// 产线顺序 diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs index 1c20c75..2ff8273 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs @@ -169,12 +169,12 @@ namespace TaskManager.Entity /// /// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime MaterialInputTime { get; set; } + public string MaterialInputTime { get; set; } /// /// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime MaterialOutputTime { get; set; } + public string MaterialOutputTime { get; set; } /// /// 装配设备编号（原注释“vendorFieldNum”可能为“设备编号”，此处按业务逻辑命名） @@ -204,12 +204,12 @@ namespace TaskManager.Entity /// /// 采集时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime CollectTime { get; set; } + public string CollectTime { get; set; } /// /// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } /// /// 父件硬件版本号 diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs index e1265e5..1293295 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs @@ -114,11 +114,11 @@ namespace TaskManager.Entity /// /// 生产日期，格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime StatisticalTime { get; set; } + public string StatisticalTime { get; set; } /// /// 值统计时间，格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs index ccd205b..3be651c 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs @@ -134,7 +134,7 @@ namespace TaskManager.Entity /// /// 检验时间，格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime CheckTime { get; set; } + public string CheckTime { get; set; } /// /// 控制项要求频率 @@ -159,6 +159,6 @@ namespace TaskManager.Entity /// /// 库存有效日期，格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DeadLine { get; set; } + public string DeadLine { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs index 07eb9d3..ea5efe5 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs @@ -89,21 +89,21 @@ namespace TaskManager.Entity /// /// 计划开始时间（格式：yyyy-MM-dd HH:mm:ss） /// - public DateTime PlanBeginTime { get; set; } + public string PlanBeginTime { get; set; } /// /// 计划结束时间（格式：yyyy-MM-dd HH:mm:ss） /// - public DateTime PlanEndTime { get; set; } + public string PlanEndTime { get; set; } /// /// 实际开始时间（格式：yyyy-MM-dd HH:mm:ss） /// - public DateTime ActualBeginTime { get; set; } + public string ActualBeginTime { get; set; } /// /// 实际结束时间（格式：yyyy-MM-dd HH:mm:ss） /// - public DateTime ActualEndTime { get; set; } + public string ActualEndTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs index 8ea834e..29689d6 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs @@ -124,11 +124,11 @@ namespace TaskManager.Entity /// /// 生产日期，格式：yyyy-MM-dd HH:mm:ss /// - public DateTime StatisticalTime { get; set; } + public string StatisticalTime { get; set; } /// /// 值统计时间，格式：yyyy-MM-dd HH:mm:ss /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs b/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs deleted file mode 100644 index 3396024..0000000 --- a/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TaskManager.Entity.Entitys -{ - /// - /// 工位一次合格率 - /// - public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - { - /// - /// 供应商代码 - /// - public string SupplierCode { get; set; } - /// - /// 供应商名称 - /// - public string SupplierName { get; set; } - /// - /// 工厂代码 - /// - public string PlantId { get; set; } - /// - /// 工厂名称 - /// - public string PlantName { get; set; } - /// - /// 车间代码 - /// - public string WorkshopId { get; set; } - /// - /// 车间名称 - /// - public string WorkshopName { get; set; } - /// - /// 产线代码 - /// - public string ProductionLineId { get; set; } - /// - /// 产线名称 - /// - public string ProductionLineName { get; set; } - /// - /// 工位代码 - /// - public string StationId { get; set; } - /// - /// 工位名称 - /// - public string StationName { get; set; } - /// - /// 奇瑞零件号 - /// - public string CheryProductNo { get; set; } - /// - /// 奇瑞零件名称 - /// - public string CheryProductName { get; set; } - /// - /// 供应商总成零件号 - /// - public string VendorProductNo { get; set; } - /// - /// 供应商总成零件名称 - /// - public string VendorProductName { get; set; } - /// - /// 生产批次号 - /// - public string ProductBatchNo { get; set; } - /// - /// 生产工单号,(跟排产工单号关联) - /// - public string ManufactureNo { get; set; } - /// - /// 批次计划数量 - /// - public decimal WorkOrderNumber { get; set; } - /// - /// 不合格数 - /// - public decimal DefectiveNumber { get; set; } - /// - /// 合格数 - /// - public decimal AcceptableNumber { get; set; } - /// - /// 一次合格率实际值,使用小数表示，如0.9601表示合格率为96.01%整数位最多10位，小数位最多3位 - /// - public decimal OncePassRateRealValue { get; set; } - /// - /// 一次合格率目标值,使用小数表示，如0.96表示合格率目标为96.00%。整数位最多10位，小数位最多3位 - /// - public decimal OncePassRateTagValue { get; set; } - /// - /// 班次,班次如何区分需备注(白班，晚班，中班) - /// - public string WorkShift { get; set; } - /// - /// 生产日期,格式(yyyy-MM-ddHH:mm:ss) - /// - public string StatisticalTime { get; set; } - /// - /// 值统计时间,格式(yyyy-MM-ddHH:mm:ss) - /// - public string DateTime { get; set; } - } -} diff --git a/API/TaskManager.Entity/TaskManager.Entity.csproj b/API/TaskManager.Entity/TaskManager.Entity.csproj index 3b5b170..b11c8a0 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -10,4 +10,8 @@ + + + + diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index d3b032a..61ad771 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -11,7 +11,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using TaskManager.Entity; -using TaskManager.Entity.Entitys; using Wood.Util;