Browse Source

fix(yqn): 修 P0 状态误判 + 三处回调数据丢失 + 结算/库存口径

全链路审计(18 个接口逐字段比对)后的第一批修复。

P0:
- YqnOutboundStatus 用 contains("SHIP") 匹配,UNSHIPPED(未发货)被判成
  SHIPPED(已交运)。下游会认为货已发出,checkCancel 直接 BLOCKED。
  改为按 API 128 的文档枚举精确匹配(canceled/shipped/picked/approved/
  assigned/unshipped/pending),未收录值归 UNKNOWN。测试固化 UNSHIPPED
  不再命中。

P1(回调数据丢失):
- API 154 业务单据变动:orderNoStatus / orderNoStatusDesc 完全没带出去,
  只剩「有变化」通知。WarehouseCallback 增加 rawStatus 字段,与
  rawEventType 里的单据类型一起解释(同一个 5 在四套码表下含义不同)
- API 142 退货入库:processMode=3(不良品上架)与 5(良品上架)都映射
  RESTOCK,不良品被报成良品。core 新增 RESTOCK_UNSELLABLE(50)
- API 150 库存变动:opLabel 缺失或未知时默认判出库,入库流水可能被反向
  扣减。InventoryPayload.inbound 改为 Boolean,未知返回 null

P1(口径):
- API 133 结算:settlementType 为 null 时被当作「实际结算」,正踩
  Javadoc 警告的反向风险。改为「只有 1 才是实际,其余一律按预估」
- API 107 库存:warehouseCode 回退用的是仓方编码,与出库/入库单的 OMS
  编码口径不一致;asOfUtc 缺省时用 Instant.now() 而非注入的 clock

全量 410 个测试通过。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 1 week ago
parent
commit
de11a900af
  1. 4
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/enums/ReturnProcessDisposition.java
  2. 34
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/WarehouseCallback.java
  3. 4
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java
  4. 6
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java
  5. 21
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java
  6. 65
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/enums/YqnOutboundStatus.java
  7. 23
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/webhook/YqnInventoryCallbackParser.java
  8. 6
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/webhook/YqnOrderCallbackParser.java
  9. 28
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java
  10. 38
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/webhook/YqnCallbackParsersTest.java

4
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/enums/ReturnProcessDisposition.java

@ -19,7 +19,9 @@ public enum ReturnProcessDisposition { @@ -19,7 +19,9 @@ public enum ReturnProcessDisposition {
/** 销毁。 */
DESTROY(20, "销毁"),
/** 上架(良品)。 */
RESTOCK(30, "上架"),
RESTOCK(30, "良品上架"),
/** 上架(不良品)。 */
RESTOCK_UNSELLABLE(50, "不良品上架"),
/** 换标后上架(良品)。 */
RESTOCK_RELABEL(40, "换标上架"),
/** 无法识别;0 保留给 UNKNOWN。 */

34
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/WarehouseCallback.java

@ -35,6 +35,14 @@ public final class WarehouseCallback { @@ -35,6 +35,14 @@ public final class WarehouseCallback {
private final String requestNo;
/** 事件发生时间;报文未给时为 null。 */
private final Instant occurredAt;
/**
* 仓方给的单据状态原值;报文未给时为 null。
*
* <p><b>不能单独解释</b>:同一状态码在不同单据类型下含义不同
* (如运去哪的 5 在入库计划里是「审核通过」、在退货认领里是「待处理」)。
* 单据类型见 {@link #rawEventType()}。</p>
*/
private final String rawStatus;
private final String rawBody;
private final OutboundPayload outbound;
@ -51,6 +59,7 @@ public final class WarehouseCallback { @@ -51,6 +59,7 @@ public final class WarehouseCallback {
this.providerOrderNo = b.providerOrderNo;
this.requestNo = b.requestNo;
this.occurredAt = b.occurredAt;
this.rawStatus = b.rawStatus;
this.rawBody = b.rawBody;
this.outbound = b.outbound;
this.returns = b.returns;
@ -96,6 +105,11 @@ public final class WarehouseCallback { @@ -96,6 +105,11 @@ public final class WarehouseCallback {
return occurredAt;
}
/** 仓方给的单据状态原值;需与 {@link #rawEventType()} 一起解释。 */
public String rawStatus() {
return rawStatus;
}
/** 原始报文;排查与回溯用。 */
public String rawBody() {
return rawBody;
@ -129,7 +143,7 @@ public final class WarehouseCallback { @@ -129,7 +143,7 @@ public final class WarehouseCallback {
*/
public String fingerprint() {
return sourceProvider + "|" + eventType + "|" + providerOrderNo + "|"
+ requestNo + "|" + occurredAt;
+ requestNo + "|" + rawStatus + "|" + occurredAt;
}
/** 出库 / 面单类载荷。 */
@ -370,8 +384,8 @@ public final class WarehouseCallback { @@ -370,8 +384,8 @@ public final class WarehouseCallback {
private final String orderNo;
/** 仓方单据类型码原值(如 100 销售出库);语义由适配器的平台枚举解释。 */
private final Integer providerOperationType;
/** 是否入库方向;true 入库、false 出库。 */
private final boolean inbound;
/** 变动方向;true 入库、false 出库、<b>null 表示仓方未给或无法识别</b>。 */
private final Boolean inbound;
/** 变动数量(正数)。 */
private final Integer quantity;
@ -422,8 +436,8 @@ public final class WarehouseCallback { @@ -422,8 +436,8 @@ public final class WarehouseCallback {
return providerOperationType;
}
/** 是否入库方向。 */
public boolean inbound() {
/** 变动方向;true 入库、false 出库、null 未知(不要当做出库处理)。 */
public Boolean inbound() {
return inbound;
}
@ -440,7 +454,7 @@ public final class WarehouseCallback { @@ -440,7 +454,7 @@ public final class WarehouseCallback {
private String planNo;
private String orderNo;
private Integer providerOperationType;
private boolean inbound;
private Boolean inbound;
private Integer quantity;
public Builder sku(String v) {
@ -478,7 +492,7 @@ public final class WarehouseCallback { @@ -478,7 +492,7 @@ public final class WarehouseCallback {
return this;
}
public Builder inbound(boolean v) {
public Builder inbound(Boolean v) {
this.inbound = v;
return this;
}
@ -503,6 +517,7 @@ public final class WarehouseCallback { @@ -503,6 +517,7 @@ public final class WarehouseCallback {
private String providerOrderNo;
private String requestNo;
private Instant occurredAt;
private String rawStatus;
private String rawBody;
private OutboundPayload outbound;
private ReturnPayload returns;
@ -549,6 +564,11 @@ public final class WarehouseCallback { @@ -549,6 +564,11 @@ public final class WarehouseCallback {
return this;
}
public Builder rawStatus(String v) {
this.rawStatus = v;
return this;
}
public Builder rawBody(String v) {
this.rawBody = v;
return this;

4
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java

@ -401,7 +401,9 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -401,7 +401,9 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
String raw = YqnEnvelope.of(resp, json, "warehouse.inventory.query",
ctx.warehouseCode(), ctx.requestId()).body();
YqnInventoryDtos.InventoryPage page = json.fromJson(raw, YqnInventoryDtos.InventoryPage.class);
return YqnInventoryMapper.toPage(page, ctx.providerWarehouseId(), zoneOf(ctx), query.cursor());
// 回退用 OMS 仓编码,与出库/入库单口径一致;仓方编码只在请求侧用
return YqnInventoryMapper.toPage(page, ctx.warehouseCode(), zoneOf(ctx), query.cursor(),
java.time.Instant.now(ctx.clock()));
}
// ------------------------------------------------------------------ 入库

6
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java

@ -118,8 +118,10 @@ public final class YqnFeeMapper { @@ -118,8 +118,10 @@ public final class YqnFeeMapper {
.feeName(detail.costName)
.feeType(feeTypeOf(detail.costName))
.settledAt(parseTime(detail.settlementTime, zone))
// 1 实际结算 → estimated=false;2 预估结算 → true
.estimated(detail.settlementType != null && detail.settlementType == 2)
// 1 实际结算 → estimated=false;2 预估结算 → true;
// 未知(null 或其它值)按预估处理:宁可当未发生,也不把预估金额
// 记成已发生成本(对账方向相反会少算/多算)
.estimated(detail.settlementType == null || detail.settlementType != 1)
.amount(detail.costAmount == null ? Money.zero(CURRENCY)
: Money.of(java.math.BigDecimal.valueOf(detail.costAmount), CURRENCY))
.saleOrderNo(detail.saleOrderNo == null ? null : String.valueOf(detail.saleOrderNo))

21
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java

@ -63,6 +63,15 @@ public final class YqnInventoryMapper { @@ -63,6 +63,15 @@ public final class YqnInventoryMapper {
/** 一条库存记录 → 统一快照。 */
public static InventorySnapshot toSnapshot(YqnInventoryDtos.InventoryRow row, String fallbackWarehouseCode,
ZoneId zone) {
return toSnapshot(row, fallbackWarehouseCode, zone, null);
}
/**
* @param fallbackAsOf 缺少 {@code updated_at} 时的兜底时间;调用方应传注入的 clock,
* 不要用 {@code Instant.now()}(SDK 不读系统时钟)
*/
public static InventorySnapshot toSnapshot(YqnInventoryDtos.InventoryRow row, String fallbackWarehouseCode,
ZoneId zone, Instant fallbackAsOf) {
String warehouseCode = hasText(row.warehouseCode) ? row.warehouseCode.trim()
: fallbackWarehouseCode;
String sku = row.sku == null ? null : row.sku.trim();
@ -87,20 +96,26 @@ public final class YqnInventoryMapper { @@ -87,20 +96,26 @@ public final class YqnInventoryMapper {
.packageReserved(intOf(row.inventoryPcsReserved))
.packageInTransit(intOf(row.inventoryPcsTransport))
.packageCurrent(intOf(row.inventoryPcsCurrent))
// 没有更新时间时用查询时刻兜底:快照必须带 asOfUtc 才能与逻辑库存对齐
.asOfUtc(updatedAt == null ? Instant.now() : updatedAt)
// 没有更新时间时用调用方给的时刻兜底:快照必须带 asOfUtc 才能与逻辑库存对齐
.asOfUtc(updatedAt == null ? fallbackAsOf : updatedAt)
.build();
}
/** 解析一整页。 */
public static Page<InventorySnapshot> toPage(YqnInventoryDtos.InventoryPage page, String fallbackWarehouseCode,
ZoneId zone, String requestedPage) {
return toPage(page, fallbackWarehouseCode, zone, requestedPage, null);
}
/** 带兜底时刻的版本;{@code fallbackAsOf} 由调用方传入注入的 clock。 */
public static Page<InventorySnapshot> toPage(YqnInventoryDtos.InventoryPage page, String fallbackWarehouseCode,
ZoneId zone, String requestedPage, Instant fallbackAsOf) {
if (page == null || page.data == null || page.data.content == null) {
return Page.empty();
}
List<InventorySnapshot> items = new ArrayList<InventorySnapshot>(page.data.content.size());
for (YqnInventoryDtos.InventoryRow row : page.data.content) {
InventorySnapshot snapshot = toSnapshot(row, fallbackWarehouseCode, zone);
InventorySnapshot snapshot = toSnapshot(row, fallbackWarehouseCode, zone, fallbackAsOf);
if (snapshot != null) {
items.add(snapshot);
}

65
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/enums/YqnOutboundStatus.java

@ -5,49 +5,46 @@ import common.ecommerce.warehouse.enums.OutboundStatus; @@ -5,49 +5,46 @@ import common.ecommerce.warehouse.enums.OutboundStatus;
/**
* 运去哪出库单状态(API 128 的 {@code orderStatusEnum})。
*
* <p>运去哪这个字段给的是英文文本而不是数字码,且目前<b>没有公开发布的码表</b>,
* 所以这里按关键字匹配。匹配不到的归 {@link #UNKNOWN}——<b>不猜</b>,
* 早先的实现把认不出的当 {@code SUBMITTED}(已下发)是错的。</p>
* <p>运去哪这个字段给的是英文文本而不是数字码。文档与实测见过的取值:
* {@code pending / unshipped / approved / assigned / picked / shipped / canceled / refunded}。</p>
*
* <p>关键字匹配是有损的:{@code UNSHIPPED} 这类名字会命中 {@code SHIP}。
* 拿到官方码表后应改成精确匹配。</p>
* <p><b>按完整值精确匹配,不做子串包含</b>。早先的实现用 {@code contains("SHIP")},
* 结果 {@code UNSHIPPED}(未发货)被误判成 {@code SHIPPED}(已交运)——
* 下游会据此认为货已发出、并且取消会被直接判为不可取消。</p>
*
* <p>认不出的归 {@link #UNKNOWN},不猜。</p>
*/
public enum YqnOutboundStatus {
/** 已取消 / 取消中。 */
CANCELLED("CANCEL", OutboundStatus.CANCELLED),
/** 已交运 / 已发出 / 已妥投。 */
SHIPPED("SHIP", OutboundStatus.SHIPPED),
/** 已妥投(独立关键字,避免只靠 SHIP 覆盖)。 */
DELIVERED("DELIVER", OutboundStatus.SHIPPED),
/** 面单已打印。 */
LABEL_READY("LABEL", OutboundStatus.LABEL_READY),
/** 已打包。 */
PACKED("PACK", OutboundStatus.PACKED),
/** 拣货中。 */
PICKING("PICK", OutboundStatus.PICKING),
/** 仓已接单。 */
ACCEPTED("ACCEPT", OutboundStatus.ACCEPTED),
/** 异常。 */
EXCEPTION("EXCEPTION", OutboundStatus.EXCEPTION),
/** 失败 / 错误。 */
FAILED("FAIL", OutboundStatus.EXCEPTION),
/** 错误码。 */
ERROR("ERROR", OutboundStatus.EXCEPTION),
CANCELLED("canceled", OutboundStatus.CANCELLED),
/** 已交运。 */
SHIPPED("shipped", OutboundStatus.SHIPPED),
/** 已拣货完成,等待打包。 */
PICKED("picked", OutboundStatus.PICKING),
/** 已审核。 */
APPROVED("approved", OutboundStatus.ACCEPTED),
/** 已分配 / 已确认(仓已接单)。 */
ASSIGNED("assigned", OutboundStatus.ACCEPTED),
/** 未发货(已接单但未操作)。 */
UNSHIPPED("unshipped", OutboundStatus.SUBMITTED),
/** 待处理(仓未确认)。 */
PENDING("pending", OutboundStatus.SUBMITTED),
/** 无法识别。 */
UNKNOWN(null, OutboundStatus.UNKNOWN);
private final String keyword;
/** 运去哪原始值(小写);null 表示「无关键字 / 认不出」。 */
private final String rawValue;
private final OutboundStatus core;
YqnOutboundStatus(String keyword, OutboundStatus core) {
this.keyword = keyword;
YqnOutboundStatus(String rawValue, OutboundStatus core) {
this.rawValue = rawValue;
this.core = core;
}
/** 运去哪原始值里的关键字;null 表示「无关键字 / 认不出」。 */
public String keyword() {
return keyword;
/** 运去哪原始值;null 表示无法识别。 */
public String rawValue() {
return rawValue;
}
/** 对应的底层状态。 */
@ -56,20 +53,20 @@ public enum YqnOutboundStatus { @@ -56,20 +53,20 @@ public enum YqnOutboundStatus {
}
/**
* 运去哪原始值 → 平台枚举。
* 运去哪原始值 → 平台枚举。<b>精确匹配</b>(忽略大小写与首尾空白)。
*
* <p>空值或匹配不到返回 {@link #UNKNOWN}。按声明顺序匹配,越具体的放越前。</p>
* <p>空值、未收录的取值都返回 {@link #UNKNOWN}。</p>
*/
public static YqnOutboundStatus of(String rawStatus) {
if (rawStatus == null) {
return UNKNOWN;
}
String s = rawStatus.trim().toUpperCase();
String s = rawStatus.trim();
if (s.isEmpty()) {
return UNKNOWN;
}
for (YqnOutboundStatus v : values()) {
if (v.keyword != null && s.contains(v.keyword)) {
if (v.rawValue != null && s.equalsIgnoreCase(v.rawValue)) {
return v;
}
}

23
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/webhook/YqnInventoryCallbackParser.java

@ -28,6 +28,8 @@ public final class YqnInventoryCallbackParser { @@ -28,6 +28,8 @@ public final class YqnInventoryCallbackParser {
/** 库存变动方向:入库。 */
private static final int OP_LABEL_INBOUND = 2;
/** 库存变动方向:出库。 */
private static final int OP_LABEL_OUTBOUND = 3;
private YqnInventoryCallbackParser() {
}
@ -54,7 +56,7 @@ public final class YqnInventoryCallbackParser { @@ -54,7 +56,7 @@ public final class YqnInventoryCallbackParser {
.planNo(body.planNo)
.orderNo(body.orderNo)
.providerOperationType(body.opType)
.inbound(body.opLabel != null && body.opLabel == OP_LABEL_INBOUND)
.inbound(direction(body.opLabel))
.quantity(body.quantity)
.build())
.build();
@ -63,6 +65,25 @@ public final class YqnInventoryCallbackParser { @@ -63,6 +65,25 @@ public final class YqnInventoryCallbackParser {
return out;
}
/**
* 变动方向;<b>未知时返回 null 而不是默认为出库</b>。
*
* <p>之前只有 {@code ==2} 判入库、其余全算出库,{@code opLabel} 缺失或出现
* 新码值时会把入库流水记成出库,库存被反向扣减。</p>
*/
static Boolean direction(Integer opLabel) {
if (opLabel == null) {
return null;
}
if (opLabel == OP_LABEL_INBOUND) {
return Boolean.TRUE;
}
if (opLabel == OP_LABEL_OUTBOUND) {
return Boolean.FALSE;
}
return null;
}
private static Boolean isTrue(Integer flag) {
return flag == null ? null : flag != 0;
}

6
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/webhook/YqnOrderCallbackParser.java

@ -42,6 +42,9 @@ public final class YqnOrderCallbackParser { @@ -42,6 +42,9 @@ public final class YqnOrderCallbackParser {
.sourceProvider(WarehouseProvider.YQN)
.eventType(WarehouseEventType.ORDER_STATUS_CHANGED)
.rawEventType("ORDER_STATUS:" + body.orderNoType)
// 状态码含义随单据类型变化,必须一起带出去;调用方按
// (orderType, orderStatus) 二元组查码表
.rawStatus(body.orderNoStatus == null ? null : String.valueOf(body.orderNoStatus))
.providerOrderNo(body.orderNo)
.requestNo(body.sourceNo)
.occurredAt(parseTime(body.changeTime))
@ -78,6 +81,7 @@ public final class YqnOrderCallbackParser { @@ -78,6 +81,7 @@ public final class YqnOrderCallbackParser {
.sourceProvider(WarehouseProvider.YQN)
.eventType(WarehouseEventType.RETURN_INBOUND_COMPLETED)
.rawEventType("RETURN_INBOUND:" + body.orderNoType)
.rawStatus(body.orderNoStatus == null ? null : String.valueOf(body.orderNoStatus))
.providerOrderNo(body.orderNo)
.requestNo(body.sourceNo)
.occurredAt(parseTime(body.changeTime))
@ -98,7 +102,7 @@ public final class YqnOrderCallbackParser { @@ -98,7 +102,7 @@ public final class YqnOrderCallbackParser {
case 2:
return ReturnProcessDisposition.DESTROY.name();
case 3:
return ReturnProcessDisposition.RESTOCK.name();
return ReturnProcessDisposition.RESTOCK_UNSELLABLE.name();
case 4:
return ReturnProcessDisposition.RESTOCK_RELABEL.name();
case 5:

28
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java

@ -213,14 +213,32 @@ class YqnAdapterTest { @@ -213,14 +213,32 @@ class YqnAdapterTest {
@Test
void statusMappingCoversKnownValues() {
assertEquals(OutboundStatus.CANCELLED, YqnOutboundStatus.toCore("CANCELLED"));
assertEquals(OutboundStatus.PICKING, YqnOutboundStatus.toCore("PICKING"));
assertEquals(OutboundStatus.LABEL_READY, YqnOutboundStatus.toCore("LABEL_PRINTED"));
assertEquals(OutboundStatus.SHIPPED, YqnOutboundStatus.toCore("SHIPPED"));
assertEquals(OutboundStatus.EXCEPTION, YqnOutboundStatus.toCore("EXCEPTION"));
// API 128 的 orderStatusEnum 实际取值(文档枚举)
assertEquals(OutboundStatus.CANCELLED, YqnOutboundStatus.toCore("canceled"));
assertEquals(OutboundStatus.SHIPPED, YqnOutboundStatus.toCore("shipped"));
assertEquals(OutboundStatus.PICKING, YqnOutboundStatus.toCore("picked"));
assertEquals(OutboundStatus.ACCEPTED, YqnOutboundStatus.toCore("approved"));
assertEquals(OutboundStatus.ACCEPTED, YqnOutboundStatus.toCore("assigned"));
assertEquals(OutboundStatus.SUBMITTED, YqnOutboundStatus.toCore("unshipped"));
assertEquals(OutboundStatus.SUBMITTED, YqnOutboundStatus.toCore("pending"));
// 大小写与空白不敏感
assertEquals(OutboundStatus.SHIPPED, YqnOutboundStatus.toCore(" SHIPPED "));
assertNull(YqnOutboundMapper.parseTime("", null));
}
/**
* 回归:UNSHIPPED(未发货)曾被 contains("SHIP") 命中判成已交运,
* 导致未发货单被当成已发出、取消被锁。现在必须精确匹配。
*/
@Test
void unshippedIsNotShipped() {
assertEquals(OutboundStatus.SUBMITTED, YqnOutboundStatus.toCore("unshipped"));
assertEquals(OutboundStatus.SUBMITTED, YqnOutboundStatus.toCore("UNSHIPPED"));
// 未收录的形态归 UNKNOWN,不靠子串猜
assertEquals(OutboundStatus.UNKNOWN, YqnOutboundStatus.toCore("not_shipped"));
assertEquals(OutboundStatus.UNKNOWN, YqnOutboundStatus.toCore("ship_partial"));
}
/** 认不出的状态必须归 UNKNOWN,不能猜成 SUBMITTED(已下发)。 */
@Test
void unknownStatusIsNotGuessed() {

38
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/webhook/YqnCallbackParsersTest.java

@ -85,7 +85,8 @@ class YqnCallbackParsersTest { @@ -85,7 +85,8 @@ class YqnCallbackParsersTest {
@Test
void processModeMapsToDisposition() {
assertEquals("DESTROY", YqnOrderCallbackParser.processModeLabel(2));
assertEquals("RESTOCK", YqnOrderCallbackParser.processModeLabel(3));
// 3 不良品上架 与 5 良品上架 必须能区分
assertEquals("RESTOCK_UNSELLABLE", YqnOrderCallbackParser.processModeLabel(3));
assertEquals("RESTOCK_RELABEL", YqnOrderCallbackParser.processModeLabel(4));
assertEquals("RESTOCK", YqnOrderCallbackParser.processModeLabel(5));
// 未知不猜
@ -130,12 +131,43 @@ class YqnCallbackParsersTest { @@ -130,12 +131,43 @@ class YqnCallbackParsersTest {
assertEquals(Boolean.FALSE, inv.overWarehouse());
assertEquals(Integer.valueOf(100), inv.providerOperationType());
// opLabel 3 = 出库
assertEquals(false, inv.inbound());
assertEquals(Boolean.FALSE, inv.inbound());
assertEquals(Integer.valueOf(2), inv.quantity());
assertEquals(Instant.parse("2026-11-10T06:00:00Z"), cb.occurredAt());
}
@Test
void inventoryDirectionUnknownIsNull() {
// 缺 opLabel 或出现新码值:不能默认出库
assertNull(YqnInventoryCallbackParser.direction(null));
assertNull(YqnInventoryCallbackParser.direction(99));
assertEquals(Boolean.TRUE, YqnInventoryCallbackParser.direction(2));
assertEquals(Boolean.FALSE, YqnInventoryCallbackParser.direction(3));
}
@Test
void orderStatusCallbackCarriesStatus() {
String body = "{\"sourceNo\":\"OB-1\",\"orderNo\":\"IP900\",\"orderNoType\":5,"
+ "\"orderNoStatus\":15,\"orderNoStatusDesc\":\"处理完成\","
+ "\"changeTime\":\"2026-11-10 03:20:00\"}";
WarehouseCallback cb = YqnOrderCallbackParser.parseOrderStatus(body).get(0);
// 状态必须带出去,且不能脱离单据类型单独解释
assertEquals("15", cb.rawStatus());
assertEquals("ORDER_STATUS:5", cb.rawEventType());
}
@Test
void returnCallbackCarriesStatus() {
String body = "{\"orderNo\":\"RT1\",\"orderNoType\":3,\"orderNoStatus\":8,"
+ "\"changeTime\":\"2026-11-10 05:00:00\",\"processMode\":5,"
+ "\"items\":[{\"sku\":\"S1\",\"shelfQuantity\":1,\"batchParamNo\":\"PC1\"}]}";
assertEquals("8", YqnOrderCallbackParser.parseReturnInbound(body).get(0).rawStatus());
}
@Test
void inventoryInboundDirection() {
String body = "{\"orgWarehouseCode\":\"W\",\"sku\":\"S\",\"inventoryType\":0,"
+ "\"isOverWarehouse\":1,\"sourceNo\":\"X\",\"planNo\":\"P\",\"orderNo\":\"O\","
@ -159,7 +191,7 @@ class YqnCallbackParsersTest { @@ -159,7 +191,7 @@ class YqnCallbackParsersTest {
YqnInventoryCallbackParser.parse(body).get(0).inventory();
assertEquals(Integer.valueOf(7), inv.quantity());
assertEquals(false, inv.inbound());
assertEquals(Boolean.FALSE, inv.inbound());
}
// ---------------------------------------------------------------- 时间解析

Loading…
Cancel
Save