~admin/TIANMA_JITUAN.git

admin / TIANMA_JITUAN

分支自 TIANMA_JITUAN

概况
提交次数
目录
文档
分支
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白

Merge remote-tracking branch 'origin/dev' into dev

yypsybs

2023-09-27 56fd7e8181fa8db461333e0451cbabbf03f290f9

 LibMacroPlanner/BL/Type_UnitPeriodTimeBase/Function_CalcTotalAvailableCapacity.qbl

@@ -16,7 +16,8 @@
                               
      if( not isnull( planningup ) )
      {
         value := planningup.BaseAvailableCapacity().HoursAsReal() * planningup.MaximumLoadPercentage() / 100;   
         value := planningup.BaseAvailableCapacity().HoursAsReal() * planningup.MaximumLoadPercentage() / 100
                  * this.PlanningSystemRatio(); // Tianma fix 20230926
      }
    }
    else

			@@ -16,7 +16,8 @@

			if( not isnull( planningup ) )
			{
			value := planningup.BaseAvailableCapacity().HoursAsReal() * planningup.MaximumLoadPercentage() / 100;
			value := planningup.BaseAvailableCapacity().HoursAsReal() * planningup.MaximumLoadPercentage() / 100
			* this.PlanningSystemRatio(); // Tianma fix 20230926
			}
			}
			else