diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java index 4ae2fe43..bf2df47d 100644 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java +++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java @@ -83,8 +83,20 @@ public class MaterialZipImportProcessor implements BasicProcessor { WmsMaterial old = materialService.getCurrent(materialNo); if (Objects.isNull(old) || StrUtil.isNotBlank(old.getImage())) { omsLogger.info("添加图纸"); + // 计算新版本号 + String newVersion; + if (Objects.isNull(old)) { + newVersion = "1"; + } else { + try { + int versionNum = Integer.parseInt(old.getVersion()); + newVersion = String.valueOf(versionNum + 1); + } catch (NumberFormatException e) { + newVersion = old.getVersion() + ".1"; + } + } WmsMaterial material = new WmsMaterial() - .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1) + .setVersion(newVersion) .setNo(bomMaterialDTO.getMaterialNo()) .setDescribe(bomMaterialDTO.getMaterialDesc()) .setDrawingNo(bomMaterialDTO.getDrawingNo())