From 0ab30d5bb9d8def7585a4db682d5bab5e42367a3 Mon Sep 17 00:00:00 2001 From: chenxi Date: Wed, 21 Oct 2026 14:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=88=90=E6=9C=AC=EF=BC=9A?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BE=A7=E6=8E=92=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=20Cancelled=20=E7=9A=84=E6=98=8E=E7=BB=86=E8=A1=8C=20?= =?UTF-8?q?(#432)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/SyncStoreReceiptProductCost.php | 3 ++- .../pages/financial-operations/product-costs.blade.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/SyncStoreReceiptProductCost.php b/app/Console/Commands/SyncStoreReceiptProductCost.php index 90caa2a1..6e727830 100644 --- a/app/Console/Commands/SyncStoreReceiptProductCost.php +++ b/app/Console/Commands/SyncStoreReceiptProductCost.php @@ -204,7 +204,8 @@ class SyncStoreReceiptProductCost extends Command STRAIGHT_JOIN {$source['items']} i ON i.o_id = o.o_id LEFT JOIN ops_jst_warehouse_info wh ON wh.wms_co_id = o.wms_co_id WHERE COALESCE(i.sku_id, '') NOT LIKE 'X0000%' - AND UPPER(TRIM(COALESCE(i.sku_id, ''))) NOT IN ({$excludedSkuSql})" + AND UPPER(TRIM(COALESCE(i.sku_id, ''))) NOT IN ({$excludedSkuSql}) + AND UPPER(TRIM(COALESCE(o.status, ''))) <> 'CANCELLED'" ); } catch (Throwable $exception) { $this->error('订单明细查询失败（' . $source['items'] . '）：' . $exception->getMessage()); diff --git a/resources/views/business/pages/financial-operations/product-costs.blade.php b/resources/views/business/pages/financial-operations/product-costs.blade.php index 3b424700..7fccb857 100644 --- a/resources/views/business/pages/financial-operations/product-costs.blade.php +++ b/resources/views/business/pages/financial-operations/product-costs.blade.php @@ -115,6 +115,7 @@ 套餐/服务占位编码 TCXJ、FUWU 不取数（组合装里拆出的这两个编码同样剔除）。 发货仓库默认排除「常州简尚家居有限公司」「简尚-苏州福利品仓」「简尚-自动发货仓」， 其中常州简尚家居有限公司的「DF-」商品行例外保留；先排除 TCXJ/FU WU，再执行仓库过滤。 + 订单状态为 Cancelled（已取消）的明细行不参与商品成本。 定制配件这类明细行，聚水潭把配件件数写进了「商品数量」（例如数量 9524、金额 2000.04，实际单价 0.21）， 乘成品的月加权/代发单价会放大几百倍；成本单价高于该行明细单价 3 倍时判为「数量与单价口径不一致」，成本留空、不计入合计。 页面默认展示全部数据：已匹配/未匹配商品单价的行、仓库映射表里标记为「-不看」的仓