rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、更改图纸上传图片的版本逻辑

This commit is contained in:
zhangke 2025-09-26 10:23:17 +08:00
parent 59948a87da
commit c5ecfd8409
3 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -158,7 +158,8 @@ public class MaterialControllerService {
pics.add(name); pics.add(name);
} else { } else {
WmsMaterial wmsMaterial = materialService.getCurrent(materialNo); WmsMaterial wmsMaterial = materialService.getCurrent(materialNo);
if (Objects.isNull(wmsMaterial) || !(StrUtil.isNotBlank(wmsMaterial.getImage()) && Objects.nonNull(wmsMaterial.getWeight()))){ if (Objects.isNull(wmsMaterial) || StrUtil.isNotBlank(wmsMaterial.getImage()))
{
wmsMaterial = new WmsMaterial() wmsMaterial = new WmsMaterial()
.setId(null) .setId(null)
.setVersion(Objects.isNull(wmsMaterial) ? 1 : wmsMaterial.getVersion() + 1) .setVersion(Objects.isNull(wmsMaterial) ? 1 : wmsMaterial.getVersion() + 1)

2
nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java
View File

@ -38,7 +38,7 @@ public class DeployTest {
//处理字体目录 //处理字体目录
handleDir(sshUtil, localPath, remotePath, "fonts"); handleDir(sshUtil, localPath, remotePath, "fonts");
//处理lib目录 //处理lib目录
// handleDir(sshUtil, localPath, remotePath, "lib"); handleDir(sshUtil, localPath, remotePath, "lib");
//执行脚本启动服务 //执行脚本启动服务
sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.exec("cd " + remotePath + " && ./restart.sh");
sshUtil.disconnect(); sshUtil.disconnect();

2
nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
View File

@ -69,7 +69,7 @@ public class MaterialZipImportProcessor implements BasicProcessor {
omsLogger.error("主数据中未查找到该物料:{}", materialNo); omsLogger.error("主数据中未查找到该物料:{}", materialNo);
} else { } else {
WmsMaterial wmsMaterial = materialService.getCurrent(materialNo); WmsMaterial wmsMaterial = materialService.getCurrent(materialNo);
if (Objects.isNull(wmsMaterial) || !(StrUtil.isNotBlank(wmsMaterial.getImage()) && Objects.nonNull(wmsMaterial.getWeight()))) { if (Objects.isNull(wmsMaterial) || StrUtil.isNotBlank(wmsMaterial.getImage())) {
omsLogger.info("添加图纸"); omsLogger.info("添加图纸");
wmsMaterial = new WmsMaterial() wmsMaterial = new WmsMaterial()
.setId(null) .setId(null)