From 8caf5f04be94d8f52fb291dd045663079d681c19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java b/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java
index 35b111b..3590878 100644
--- a/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java
@@ -88,7 +88,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
- List<LswMaterial> addList = new ArrayList<>();
+ Map<String, LswMaterial> addMap = new HashMap<>();
for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
MesProductionOrder order = entry.getValue();
LswMaterial material = queryByMaterialNumber(order.getMaterialNumber());
@@ -100,7 +100,7 @@
material.setMaterialName(order.getMaterialName());
material.setMaterialUnit(order.getProductionUnit());
material.setDelFlag(CommonConstant.DEL_FLAG_0);
- addList.add(material);
+ addMap.put(material.getMaterialNumber(), material);
}
}
for (OrderBomDTO bomDTO : orderBomDTOList) {
@@ -113,10 +113,11 @@
material.setMaterialName(bomDTO.getMAKTX());
material.setMaterialUnit(bomDTO.getMEINS());
material.setDelFlag(CommonConstant.DEL_FLAG_0);
- addList.add(material);
+ addMap.put(material.getMaterialNumber(), material);
}
}
- if (CollectionUtil.isEmpty(addList)) {
+ if (CollectionUtil.isNotEmpty(addMap)) {
+ Collection<LswMaterial> addList = addMap.values();
super.saveBatch(addList);
}
return true;
--
Gitblit v1.9.3