From 02440786428d8ca175add3e92141aa74fc2b7d52 Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Thu, 12 Jun 2025 09:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dbs=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=90=8E=E7=BC=80=E7=9A=84=E6=96=B0=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/wms_main/controller/wms/TaskController.java | 2 -- .../excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java index 6fb2109..92105da 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java @@ -126,8 +126,6 @@ public class TaskController { return taskControllerService.requestInventory(inventoryRequest); } - - /** * 查询盘点任务确认信息 * @param inventoryConfirmRequest 请求 diff --git a/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java b/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java index 3e1e1d7..1a4395c 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java +++ b/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java @@ -664,6 +664,9 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor } else if (dbsRawData.getProductIdOrigin().contains("-")) { // 如果包含“-”， 则以“-”为分隔符 tempDbs.setProductId(dbsRawData.getProductIdOrigin().split("-")[0]); + } else if (dbsRawData.getProductIdOrigin().contains("_")) { + // 如果包含“-”， 则以“-”为分隔符 + tempDbs.setProductId(dbsRawData.getProductIdOrigin().split("_")[0]); } else { tempDbs.setProductId(dbsRawData.getProductIdOrigin()); }