From 5b96ebd369a471e52a17b1d5d7b8af7c1127cfed Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 29 May 2025 14:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/01_09/SUPPLIER_BOM_DTO.cs | 29 ++----- .../Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs | 25 +----- .../Dtos/01_09/SUPPLIER_INFO_DTO.cs | 26 ++---- .../Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs | 86 +++++-------------- 4 files changed, 36 insertions(+), 130 deletions(-) diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs index 2198333..88930bc 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs @@ -16,85 +16,70 @@ namespace TaskManager.Contracts.Dtos /// 供应商代码 /// public string SupplierCode { get; set; } - /// /// 供应商名称 /// public string SupplierName { get; set; } - /// /// BOM编码 /// public string BomCode { get; set; } - /// /// BOM名称 /// public string BomName { get; set; } - /// /// BOM版本 /// public string BomVersion { get; set; } - /// /// 奇瑞零件号 /// public string CheryProductNo { get; set; } - /// /// 奇瑞零件名称 /// public string CheryProductName { get; set; } - /// /// 供应商父件编码 /// public string VendorProductNo { get; set; } - /// /// 供应商父件名称 /// public string VendorProductName { get; set; } - /// - /// 父件类型(成品, 半成品) + /// 父件类型(成品,半成品) /// - public string VendorProductType { get; set; } - + public string? VendorProductType { get; set; } /// /// 父件单位 /// - public string MaterialUnit { get; set; } - + public string? MaterialUnit { get; set; } /// /// 子件编码 /// public string SubMaterialCode { get; set; } - /// /// 子件名称 /// public string SubMaterialName { get; set; } - /// - /// 子件类型(半成品, 原材料) + /// 子件类型(半成品,原材料) /// - public string SubMaterialType { get; set; } - + public string? SubMaterialType { get; set; } /// /// 子件单位 /// public string SubMaterialUnit { get; set; } - /// /// 子件用量 /// public decimal SubMaterialQuota { get; set; } - /// - /// BOM变更时间,格式(yyyy-MM-dd HH:mm:ss) + /// BOM变更时间,格式(yyyy-MM-ddHH:mm:ss) /// public string DataUpdateTime { get; set; } } + } diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs index 54be819..ef6283d 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs @@ -16,95 +16,78 @@ namespace TaskManager.Contracts.Dtos /// 供应商代码 /// 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 OperatorId { get; set; } - /// /// 工位人员姓名 /// public string OperatorName { get; set; } - /// /// 是否有资质(Y,N) /// - public bool HaveQuantity { get; set; } - + public string HaveQuantity { get; set; } /// - /// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss) + /// 供应商修改时间,格式(yyyy-MM-ddHH:mm:ss) /// public string DataUpdateTime { get; set; } - /// /// 岗位代码 /// public string PositionId { get; set; } - /// /// 岗位名称 /// public string PositionName { get; set; } - /// - /// 资质等级(Level_4，Level_3，Level_2, Level_1) + /// 资质等级(Level_4，Level_3，Level_2,Level_1) /// public string QualificationLevel { get; set; } - /// /// 资质获取时间 /// public string CheckInTime { get; set; } - /// /// 资质失去时间 /// public string CheckOutTime { get; set; } } + } diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs index bffe9eb..52172a5 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs @@ -16,90 +16,74 @@ namespace TaskManager.Contracts.Dtos /// 供应商代码 /// 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; } - /// /// 是否关键工位（Y/N） /// - public bool KeyStation { get; set; } - + public string KeyStation { get; set; } /// - /// 供应商修改时间，格式(yyyy-MM-dd HH:mm:ss) + /// 供应商修改时间,格式(yyyy-MM-ddHH:mm:ss) /// public string DataUpdateTime { get; set; } - /// /// 产线顺序 /// - public int ProductionLineOrder { get; set; } - + public decimal ProductionLineOrder { get; set; } /// /// 工位顺序 /// - public int StationOrder { get; set; } - + public decimal StationOrder { get; set; } /// /// 供应商总成零件号 /// public string VendorProductNo { get; set; } - /// /// 供应商总成零件名称 /// public string VendorProductName { get; set; } - /// /// 奇瑞零件号 /// public string CheryProductNo { get; set; } - /// /// 奇瑞零件名称 /// public string CheryProductName { get; set; } } + } diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs index 7260019..4fd283e 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs @@ -16,240 +16,194 @@ namespace TaskManager.Contracts.Dtos /// 供应商代码 /// public string SupplierCode { get; set; } - /// /// 供应商名称 /// public string SupplierName { get; set; } - /// /// 供应商总成零件号 /// public string VendorProductNo { get; set; } - /// /// 供应商总成零件名称 /// public string VendorProductName { get; set; } - /// /// 供应商总成SN码 /// public string VendorProductSn { get; set; } - /// /// 供应商总成批次号 /// public string VendorProductBatch { get; set; } - /// /// 奇瑞零件号 /// public string CheryProductNo { get; set; } - /// /// 奇瑞零件名称 /// public string CheryProductName { get; set; } - /// /// 奇瑞SN码 /// public string CheryProductSn { get; set; } - /// /// 生产批次号 /// public string ProductBatchNo { get; set; } - /// /// 生产工单号 /// public string ManufactureNo { 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 EmpCode { get; set; } - /// /// 工位人员姓名 /// public string EmpName { get; set; } - /// /// 控制项名称 /// public string VendorFieldName { get; set; } - /// /// 控制项代码 /// public string VendorFieldCode { get; set; } - /// /// 控制项点位 /// - public string GatherSpot { get; set; } - + public string? GatherSpot { get; set; } /// /// 控制项要求频率 /// - public decimal SamplingRate { get; set; } - + public decimal? SamplingRate { get; set; } /// - /// 上下限更新时间,格式(yyyy-MM-dd HH:mm:ss) + /// 上下限更新时间,格式(yyyy-MM-ddHH:mm:ss) /// - public string LimitUpdateTime { get; set; } - + public string? LimitUpdateTime { get; set; } /// /// 控制项描述 /// - public string VendorFieldDesc { get; set; } - + public string? VendorFieldDesc { get; set; } /// /// 载体编码 /// - public string CarrierCode { get; set; } - + public string? CarrierCode { get; set; } /// /// 投入数量 /// public decimal IntputQty { get; set; } - /// /// 一次合格数量 /// public decimal FttQty { get; set; } - /// - /// 参数 , 是传Y，否传N + /// 参数,是传Y，否传N /// public string Parameter { get; set; } - /// - /// 特性 , 是传Y，否传N + /// 特性,是传Y，否传N /// public string Characteristic { get; set; } - /// - /// CC项 , 是传Y，否传N + /// CC项,是传Y，否传N /// - public bool Cc { get; set; } - + public string Cc { get; set; } /// - /// SC项 , 是传Y，否传N + /// SC项,是传Y，否传N /// - public bool Sc { get; set; } - + public string Sc { get; set; } /// - /// SPC , 是传Y，否传N + /// SPC,是传Y，否传N /// - public bool Spc { get; set; } - + public string Spc { get; set; } /// /// 控制项标准值 /// public string StandardValue { get; set; } - /// /// 控制项上限 /// public decimal UpperLimit { get; set; } - /// /// 控制项下限 /// public decimal LowerLimit { get; set; } - /// /// 控制项实测值 /// public decimal DecimalValue { get; set; } - /// /// 控制项值的单位名称-中文 /// - public string UnitCn { get; set; } - + public string? UnitCn { get; set; } /// - /// 控制项单位英文 + /// 控控制项单位英文 /// public string UnitEn { get; set; } - /// /// 检测结果 /// public string CheckResult { get; set; } - /// - /// 在线检测(inline,offline,both) + /// 在线检测(inline,offline,both),可选项:inline-在生产线上进行检测.offline-从生产线上拿下来进行检测.both-inline和offline同时存在. /// - public string DetectionMode { get; set; } - + public string? DetectionMode { get; set; } /// /// 班次(白班，晚班，中班) /// public string WorkShift { get; set; } - /// - /// 采集时间,格式(yyyy-MM-dd HH:mm:ss) + /// 采集时间,格式(yyyy-MM-ddHH:mm:ss) /// public string CollectTime { get; set; } - /// /// 检测方式(人工,设备) /// public string CheckMode { get; set; } - /// /// 检测设备编号 /// public string DeviceCode { get; set; } - /// /// 检测设备名称 /// public string DeviceName { get; set; } } + }