From af5463a094ae2818bf6de206118447a1a99b67c1 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 20 五月 2025 18:04:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
index 18cb143..5a9c0e1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
@@ -68,6 +68,8 @@
@Override
public int insertApsMaterialProductGroupManagement(ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
{
+ apsMaterialProductGroupManagement.setId(IdUtil.getSnowflakeNextId());
+ apsMaterialProductGroupManagement.setCreateBy(SecurityUtils.getUsername());
apsMaterialProductGroupManagement.setCreateTime(DateUtils.getNowDate());
return apsMaterialProductGroupManagementMapper.insertApsMaterialProductGroupManagement(apsMaterialProductGroupManagement);
}
@@ -82,6 +84,7 @@
public int updateApsMaterialProductGroupManagement(ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
{
apsMaterialProductGroupManagement.setUpdateTime(DateUtils.getNowDate());
+ apsMaterialProductGroupManagement.setUpdateBy(SecurityUtils.getUsername());
return apsMaterialProductGroupManagementMapper.updateApsMaterialProductGroupManagement(apsMaterialProductGroupManagement);
}
@@ -122,6 +125,9 @@
/*鏁版嵁鍒椾粠1寮�濮�*/
for (int i = 1; i <= rows; i++) {
Row row = sheet.getRow(i);
+ if (row.getCell(0) == null) {
+ continue;
+ }
String materialCode = row.getCell(0).getStringCellValue();
if (StringUtils.isEmpty(materialCode)){
continue;
--
Gitblit v1.9.3