Merge branch 'develop' into feature/NoScanning

This commit is contained in:
曹鹏飞 2026-06-02 09:55:32 +08:00
commit 9213b663d0
1 changed files with 4 additions and 2 deletions

View File

@ -115,8 +115,10 @@ public class MaterialControllerService {
VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在!"); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在!");
WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
wmsMaterial.setVersion(old.getVersion()); wmsMaterial.setVersion(old.getVersion());
wmsMaterial.setUpdateBy(UserUtil.getUserName()); wmsMaterial.setCreateBy(UserUtil.getUserName());
wmsMaterial.setUpdateTime(LocalDateTime.now()); wmsMaterial.setCreateTime(LocalDateTime.now());
// wmsMaterial.setUpdateBy(UserUtil.getUserName());
// wmsMaterial.setUpdateTime(LocalDateTime.now());
materialService.add(wmsMaterial); materialService.add(wmsMaterial);
} }