From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
index def875e..56c7966 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Response_MatrixEditorTable_358_OnUpdateValue.def
@@ -4,8 +4,8 @@
   CCEngineLogisticsCostRow row,
   CCEngineLogisticsCostColumn column,
   CCEngineLogisticsCostCell cell,
-  Number value,
-  Number oldvalue
+  String value,
+  String oldvalue
 ) id:Response_MatrixEditorTable_358_OnUpdateValue
 {
   #keys: '[415136.0.989501207]'
@@ -16,13 +16,16 @@
     Body:
     [*
       table            := selectobject( MacroPlan, CCEngineLogisticsCostReport, report, not report.IsShow() );
+      cell.CoefficientValue( value );
       traverse( table, Row, trow, trow.Name() = row.Name() ){
         traverse( trow, Cell, tcel, tcel.Column().Name() = column.Name() ){
-          tcel.RentEnterCost( cell.RentEnterCost() );
-          tcel.RentOutCost( cell.RentOutCost() );
-          tcel.FactoryToRentTransCost( cell.FactoryToRentTransCost() );
-          tcel.RentStorageCost( cell.RentStorageCost() );
-          tcel.Coefficient( cell.Coefficient() );
+          tcel.RentInCost( cell.RentInCost() );
+          tcel.RentOutOfCost( cell.RentOutOfCost() );
+          tcel.WerkToRentTransCost( cell.WerkToRentTransCost() );
+          tcel.RentStorCost( cell.RentStorCost() );
+          tcel.CoefficientValue( cell.CoefficientValue() );
+          estimatetotalcost := tcel.RentInCost() + tcel.RentOutOfCost() + tcel.WerkToRentTransCost() + tcel.RentStorCost();
+          tcel.AllCost( estimatetotalcost * [Real]tcel.CoefficientValue() );
         }
       }
     *]

--
Gitblit v1.9.3