From b29a1cb6fbca3cf8cf1d307c4c519ae2047c9b18 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 15:43:13 +0800
Subject: [PATCH] art: 物料台账-相关接口修改
---
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 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..f9f93f1 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
@@ -2,28 +2,21 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.lsw.entity.LswMaterial;
-import org.jeecg.modules.lsw.entity.LswMaterialInventory;
-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.*;
-import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 绾胯竟搴撶墿鏂欎俊鎭�
@@ -33,33 +26,6 @@
*/
@Service
public class LswMaterialServiceImpl extends ServiceImpl<LswMaterialMapper, LswMaterial> implements ILswMaterialService {
-
- @Autowired
- private LswMaterialMapper lswMaterialMapper;
- @Autowired
- private LswMaterialInventoryMapper lswMaterialInventoryMapper;
-
- @Override
- public IPage<Map<String, Object>> getLswMaterialListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- Map<String, String> paramMap = new HashMap<String, String>();
- Map<String, String[]> parameterMap = req.getParameterMap();
- if (null != parameterMap) {
- if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
- paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
- }
- if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
- paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
- }
- if (parameterMap.containsKey("materialModel") && StringUtils.isNotBlank(parameterMap.get("materialModel")[0])) {
- paramMap.put("materialModel", parameterMap.get("materialModel")[0].trim());
- }
- if (parameterMap.containsKey("materialCategory") && StringUtils.isNotBlank(parameterMap.get("materialCategory")[0])) {
- paramMap.put("materialCategory", parameterMap.get("materialCategory")[0].trim());
- }
- }
- return super.getBaseMapper().getLswMaterialListData(pageData, paramMap);
- }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -88,7 +54,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 +66,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 +79,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