From 21b29d06eb84b76c5aec891ede71db28fba2e035 Mon Sep 17 00:00:00 2001
From: qiuxiang <394405259@qq.com>
Date: Tue, 20 Oct 2026 11:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=8D=E8=8F=9C=E6=9C=AA=E6=8A=A5=E9=94=80?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=A7=8D=E8=8F=9C=E6=98=8E=E7=BB=86=E5=B7=B2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=80=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/SyncStoreReceiptOrderMatches.php        | 5 +++--
 ...unreimbursed_amount_to_store_receipt_order_match_rows.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/SyncStoreReceiptOrderMatches.php b/app/Console/Commands/SyncStoreReceiptOrderMatches.php
index 4b1817d0..325a2911 100644
--- a/app/Console/Commands/SyncStoreReceiptOrderMatches.php
+++ b/app/Console/Commands/SyncStoreReceiptOrderMatches.php
@@ -1455,13 +1455,14 @@ class SyncStoreReceiptOrderMatches extends Command
     }
 
     /**
-     * 种菜未报销订单号：只取聚水潭订单标签明细里「是否种菜订单＝是」的订单号。
+     * 种菜未报销订单号：聚水潭订单标签明细里「是否种菜订单＝是」，且尚未出现在种菜明细表。
      *
      * @return array<string,true>
      */
     private function plantingUnreimbursedCores(): array
     {
         $companyId = (int) $this->option('company');
+        $reimbursementCores = $this->plantingReimbursementCores();
         $positiveLabels = [];
         foreach (app(JstOrderLabelPlantingRules::class)->map($companyId) as $label => $flag) {
             if ($flag === '是') {
@@ -1472,7 +1473,7 @@ class SyncStoreReceiptOrderMatches extends Command
         $cores = [];
         foreach (app(PlantingOrderLabelLookup::class)->orderNumbers($companyId, $positiveLabels) as $orderNo) {
             $core = self::orderCoreNo((string) $orderNo);
-            if ($core !== '') {
+            if ($core !== '' && ! isset($reimbursementCores[$core])) {
                 $cores[$core] = true;
             }
         }
diff --git a/database/migrations/2026_10_20_030000_add_planting_unreimbursed_amount_to_store_receipt_order_match_rows.php b/database/migrations/2026_10_20_030000_add_planting_unreimbursed_amount_to_store_receipt_order_match_rows.php
index 4c511bec..a37d382f 100644
--- a/database/migrations/2026_10_20_030000_add_planting_unreimbursed_amount_to_store_receipt_order_match_rows.php
+++ b/database/migrations/2026_10_20_030000_add_planting_unreimbursed_amount_to_store_receipt_order_match_rows.php
@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 /**
  * 业绩明细新增「种菜未报销」列（放在种菜报销后面）：
- * 仅按聚水潭订单标签明细「是否种菜订单=是」的订单号命中，金额取收入金额。
+ * 按聚水潭订单标签明细「是否种菜订单=是」且未出现在种菜明细表的订单号命中，金额取收入金额。
  */
 return new class extends Migration
 {