diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/TencentDocServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/TencentDocServiceImpl.java index 833bd07..f9e7a88 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/TencentDocServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/TencentDocServiceImpl.java @@ -212,6 +212,7 @@ public class TencentDocServiceImpl implements ITencentDocService { Integer addressColumn = null; Integer priceColumn = null; Integer remarkColumn = null; + Integer arrangedColumn = null; // 是否安排列 Integer logisticsColumn = null; for (int i = 0; i < headerCells.size(); i++) { @@ -227,6 +228,7 @@ public class TencentDocServiceImpl implements ITencentDocService { else if (cellText.contains("地址")) addressColumn = i; else if (cellText.contains("价格")) priceColumn = i; else if (cellText.contains("备注")) remarkColumn = i; + else if (cellText.contains("是否安排") || cellText.contains("安排")) arrangedColumn = i; else if (cellText.contains("物流")) logisticsColumn = i; } } @@ -309,8 +311,13 @@ public class TencentDocServiceImpl implements ITencentDocService { if (priceColumn != null && order.getPaymentAmount() != null) { requests.add(buildUpdateRequest(sheetId, rowIndex, priceColumn, order.getPaymentAmount().toString(), false)); } - if (remarkColumn != null && order.getRemark() != null) { - requests.add(buildUpdateRequest(sheetId, rowIndex, remarkColumn, order.getRemark(), false)); + // 备注列固定填写"有货" + if (remarkColumn != null) { + requests.add(buildUpdateRequest(sheetId, rowIndex, remarkColumn, "有货", false)); + } + // 是否安排列固定填写"2" + if (arrangedColumn != null) { + requests.add(buildUpdateRequest(sheetId, rowIndex, arrangedColumn, "2", false)); } if (logisticsColumn != null && order.getLogisticsLink() != null && !order.getLogisticsLink().isEmpty()) { requests.add(buildUpdateRequest(sheetId, rowIndex, logisticsColumn, order.getLogisticsLink(), true)); // 超链接