diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index f26d1931..2aaee60a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -161,17 +161,24 @@ public class MaterialControllerService { if (Objects.isNull(bomMaterialDTO)) { pics.add(name); } else { - WmsMaterial old = materialService.getCurrent(materialNo); String url = fileUploadService.upload(buildFilePath(name), file); - WmsMaterial material = new WmsMaterial() - .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1) - .setNo(bomMaterialDTO.getMaterialNo()) - .setDescribe(bomMaterialDTO.getMaterialDesc()) - .setDrawingNo(bomMaterialDTO.getDrawingNo()) - .setImage(url) - .setCreateBy(UserUtil.getUserName()) - .setCreateTime(LocalDateTime.now()); - materials.add(material); + WmsMaterial old = materialService.getCurrent(materialNo); + if (Objects.isNull(old) || StrUtil.isNotBlank(old.getImage())) { + WmsMaterial material = new WmsMaterial() + .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1) + .setNo(bomMaterialDTO.getMaterialNo()) + .setDescribe(bomMaterialDTO.getMaterialDesc()) + .setDrawingNo(bomMaterialDTO.getDrawingNo()) + .setImage(url) + .setCreateBy(UserUtil.getUserName()) + .setCreateTime(LocalDateTime.now()); + materials.add(material); + } else { + old.setImage(url); + old.setUpdateBy(UserUtil.getUserName()); + old.setUpdateTime(LocalDateTime.now()); + materials.add(old); + } } } if (CollectionUtil.isEmpty(pics)) { diff --git a/nflg-wms-admin/src/main/resources/application.yml b/nflg-wms-admin/src/main/resources/application.yml index e36a23fc..0f1a8756 100644 --- a/nflg-wms-admin/src/main/resources/application.yml +++ b/nflg-wms-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ server: port: 8102 tomcat: - max-http-form-post-size: 50MB + max-http-form-post-size: 200MB spring: main: allow-bean-definition-overriding: true @@ -23,8 +23,8 @@ spring: group: ${spring.profiles.active} servlet: multipart: - max-file-size: 30MB - max-request-size: 50MB + max-file-size: 200MB + max-request-size: 200MB logging: level: root: info 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 620db0c6..fed729ce 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 @@ -68,26 +68,39 @@ public class MaterialZipImportProcessor implements BasicProcessor { if (Objects.isNull(bomMaterialDTO)) { omsLogger.error("主数据中未查找到该物料:{}", materialNo); } else { - omsLogger.info("添加图纸"); - WmsMaterial old = materialService.getCurrent(materialNo); - WmsMaterial material = new WmsMaterial() - .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1) - .setNo(bomMaterialDTO.getMaterialNo()) - .setDescribe(bomMaterialDTO.getMaterialDesc()) - .setDrawingNo(bomMaterialDTO.getDrawingNo()) - .setCreateBy(userName) - .setCreateTime(LocalDateTime.now()); + String picUrl = ""; try (ByteArrayInputStream isIn = new ByteArrayInputStream(osOut.toByteArray())) { - String picUrl = fileUploadService.upload(buildFilePath(name), isIn, MediaType.IMAGE_JPEG_VALUE); + picUrl = fileUploadService.upload(buildFilePath(name), isIn, MediaType.IMAGE_JPEG_VALUE); omsLogger.info("上传后的图片地址:{}", picUrl); - material.setImage(picUrl); + } catch (Exception ex) { + omsLogger.error("上传图片失败:{}", ex.getMessage()); + } + WmsMaterial old = materialService.getCurrent(materialNo); + if (Objects.isNull(old) || StrUtil.isNotBlank(old.getImage())) { + omsLogger.info("添加图纸"); + WmsMaterial material = new WmsMaterial() + .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1) + .setNo(bomMaterialDTO.getMaterialNo()) + .setDescribe(bomMaterialDTO.getMaterialDesc()) + .setDrawingNo(bomMaterialDTO.getDrawingNo()) + .setImage(picUrl) + .setCreateBy(userName) + .setCreateTime(LocalDateTime.now()); if (materialService.save(material)) { omsLogger.info("保存成功,id:" + material.getId()); } else { omsLogger.error("保存失败"); } - } catch (Exception ex) { - omsLogger.error("上传图片失败:{}", ex.getMessage()); + } else { + omsLogger.info("更新图纸"); + old.setImage(picUrl); + old.setUpdateBy(userName); + old.setUpdateTime(LocalDateTime.now()); + if (materialService.updateById(old)) { + omsLogger.info("更新成功,id:" + old.getId()); + } else { + omsLogger.error("更新失败"); + } } } }