调整备货单pdf

app/common/service/PurchaseOrdersService.php

@@ -163,7 +163,6 @@ class PurchaseOrdersService
         
         switch ($scene) {
             case 'index':
-                // $config['where']['status'] = 1;
                 $config['order']['id'] = 'desc';
                 break;
             case 'update':
@@ -193,29 +192,18 @@ class PurchaseOrdersService
             // 构建查询条件
             $config = $this->buildQueryConfig($request, 'update');
             
-            // 删除采购单明细
+            // 软删除采购单明细
             $order = $this->logicShow($config);
             if ($order && $order->items) {
-                PurchaseOrderItems::where('purchase_order_id', $order->id)->delete();
+                foreach ($order->items as $item) {
+                    $item->delete();
+                }
             }
             
-            // 删除采购单主表
-            $deleted = $this->logicDeleteBy($config);
+            // 软删除采购单主表
+            $order->delete();
             
-            return $this->postProcess('Destroy', $deleted);
+            return $this->postProcess('Destroy', $order);
         });
     }
-
-
-//     protected function afterServiceShow($item)
-//     {
-        
-//         $item['items'] = $item->items->map(function ($item) {
-//             $item['stock_order'] = $item->stockOrderItems;
-//             return $item;
-//         });
-// var_dump($item->toArray());
-//         return $item;
-
-//     }
 }

app/common/service/StockOrdersService.php

@@ -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;
             
             // 添加利润信息