|
|
@@ -63,8 +63,8 @@ class CheckOrderClass extends BaseClass
|
|
|
$batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
|
|
|
CheckOrderItemClass::batchAddOrderItem($batchData);
|
|
|
|
|
|
- $addPrice = 0;
|
|
|
- $subPrice = 0;
|
|
|
+ $addAmount = 0;
|
|
|
+ $subAmount = 0;
|
|
|
if ($draft === false) {
|
|
|
//盘点完成完成,直接将库存中的数量改为当时盘点的数量
|
|
|
foreach ($batchData as $v) {
|
|
|
@@ -100,15 +100,15 @@ class CheckOrderClass extends BaseClass
|
|
|
|
|
|
$amount = $v['amount'] ?? 0;
|
|
|
if ($amount > 0) {
|
|
|
- $addPrice = bcadd($addPrice, $amount, 2);
|
|
|
+ $addAmount = bcadd($addAmount, $amount, 2);
|
|
|
} else {
|
|
|
- $subPrice = bcadd($subPrice, $amount, 2);
|
|
|
+ $subAmount = bcadd($subAmount, $amount, 2);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $order->addPrice = $addPrice;
|
|
|
- $order->subPrice = $subPrice;
|
|
|
- $order->price = bcadd($addPrice, $subPrice, 2);
|
|
|
+ $order->addAmount = $addAmount;
|
|
|
+ $order->subAmount = $subAmount;
|
|
|
+ $order->price = bcadd($addAmount, $subAmount, 2);
|
|
|
$order->save();
|
|
|
|
|
|
$transaction->commit();
|