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 | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 2808281..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
@@ -13,16 +13,17 @@
import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper;
import org.jeecg.modules.lsw.mapper.LswMaterialMapper;
import org.jeecg.modules.lsw.service.ILswMaterialService;
+import org.jeecg.modules.mes.entity.MesProductionOrder;
+import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
+import org.jeecg.modules.sap.dto.OrderBomDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 绾胯竟搴撶墿鏂欎俊鎭�
@@ -64,7 +65,7 @@
@Transactional(rollbackFor = Exception.class)
public boolean editMaterial(LswMaterial lswMaterial) {
LswMaterial entity = this.getBaseMapper().selectById(lswMaterial.getId());
- if(entity == null) {
+ if (entity == null) {
throw new JeecgBootException("瑕佺紪杈戠殑鏁版嵁涓嶅瓨鍦紒");
}
entity.setMaterialCategory(lswMaterial.getMaterialCategory());
@@ -84,4 +85,42 @@
return list.get(0);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
+ Map<String, LswMaterial> addMap = new HashMap<>();
+ for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
+ MesProductionOrder order = entry.getValue();
+ LswMaterial material = queryByMaterialNumber(order.getMaterialNumber());
+ if (material == null) {
+ //鏂板鐗╂枡
+ material = new LswMaterial();
+ material.setMaterialStatus(CommonConstant.STATUS_1);
+ material.setMaterialNumber(order.getMaterialNumber());
+ material.setMaterialName(order.getMaterialName());
+ material.setMaterialUnit(order.getProductionUnit());
+ material.setDelFlag(CommonConstant.DEL_FLAG_0);
+ addMap.put(material.getMaterialNumber(), material);
+ }
+ }
+ for (OrderBomDTO bomDTO : orderBomDTOList) {
+ LswMaterial material = queryByMaterialNumber(bomDTO.getMATNR());
+ if (material == null) {
+ //鏂板鐗╂枡
+ material = new LswMaterial();
+ material.setMaterialStatus(CommonConstant.STATUS_1);
+ material.setMaterialNumber(bomDTO.getMATNR());
+ material.setMaterialName(bomDTO.getMAKTX());
+ material.setMaterialUnit(bomDTO.getMEINS());
+ material.setDelFlag(CommonConstant.DEL_FLAG_0);
+ addMap.put(material.getMaterialNumber(), material);
+ }
+ }
+ if (CollectionUtil.isNotEmpty(addMap)) {
+ Collection<LswMaterial> addList = addMap.values();
+ super.saveBatch(addList);
+ }
+ return true;
+ }
+
}
--
Gitblit v1.9.3