From 17097a764f854f1ed238506bc4094db45dee7728 Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Thu, 19 Nov 2026 15:43:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E5=BA=93=E5=AD=98=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E8=A1=A5=20barcode=20/=20productNameCn=EF=BC=8C?= =?UTF-8?q?=E8=BF=90=E5=8E=BB=E5=93=AA=E8=A1=A5=E5=93=81=E5=90=8D=E6=98=A0?= =?UTF-8?q?=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实际核对四家仓的库存响应后补齐: 1. InventorySnapshot 新增两个字段 - barcode:条码(UPC/EAN/GTIN),仓方原值 - productNameCn:中文品名,仓方原值 两者都可能为 null,各仓支持度不同。 2. 各仓映射补齐 - 易达云:row.barcode → barcode(原本丢弃) - 信仓:chn_name → productName + productNameCn(原本只进 productName) - 运去哪:line_name → productName(原本拿到了却没写进快照,一直是 null) - 恒健:lineName 已映射到 productName,无变化 productNameCn 只填明确是中文的字段(信仓 chn_name);运去哪 / 恒健的 line_name / lineName 语言由仓方决定,不猜,只填 productName。 Co-Authored-By: Claude --- .../warehouse/model/InventorySnapshot.java | 30 ++++++++++++++++++++++ .../edayun/adapter/EdayunInventoryMapper.java | 1 + .../xincang/adapter/XincangInventoryMapper.java | 1 + .../ecommerce/yqn/adapter/YqnInventoryMapper.java | 2 ++ 4 files changed, 34 insertions(+) diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/InventorySnapshot.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/InventorySnapshot.java index 30f73f1..5dce403 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/InventorySnapshot.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/InventorySnapshot.java @@ -30,6 +30,10 @@ public final class InventorySnapshot { private final int packageCurrent; /** 商品名(仓方原值);无则为 null。 */ private final String productName; + /** 条码(仓方原值,UPC / EAN / GTIN 等);仓方未给为 null。 */ + private final String barcode; + /** 中文品名(仓方原值);仓方未给或只给了一种语言时为 null。 */ + private final String productNameCn; /** 待出库数量;仓方未给时为 -1。 */ private final int pendingOutbound; /** 预警数量;仓方未给时为 -1。 */ @@ -55,6 +59,8 @@ public final class InventorySnapshot { this.packageInTransit = b.packageInTransit; this.packageCurrent = b.packageCurrent; this.productName = b.productName; + this.barcode = b.barcode; + this.productNameCn = b.productNameCn; this.pendingOutbound = b.pendingOutbound; this.alertQuantity = b.alertQuantity; this.volumeCbm = b.volumeCbm; @@ -142,6 +148,16 @@ public final class InventorySnapshot { return productName; } + /** 条码(UPC / EAN / GTIN 等,仓方原值);仓方未给为 null。 */ + public String barcode() { + return barcode; + } + + /** 中文品名(仓方原值);仓方未给或只给了一种语言时为 null。 */ + public String productNameCn() { + return productNameCn; + } + /** 待出库数量;仓方未给时为 -1。 */ public int pendingOutbound() { return pendingOutbound; @@ -182,6 +198,8 @@ public final class InventorySnapshot { private int packageInTransit; private int packageCurrent; private String productName; + private String barcode; + private String productNameCn; /** 仓方未给时为 -1。 */ private int pendingOutbound = -1; /** 仓方未给时为 -1。 */ @@ -274,6 +292,18 @@ public final class InventorySnapshot { return this; } + /** 条码(UPC / EAN / GTIN 等,仓方原值)。 */ + public Builder barcode(String v) { + this.barcode = v; + return this; + } + + /** 中文品名(仓方原值)。 */ + public Builder productNameCn(String v) { + this.productNameCn = v; + return this; + } + /** 待出库数量;仓方未给时传 -1。 */ public Builder pendingOutbound(int v) { this.pendingOutbound = v; diff --git a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java index 157f01b..1ebe2a2 100644 --- a/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java +++ b/warehouse-sdk-edayun/src/main/java/common/ecommerce/edayun/adapter/EdayunInventoryMapper.java @@ -82,6 +82,7 @@ public final class EdayunInventoryMapper { .inventoryType(0) .asOfUtc(asOf) .productName(blankToNull(row.skuName)) + .barcode(blankToNull(row.barcode)) // 这两个字段仓方会缺:真机 500 行里 430 行 safeStock 为 null。 // 统一模型的约定是「仓方未给时为 -1」,不能和真实的 0 混为一谈 .pendingOutbound(intOfUnknown(row.toDeliverStock)) diff --git a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangInventoryMapper.java b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangInventoryMapper.java index b3fed89..e0854da 100644 --- a/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangInventoryMapper.java +++ b/warehouse-sdk-xincang/src/main/java/common/ecommerce/xincang/adapter/XincangInventoryMapper.java @@ -102,6 +102,7 @@ public final class XincangInventoryMapper { .inventoryType(0) .asOfUtc(asOf) .productName(blankToNull(row.chnName)) + .productNameCn(blankToNull(row.chnName)) .pendingOutbound(intOf(row.waitSkuCount)) .alertQuantity(intOf(row.alarmCount)) .volumeCbm(decimalOf(row.volumeCm)) diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java index 7414bd4..2cee865 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java @@ -97,6 +97,8 @@ public final class YqnInventoryMapper { .packageReserved(intOf(row.inventoryPcsReserved)) .packageInTransit(intOf(row.inventoryPcsTransport)) .packageCurrent(intOf(row.inventoryPcsCurrent)) + // line_name 是仓方返回的行项目名;语言由仓方决定,只填 productName,不猜中文 + .productName(hasText(row.lineName) ? row.lineName.trim() : null) // 没有更新时间时用调用方给的时刻兜底:快照必须带 asOfUtc 才能与逻辑库存对齐 .asOfUtc(updatedAt == null ? fallbackAsOf : updatedAt) .build();