shish 5 gadi atpakaļ
vecāks
revīzija
a4331c9f48

+ 1 - 1
biz-ghs/order/classes/OrderClearClass.php

@@ -41,7 +41,7 @@ class OrderClearClass extends BaseClass
             if ($val['customId'] != $customId) {
                 util::fail('每次只能结算一个客户的订单');
             }
-            $amount = bcadd($amount, $val['actPrice'], 2);
+            $amount = bcadd($amount, $val['realPrice'], 2);
             $purchaseId = $val['purchaseId'] ?? 0;
             if (!empty($purchaseId)) {
                 $purchaseArr[] = $purchaseId;

+ 2 - 2
biz-hd/purchase/classes/PurchaseClearClass.php

@@ -31,7 +31,7 @@ class PurchaseClearClass extends BaseClass
         if (empty($arr)) {
             util::fail('请选择采购单');
         }
-        $purchaseList = PurchaseClass::getAllByCondition(['id' => ['in', $arr]], null, ['id', 'actPrice', 'debt', 'ghsId'], null, true);
+        $purchaseList = PurchaseClass::getAllByCondition(['id' => ['in', $arr]], null, ['id', 'actPrice', 'realPrice', 'debt', 'ghsId'], null, true);
         if (empty($purchaseList)) {
             util::fail('请选择采购单');
         }
@@ -45,7 +45,7 @@ class PurchaseClearClass extends BaseClass
             if ($purchase->ghsId != $currentGhsId) {
                 util::fail('请选择同个供货商的订单');
             }
-            $totalPrice = bcadd($totalPrice, $purchase->actPrice, 2);
+            $totalPrice = bcadd($totalPrice, $purchase->realPrice, 2);
             $saleId = $purchase->saleId;
             $saleArr[] = $saleId;
         }