feat(oms/wms): WMS上架状态回传OMS入库业务单,修复入库状态不同步

- WMS上架推进入库状态后回传OMS(OmsServiceFeign新增returnInResult)
- OMS回传接收加固:无登录上下文判空、已入库同步issueStatus=4
- 已入库联动同步预约入库单(入库业务单)状态
This commit is contained in:
rcx
2026-09-08 13:37:43 +08:00
parent a496fc235b
commit 6c6a491ff8
4 changed files with 108 additions and 16 deletions
@@ -810,8 +810,21 @@ public class StockShelfOrderDomainService {
stockInOrder.setUpdateBy(loginUser.getUserid());
stockInOrder.setUpdateByName(loginUser.getUsername());
stockInOrder.setUpdateTime(new Date());
return stockInOrderService.update(stockInOrder,
boolean updated = stockInOrderService.update(stockInOrder,
new QueryWrapper<StockInOrder>().lambda().eq(StockInOrder::getInOrderNumber, stockShelfOrderPO.getInOrderNumber()));
if (updated) {
// 上架推进入库状态(4-上架中/5-已入库)后回传OMS入库业务单,保证OMS入库状态与WMS一致;
// OMS不可用或回传失败只记日志,不影响WMS上架主流程
try {
AjaxResult notifyResult = omsServiceFeign.returnInResult(stockShelfOrderPO.getInOrderNumber(), Long.valueOf(status), "0");
if (notifyResult == null || !"200".equals(String.valueOf(notifyResult.get("code")))) {
log.warn("回传OMS入库状态失败: orderNumber={}, status={}, result={}", stockShelfOrderPO.getInOrderNumber(), status, notifyResult);
}
} catch (Exception e) {
log.warn("回传OMS入库状态异常: orderNumber={}, status={}", stockShelfOrderPO.getInOrderNumber(), status, e);
}
}
return updated;
}
/**
* @description 完成上架