From 426e63cf72b7c473f31804948d890fe58873af15 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 28 May 2025 17:30:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/TaskManager.Entity/Entity.cs | 67 +------------------ .../01_09/{SupplierBom.cs => SUPPLIER_BOM.cs} | 2 +- ...pplierEmployee.cs => SUPPLIER_EMPLOYEE.cs} | 2 +- .../{SupplierInfo.cs => SUPPLIER_INFO.cs} | 2 +- ...{SupplierProCps.cs => SUPPLIER_PRO_CPS.cs} | 2 +- ...upplierProData.cs => SUPPLIER_PRO_DATA.cs} | 2 +- ...eld.cs => SUPPLIER_PRO_FIRST_PASSYIELD.cs} | 2 +- ...tock.cs => SUPPLIER_PRO_MATERIAL_STOCK.cs} | 2 +- ...heduling.cs => SUPPLIER_PRO_SCHEDULING.cs} | 2 +- ...> SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs} | 2 +- 10 files changed, 10 insertions(+), 75 deletions(-) rename API/TaskManager.Entity/Entitys/01_09/{SupplierBom.cs => SUPPLIER_BOM.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierEmployee.cs => SUPPLIER_EMPLOYEE.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierInfo.cs => SUPPLIER_INFO.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProCps.cs => SUPPLIER_PRO_CPS.cs} (99%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProData.cs => SUPPLIER_PRO_DATA.cs} (99%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProFirstPassyield.cs => SUPPLIER_PRO_FIRST_PASSYIELD.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProMaterialStock.cs => SUPPLIER_PRO_MATERIAL_STOCK.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProScheduling.cs => SUPPLIER_PRO_SCHEDULING.cs} (98%) rename API/TaskManager.Entity/Entitys/01_09/{SupplierProStationFirstPassyield.cs => SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs} (98%) diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index acc3f3c..4885f49 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -74,72 +74,7 @@ namespace TaskManager.Entity } - - - - - /// - /// 来料检验数据 - /// - public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity - { - } - - /// - /// 排产数据 - /// - public class SUPPLIER_PRO_SCHEDULING : BaseEntity - { - } - - /// - /// 供应商基础信息 - /// - public class SUPPLIER_INFO : BaseEntity - { - } - - /// - /// 人员资质信息 - /// - public class SUPPLIER_EMPLOYEE : BaseEntity - { - } - - /// - /// BOM主数据 - /// - public class SUPPLIER_BOM : BaseEntity - { - } - - /// - /// 过程控制项质量数据 - /// - public class SUPPLIER_PRO_CPS : BaseEntity - { - } - - /// - /// 生产过程数据 - /// - public class SUPPLIER_PRO_DATA : BaseEntity - { - } - - /// - /// 产品一次合格率 - /// - public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity - { - } - - /// - /// 工位一次合格率 - /// - //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - //{ - //} + /// /// 缺陷业务数据 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs index 3900019..5161198 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// BOM主数据 /// - public class SupplierBom + public class SUPPLIER_BOM : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs index c38cbe1..6a80c96 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 人员资质信息 /// - public class SupplierEmployee + public class SUPPLIER_EMPLOYEE : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs index a466fe8..8b13507 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 供应商基础信息 /// - public class SupplierInfo + public class SUPPLIER_INFO : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs similarity index 99% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs index dc08229..498a756 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 过程控制项质量数据 /// - public class SupplierProCps + public class SUPPLIER_PRO_CPS : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs similarity index 99% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs index e3a99da..1c20c75 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 生产过程数据 /// - public class SupplierProData + public class SUPPLIER_PRO_DATA : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs index b933eb3..e1265e5 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 产品一次合格率 /// - public class SupplierProFirstPassyield + public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs index 93cee45..ccd205b 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 来料检验数据 /// - public class SupplierProMaterialStock + public class SUPPLIER_PRO_MATERIAL_STOCK : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs index 669d950..07eb9d3 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 排产数据 /// - public class SupplierProScheduling + public class SUPPLIER_PRO_SCHEDULING : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs similarity index 98% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs index 7ef6ba0..8ea834e 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 工位一次合格率 /// - public class SupplierProStationFirstPassyield + public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity { /// /// 供应商代码 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 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=B1=BB=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; From da08c2dac5f59f0b6fe380f1d287488027bad17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 29 May 2025 09:36:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/Wood.Admin.WebApi/Startup.cs | 3 -- API/Wood.Admin.WebApi/appsettings.json | 2 +- .../Controllers/RecurringJobBaseController.cs | 2 + .../RecurringJobOutPageController.cs | 43 ++++++++++++++++++- .../Controllers/TaskConifgureController.cs | 43 ++++++++++++++++++- 5 files changed, 87 insertions(+), 6 deletions(-) diff --git a/API/Wood.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index 5f9f4d4..d3a25ad 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -70,9 +70,6 @@ namespace Wood.Admin.WebApi //初始化数据库 services.AddSqlSugar(Configuration); - - - services.AddHttpClient(); services.AddScoped(); services.AddScoped(); diff --git a/API/Wood.Admin.WebApi/appsettings.json b/API/Wood.Admin.WebApi/appsettings.json index 85671ec..9fdde1b 100644 --- a/API/Wood.Admin.WebApi/appsettings.json +++ b/API/Wood.Admin.WebApi/appsettings.json @@ -20,7 +20,7 @@ "DBEnableDiffLog": true, //是否开启差异化日志 "LogDays": 90, //系统日志保存的天数 "RunAutoJob": true, //是否执行自动job - "CustomerDb": "Server=192.168.1.228; Database=TaskManager1; User ID = sa; Password=ChangkeTec@2021; TrustServerCertificate = True" + "CustomerDb": "Server=192.168.1.228; Database=TaskManager2; User ID = sa; Password=ChangkeTec@2021; TrustServerCertificate = True" }, "JwtConfig": { "SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16 diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index 9048666..cb168f2 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -1,4 +1,5 @@  +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; @@ -22,6 +23,7 @@ using TaskManager.EntityFramework; namespace TaskManager.Controllers { + [AllowAnonymous] public class RecurringJobBaseController :ControllerBase, IDoExecute { protected string appKey = "8EG566b9bedd2bf46d"; diff --git a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs index 5fd118e..5a09666 100644 --- a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs @@ -1,5 +1,8 @@ -using Microsoft.AspNetCore.Mvc; +using Magicodes.ExporterAndImporter.Excel; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Omu.ValueInjecter; using System.Linq.Expressions; using System.Text.Json; @@ -24,6 +27,44 @@ namespace TaskManager.Controllers { _repository = repository; } + + protected async Task ExportFile(ICollection dtos, string fileName) where T : class, new() + { + var excelExporter = HttpContext.RequestServices.GetRequiredService(); + var res = await excelExporter.ExportAsByteArray(dtos); + return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName }; + } + + public async Task Export([FromQuery] int pageNumber = 1, + [FromQuery] int pageSize = 10, + [FromQuery] string sortBy = "", + [FromQuery] bool isAscending = true, + [FromQuery] Dictionary filters = null) + { + var pagingParams = new PagingParams + { + PageNumber = pageNumber, + PageSize = pageSize, + SortBy = sortBy, + IsAscending = isAscending, + Filters = filters + }; + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); + return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx"); + + + } + + + + + + + [NonAction] public async Task> FetchAllDataAsync(string inputdate) { diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index c534af9..a248b15 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -1,4 +1,6 @@ using Hangfire; +using Magicodes.ExporterAndImporter.Excel; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -7,7 +9,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; + using System; using System.IO; using System.Linq.Expressions; @@ -21,6 +23,8 @@ namespace TaskManager.Controllers { //[ApiController] //[Route("[controller]")] + + [AllowAnonymous] public class TaskConifgureController : ControllerBase { private readonly JobDbContext _context; @@ -34,6 +38,15 @@ namespace TaskManager.Controllers _configuration = configuration; _repository = repository; } + + protected async Task ExportFile(ICollection dtos, string fileName) where T : class, new() + { + var excelExporter = HttpContext.RequestServices.GetRequiredService(); + var res = await excelExporter.ExportAsByteArray(dtos); + return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName }; + } + + /// /// 请除所有任务 /// @@ -72,6 +85,34 @@ namespace TaskManager.Controllers } + public async Task Export([FromQuery] int pageNumber = 1, + [FromQuery] int pageSize = 10, + [FromQuery] string sortBy = "", + [FromQuery] bool isAscending = true, + [FromQuery] Dictionary filters = null) + { + var pagingParams = new PagingParams + { + PageNumber = pageNumber, + PageSize = pageSize, + SortBy = sortBy, + IsAscending = isAscending, + Filters = filters + }; + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetPagedAsync(null, pagingParams); + return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx"); + + + } + + + + + /// /// 执行铁定任务 ///