Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -2398,6 +2398,7 @@ namespace Business.Replenishment
                 }
                 _CalcBomViewAppService.newStockOccList = new List<mo_ic_item_stockoccupy>();
                 _CalcBomViewAppService.mes_morder = item;
+                _CalcBomViewAppService.morder_type = item.morder_type;
                 //库存初始化
                 _CalcBomViewAppService.BomStock(getBomList, stocklist, bangid);
 

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -1197,7 +1197,7 @@ namespace Business.ResourceExamineManagement
                             //1、如果当天是排产的最后一天，则先排完正常工单，再安排特殊工单；
                             //2、如果是排产中间日期，则先安排特殊工单排产
                             //当天剩余产能
-                            decimal sumAmount = Math.Floor(dto.Rate * residueTime / 60);
+                            decimal sumAmount = Math.Ceiling(dto.Rate * residueTime / 60);
                             //已排产数量+当天的剩余产能小于工单剩余需排产数量,当天的产能需要全部排产
                             if (sumQty + sumAmount < lineStart.QtyRemain)
                             {
@@ -1352,7 +1352,7 @@ namespace Business.ResourceExamineManagement
                                             //处理正常工单开工时间
                                             workStartTime = endTime;
                                             //剩余产能继续排正常工单
-                                            sumAmount = Math.Floor(dto.Rate * residueTime / 60);
+                                            sumAmount = Math.Ceiling(dto.Rate * residueTime / 60);
                                             //记录生产周期
                                             curSequences.Add(new PeriodSequenceDet
                                             {
@@ -2272,7 +2272,7 @@ namespace Business.ResourceExamineManagement
                                 {
                                     workStartTime = beginTime;//排产开始时间
                                     //剩余产能继续排正常工单
-                                    decimal sumAmount = Math.Floor(dto.Rate * residueTime / 60);
+                                    decimal sumAmount = Math.Ceiling(dto.Rate * residueTime / 60);
                                     //如果剩余产能不能满足正常工单，剩余产能全部排产
                                     if (sumQty + sumAmount < lineStart.QtyRemain)
                                     {
@@ -2777,7 +2777,7 @@ namespace Business.ResourceExamineManagement
                                             //处理正常工单开工时间
                                             workStartTime = endTime;
                                             //剩余产能继续排正常工单
-                                            decimal sumAmount = Math.Floor(dto.Rate * residueTime / 60);
+                                            decimal sumAmount = Math.Ceiling(dto.Rate * residueTime / 60);
                                             //记录生产周期
                                             curSequences.Add(new PeriodSequenceDet
                                             {
@@ -3757,7 +3757,7 @@ namespace Business.ResourceExamineManagement
             decimal rate = curLevel == null ? lineStart.Rate : curLevel.Rate;
             scheduledDto.Rate = rate;
             //计算当天的产能(向下取整)
-            scheduledDto.ProductQty = Math.Floor(scheduledDto.EffTime / 60 * rate);
+            scheduledDto.ProductQty = Math.Ceiling(scheduledDto.EffTime / 60 * rate);
             //计算班次
             scheduledDto.Period = 1;//默认一班制
             if (shopCal.ShiftsStart2 != 0 && shopCal.ShiftsHours2 != 0)