zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

master
赵新宇 3 weeks ago
parent
0c08b50ead 623dc3e4f1
commit
68a7159bac
5 changed files with 60 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs
  2. 42
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs
  3. 52
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs
  4. 37
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs
  5. 36
      API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs

82
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs
View File

@ -16,220 +16,178 @@ namespace TaskManager.Contracts.Dtos
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 工位人员编号
/// </summary>
public string EmpCode { get; set; }
/// <summary>
/// 工位人员姓名
/// </summary>
public string EmpName { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成批次号
/// </summary>
public string VendorProductBatch { get; set; }
/// <summary>
/// 供应商总成SN码
/// </summary>
public string VendorProductSn { get; set; }
/// <summary>
/// 子件编码
/// </summary>
public string SubProdNo { get; set; }
/// <summary>
/// 子件名称
/// </summary>
public string SubProdName { get; set; }
/// <summary>
/// 子件批次号
/// </summary>
public string SubBatchNo { get; set; }
/// <summary>
/// 子件分包号
/// </summary>
public string ChildPackageInfo { get; set; }
public string? ChildPackageInfo { get; set; }
/// <summary>
/// 子件扣料数量
/// </summary>
public decimal SubProdNum { get; set; }
/// <summary>
/// 子件SN码
/// </summary>
public string SubProdSn { get; set; }
/// <summary>
/// 子件物料来源
/// </summary>
public string ChildSource { get; set; }
/// <summary>
/// 分供方代码
/// </summary>
public string SubSupplierCode { get; set; }
public string? SubSupplierCode { get; set; }
/// <summary>
/// 分供方名称（原注释“分分供方”可能为笔误，此处按“分供方”处理）
/// 分分供方名称
/// </summary>
public string SubSupplierName { get; set; }
public string? SubSupplierName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 奇瑞SN码
/// </summary>
public string CheryProductSn { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
public string? ProductBatchNo { get; set; }
/// <summary>
/// 班次(白班，晚班，中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// 进工位的时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string MaterialInputTime { get; set; }
/// <summary>
/// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// 出工位的时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string MaterialOutputTime { get; set; }
/// <summary>
/// 装配设备编号（原注释“vendorFieldNum”可能为“设备编号”，此处按业务逻辑命名）
/// 装配设备编号
/// </summary>
public string VendorFieldNum { get; set; }
/// <summary>
/// 装配设备名称
/// </summary>
public string VendorFieldName { get; set; }
/// <summary>
/// 设备判定的质量状态（合格与否，NG不合适 OK合适）
/// 设备判定的质量状态,合格与否，NG不合适OK合适
/// </summary>
public string InstrumentQualityStatus { get; set; }
public string? InstrumentQualityStatus { get; set; }
/// <summary>
/// 人工判定的质量状态（合格与否，NG不合适 OK合适）
/// 人工判定的质量状态,合格与否，NG不合适OK合适
/// </summary>
public string ManualQualityStatus { get; set; }
public string? ManualQualityStatus { get; set; }
/// <summary>
/// 最终质量状态（合格与否，NG不合适 OK合适）
/// 最终质量状态,合格与否，NG不合适OK合适
/// </summary>
public string FinalQualityStatus { get; set; }
/// <summary>
/// 采集时间,格式(yyyy-MM-dd HH:mm:ss)
/// 采集时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string CollectTime { get; set; }
/// <summary>
/// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss)
/// 子件绑定扫码时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DateTime { get; set; }
/// <summary>
/// 父件硬件版本号
/// </summary>
public string ParentHardwareRevision { get; set; }
public string? ParentHardwareRevision { get; set; }
/// <summary>
/// 父件软件版本号
/// </summary>
public string ParentSoftwareRevision { get; set; }
public string? ParentSoftwareRevision { get; set; }
/// <summary>
/// 子件硬件版本号
/// </summary>
public string ChildHardwareRevision { get; set; }
public string? ChildHardwareRevision { get; set; }
/// <summary>
/// 子件软件版本号
/// </summary>
public string ChildSoftwareRevision { get; set; }
public string? ChildSoftwareRevision { get; set; }
}
}

42
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs
View File

@ -10,116 +10,96 @@ namespace TaskManager.Contracts.Dtos
/// <summary>
/// 产品一次合格率
/// </summary>
public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO : BaseEntityDto
public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntityDto
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
public string? WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
public string? WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
public string? ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
public string? ProductionLineName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 批次计划数量：每个批次号对应的计划数量
/// 批次计划数量:每个批次号对应的计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数：当班次合格数汇总
/// 合格数:当班次合格数汇总
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次（白班，晚班，中班）
/// 班次(白班，晚班，中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期，格式(yyyy-MM-dd HH:mm:ss)
/// 生产日期,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间，格式(yyyy-MM-dd HH:mm:ss)
/// 值统计时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DateTime { get; set; }
}
}

52
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs
View File

@ -16,150 +16,122 @@ namespace TaskManager.Contracts.Dtos
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 供应商子零件编号
/// </summary>
public string SupplierSubCode { get; set; }
/// <summary>
/// 供应商子零件名称
/// </summary>
public string SupplierSubName { get; set; }
/// <summary>
/// 分供方代码
/// </summary>
public string SubSupplierCode { get; set; }
/// <summary>
/// 分供方名称
/// </summary>
public string SubSupplierName { get; set; }
/// <summary>
/// 分供方地址，分供方发货地址：省市区（县），不用于详细地址
/// 分供方地址,分供方发货地址：省市区（县），不用于详细地址
/// </summary>
public string SubSupplierAddress { get; set; }
/// <summary>
/// 分供方子件编码
/// </summary>
public string ComponentCode { get; set; }
public string? ComponentCode { get; set; }
/// <summary>
/// 分供方子件名称
/// 分供方子件名称,
/// </summary>
public string ComponentName { get; set; }
public string? ComponentName { get; set; }
/// <summary>
/// 子件批次号
/// </summary>
public string SubBatchNo { get; set; }
/// <summary>
/// 子件批次数量
/// </summary>
public decimal SubBatchNum { get; set; }
/// <summary>
/// 子件SN码
/// </summary>
public string SubBatchSn { get; set; }
public string? SubBatchSn { get; set; }
/// <summary>
/// 检验人员编号
/// </summary>
public string EmpCode { get; set; }
/// <summary>
/// 检验人员姓名
/// </summary>
public string EmpName { get; set; }
/// <summary>
/// 检测设备编号
/// </summary>
public string DeviceCode { get; set; }
/// <summary>
/// 检测设备名称
/// </summary>
public string DeviceName { get; set; }
/// <summary>
/// 参数名称/特性名称
/// </summary>
public string FeatureName { get; set; }
/// <summary>
/// 参数单位/特性单位
/// </summary>
public string FeatureUnit { get; set; }
/// <summary>
/// 参数/特性标准值
/// </summary>
public string StandardValue { get; set; }
/// <summary>
/// 参数/特性上限值
/// </summary>
public string FeatureUpper { get; set; }
/// <summary>
/// 参数/特性下限值
/// </summary>
public string FeatureLower { get; set; }
/// <summary>
/// 参数/特性实测值
/// </summary>
public string FeatureValue { get; set; }
/// <summary>
/// 来料检验单号
/// </summary>
public string CheckNo { get; set; }
/// <summary>
/// 批次的最终判定结果，OK合格/NG不合格
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 检验时间，格式(yyyy-MM-dd HH:mm:ss)
/// 检验时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string CheckTime { get; set; }
/// <summary>
/// 控制项要求频率
/// </summary>
public decimal SamplingRate { get; set; }
public decimal? SamplingRate { get; set; }
/// <summary>
/// 上下限更新时间，格式(yyyy-MM-dd HH:mm:ss)
/// 上下限更新时间，格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string LimitUpdateTime { get; set; }
public string? LimitUpdateTime { get; set; }
/// <summary>
/// 控制项描述
/// </summary>
public string VendorFieldDesc { get; set; }
public string? VendorFieldDesc { get; set; }
/// <summary>
/// 控制项代码
/// </summary>
public string VendorFieldCode { get; set; }
/// <summary>
/// 库存有效日期，格式(yyyy-MM-dd HH:mm:ss)
/// 库存有效日期,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DeadLine { get; set; }
}
}

37
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs
View File

@ -16,95 +16,78 @@ namespace TaskManager.Contracts.Dtos
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 计划单号
/// </summary>
public string PlanNo { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal ManufactureNum { get; set; }
/// <summary>
/// 批次投入数量
/// </summary>
public decimal ManufactureInputNum { get; set; }
public decimal? ManufactureInputNum { get; set; }
/// <summary>
/// 批次产出数量
/// </summary>
public decimal ManufactureOutputNum { get; set; }
/// <summary>
/// 排产状态（0:未生产，1:生产中，2:已完工，3:已取消，4:已终止）
/// 排产状态,0未生产1.生产中，2.已完工，3.已取消，4.已终止
/// </summary>
public int PlanStatus { get; set; }
public string PlanStatus { get; set; }
/// <summary>
/// 计划开始时间（格式：yyyy-MM-dd HH:mm:ss）
/// 计划开始时间,时间格式：yyyy-MM-ddHH:mm:ss
/// </summary>
public string PlanBeginTime { get; set; }
/// <summary>
/// 计划结束时间（格式：yyyy-MM-dd HH:mm:ss）
/// 计划结束时间,时间格式：yyyy-MM-ddHH:mm:ss
/// </summary>
public string PlanEndTime { get; set; }
/// <summary>
/// 实际开始时间（格式：yyyy-MM-dd HH:mm:ss）
/// 实际开始时间,时间格式：yyyy-MM-ddHH:mm:ss
/// </summary>
public string ActualBeginTime { get; set; }
public string? ActualBeginTime { get; set; }
/// <summary>
/// 实际结束时间（格式：yyyy-MM-dd HH:mm:ss）
/// 实际结束时间,时间格式：yyyy-MM-ddHH:mm:ss
/// </summary>
public string ActualEndTime { get; set; }
public string? ActualEndTime { get; set; }
}
}

36
API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs
View File

@ -16,120 +16,98 @@ namespace TaskManager.Contracts.Dtos
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 生产工单号（跟排产工单号关联）
/// 生产工单号,(跟排产工单号关联)
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值（使用小数表示，如 0.9601 表示 96.01%，整数位最多10位，小数位最多3位）
/// 一次合格率实际值,使用小数表示，如0.9601表示合格率为96.01%整数位最多10位，小数位最多3位
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值（使用小数表示，如 0.96 表示 96.00%，整数位最多10位，小数位最多3位）
/// 一次合格率目标值,使用小数表示，如0.96表示合格率目标为96.00%。整数位最多10位，小数位最多3位
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次（白班，晚班，中班）
/// 班次,班次如何区分需备注(白班，晚班，中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期，格式：yyyy-MM-dd HH:mm:ss
/// 生产日期,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间，格式：yyyy-MM-dd HH:mm:ss
/// 值统计时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DateTime { get; set; }
}
}

Write Preview
Loading…
Cancel
Save