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()); }