调整备货单pdf

2025-09-23 11:54:26 +08:00
parent 426d5bce62
commit 2e51c320e6
7 changed files with 235 additions and 43 deletions
@@ -710,7 +710,7 @@ class StockOrdersService
        $purchaseTax = (float)($veh['purchase_tax']['amount'] ?? 0);
        $taxRefund = (float)($veh['tax_refund']['amount'] ?? 0);
        
-        // 退税额 tax_refund 是增加利润的，所以用加法
+        // 退税额 是增加利润
        return $unitPrice - $ttPrice - $ddPrice - $handlingFee - $fobTransportFee - $portMiscFee - $retrofitFee - $oceanFreight - $commission - $purchaseTax + $taxRefund;
    }

@@ -819,6 +819,14 @@ class StockOrdersService
            // 如果已存在相同车辆，增加数量
            if (isset($vehList[$v->unique_id])) {
                $this->incrementVehicleCount($vehList[$v->unique_id], $currencyInfo);
+                // 拼接 remark 值
+                if (!empty($v->remark)) {
+                    if (!empty($vehList[$v->unique_id]['remark'])) {
+                        $vehList[$v->unique_id]['remark'] .= "； " . $v->remark;
+                    } else {
+                        $vehList[$v->unique_id]['remark'] = $v->remark;
+                    }
+                }
                continue;
            }
            
@@ -840,7 +848,8 @@ class StockOrdersService
                'color_exterior_snapshot' => $v->color_exterior_snapshot,
                'num' => 1,
                'modify' => $modificationText,
-                'mileage' => $v->mileage
+                'mileage' => $v->mileage,
+                'remark' => $v->remark,
            ] + $moneyValues;
            
            // 添加利润信息