diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
index bbd6b9bc..c4d63936 100644
--- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs
@@ -122,6 +122,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
item.Specifications = "";
if (item.CylinderNumber == null)
item.CylinderNumber = "";
+ if (item.PQqualifiedNum == null)
+ item.PQqualifiedNum = 0;
+ if (item.PQqualifiedRate == null)
+ item.PQqualifiedRate = 0;
if (item.Remark1 == null)
item.Remark1 = "";
if (item.Remark2 == null)
diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板.xlsx
index e9d1d9ba..c7c7b298 100644
Binary files a/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板.xlsx and b/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板.xlsx differ
diff --git a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
index ef52d67c..457f07c7 100644
--- a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
+++ b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs
@@ -52,6 +52,16 @@
///
public int PreviousNumber { get; set; }
+ ///
+ /// 预计合格率
+ ///
+ public decimal? PQualifiedRate { get; set; }
+
+ ///
+ /// 预计合格数
+ ///
+ public int? PQualifiedNum { get; set; }
+
///
/// 双组号缸号
///
diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs
index 2e87e74b..b6794461 100644
--- a/ZR.Model/MES/pro/ProWorkorder_v2.cs
+++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs
@@ -78,25 +78,39 @@ namespace ZR.Model.MES.pro
[ExcelColumn(Name = "上件数", IndexName = "I")]
public int PreviousNumber { get; set; }
+ ///
+ /// 预计合格数
+ ///
+ [SugarColumn(ColumnName = "pqualifiednum")]
+ [ExcelColumn(Name = "预计合格数", IndexName = "J")]
+ public int PQqualifiedNum { get; set; }
+
+ ///
+ /// 预计合格率
+ ///
+ [SugarColumn(ColumnName = "pqualifiedRate")]
+ [ExcelColumn(Name = "预计合格率", IndexName = "K")]
+ public decimal PQqualifiedRate { get; set; }
+
///
/// 双组号缸号
///
[SugarColumn(ColumnName = "cylinder_number")]
- [ExcelColumn(Name = "双组号缸号", IndexName = "J")]
+ [ExcelColumn(Name = "双组号缸号", IndexName = "L")]
public string CylinderNumber { get; set; }
///
/// 备注1
///
[SugarColumn(ColumnName = "remark1")]
- [ExcelColumn(Name = "备注1", IndexName = "K")]
+ [ExcelColumn(Name = "备注1", IndexName = "M")]
public string Remark1 { get; set; }
///
/// 备注2
///
[SugarColumn(ColumnName = "remark2")]
- [ExcelColumn(Name = "备注2", IndexName = "L")]
+ [ExcelColumn(Name = "备注2", IndexName = "N")]
public string Remark2 { get; set; }
diff --git a/ZR.Model/mes/pro/ProWorkorder.cs b/ZR.Model/mes/pro/ProWorkorder.cs
index 02fe373a..48d395a2 100644
--- a/ZR.Model/mes/pro/ProWorkorder.cs
+++ b/ZR.Model/mes/pro/ProWorkorder.cs
@@ -145,6 +145,18 @@
///
[SugarColumn(ColumnName = "UPDATED_TIME")]
public DateTime? UpdatedTime { get; set; }
+
+ ///
+ /// 预计合格率
+ ///
+ [SugarColumn(ColumnName = "pqualifiedrate")]
+ public decimal? PQualifiedRate { get; set; }
+
+ ///
+ /// 预计合格数
+ ///
+ [SugarColumn(ColumnName = "pqualifiednum")]
+ public int? PQualifiedNum { get; set; }
}
}
diff --git a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs
index c4881901..7939f626 100644
--- a/ZR.Service/mes/pro/ProWorkorderServiceV2.cs
+++ b/ZR.Service/mes/pro/ProWorkorderServiceV2.cs
@@ -56,6 +56,8 @@ namespace ZR.Service.mes.pro
Colour = item.Colour,
CodeNumber = item.CodeNumber,
CylinderNumber = item.CylinderNumber,
+ PQualifiedNum = item.PQqualifiedNum,
+ PQualifiedRate = item.PQqualifiedRate,
hangNumber = item.hangNumber,
PreviousNumber = item.PreviousNumber,
VehicleNumber = item.VehicleNumber,