Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -325,7 +325,7 @@ namespace Business.ResourceExamineManagement
                         foreach (var chd in childs)
                         {
                             //当前工序消耗时间:件数*单位数量/uph*60*效率系数+前置准备时间
-                            time = packages * chd.quantity / chd.uph.Value * 60 * chd.effect_ratio.Value + chd.readytime.Value;
+                            time = packages * chd.upp.Value / chd.uph.Value * 60 * chd.effect_ratio.Value + chd.readytime.Value;
                             if (time > maxTime)
                             {
                                 maxTime = time;
@@ -350,7 +350,7 @@ namespace Business.ResourceExamineManagement
                     if (item.type == 2)//uph
                     {
                         //当前工序消耗时间:件数*单位数量/uph*60*效率系数+前置准备时间
-                        sumTimes += packages * item.quantity / item.uph.Value * 60 * item.effect_ratio.Value + item.readytime.Value;
+                        sumTimes += packages * item.upp.Value / item.uph.Value * 60 * item.effect_ratio.Value + item.readytime.Value;
                         //计算完成，进行下一次循环
                         continue;
                     }

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -40,13 +40,6 @@ namespace Bussiness.Model.Tech
         [Description("组合层级")]
         public int level { get; set; }
 
-        /// <summary>
-        /// 单位数量
-        /// </summary>
-        [Required]
-        [Description("单位数量")]
-        public int quantity { get; set; }
-
         /// <summary>
         /// 是否需要排产:1-是;0-否
         /// </summary>
@@ -61,6 +54,39 @@ namespace Bussiness.Model.Tech
         [Description("前置准备时间")]
         public decimal? readytime { get; set; }
 
+        /// <summary>
+        /// 工作中心类型WorkCenterType
+        /// </summary>
+        [Description("工作中心类型")]
+        public int? wctype { get; set; }
+
+        /// <summary>
+        /// 前置最小数量LeadQuantity to Start Next
+        /// </summary>
+        [Precision(20, 8)]
+        [Description("前置最小数量")]
+        public decimal? lq { get; set; }
+
+        /// <summary>
+        /// 子工序加工数量UnitPerParent
+        /// </summary>
+        [Precision(20, 8)]
+        [Description("子工序加工数量")]
+        public decimal? upp { get; set; }
+
+        /// <summary>
+        /// 一次可加工数量UnitPerEquipment
+        /// </summary>
+        [Precision(20, 8)]
+        [Description("一次可加工数量")]
+        public decimal? upe { get; set; }
+
+        /// <summary>
+        /// 实际运行工位数WorkshopInUse
+        /// </summary>
+        [Description("实际运行工位数")]
+        public int? wsinuse { get; set; }
+
         /// <summary>
         /// 效率计算类型 1-节拍时间；2-UPH
         /// </summary>