生产队列

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)

ZR.Model/MES/pro/DTO/ProWorkOrder.cs

@@ -52,6 +52,16 @@
         /// </summary>
         public int PreviousNumber { get; set; }
 
+        /// <summary>
+        /// 预计合格率
+        /// </summary>
+        public decimal? PQualifiedRate { get; set; }
+
+        /// <summary>
+        /// 预计合格数
+        /// </summary>
+        public int? PQualifiedNum { get; set; }
+
         /// <summary>
         /// 双组号缸号
         /// </summary>

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; }
 
+        /// <summary>
+        /// 预计合格数
+        /// </summary>
+        [SugarColumn(ColumnName = "pqualifiednum")]
+        [ExcelColumn(Name = "预计合格数", IndexName = "J")]
+        public int PQqualifiedNum { get; set; }
+
+        /// <summary>
+        /// 预计合格率
+        /// </summary>
+        [SugarColumn(ColumnName = "pqualifiedRate")]
+        [ExcelColumn(Name = "预计合格率", IndexName = "K")]
+        public decimal PQqualifiedRate { get; set; }
+
         /// <summary>
         /// 双组号缸号
         /// </summary>
         [SugarColumn(ColumnName = "cylinder_number")]
-        [ExcelColumn(Name = "双组号缸号", IndexName = "J")]
+        [ExcelColumn(Name = "双组号缸号", IndexName = "L")]
         public string CylinderNumber { get; set; }
 
         /// <summary>
         /// 备注1
         /// </summary>
         [SugarColumn(ColumnName = "remark1")]
-        [ExcelColumn(Name = "备注1", IndexName = "K")]
+        [ExcelColumn(Name = "备注1", IndexName = "M")]
         public string Remark1 { get; set; }
 
         /// <summary>
         /// 备注2
         /// </summary>
         [SugarColumn(ColumnName = "remark2")]
-        [ExcelColumn(Name = "备注2", IndexName = "L")]
+        [ExcelColumn(Name = "备注2", IndexName = "N")]
         public string Remark2 { get; set; }
 
 

ZR.Model/mes/pro/ProWorkorder.cs

@@ -145,6 +145,18 @@
         ///</summary>
         [SugarColumn(ColumnName = "UPDATED_TIME")]
         public DateTime? UpdatedTime { get; set; }
+
+        /// <summary>
+        /// 预计合格率 
+        ///</summary>
+        [SugarColumn(ColumnName = "pqualifiedrate")]
+        public decimal? PQualifiedRate { get; set; }
+
+        /// <summary>
+        /// 预计合格数
+        ///</summary>
+        [SugarColumn(ColumnName = "pqualifiednum")]
+        public int? PQualifiedNum { get; set; }
     }
 
 }

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,