From d1d5454cb3512acb16a0f0e6d68e52f3ebc72e66 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 04 八月 2025 16:52:26 +0800
Subject: [PATCH] art: 生产订单列表、编辑功能修改
---
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
index eda1def..75cda98 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
@@ -1,26 +1,37 @@
package org.jeecg.modules.pms.service.impl;
+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.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsMapper;
+import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsService;
+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.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description: 璁㈠崟BOM
* @Author: jeecg-boot
- * @Date: 2025-07-01
+ * @Date: 2025-07-01
* @Version: V1.0
*/
@Service
public class PmsProcessBillMaterialsServiceImpl extends ServiceImpl<PmsProcessBillMaterialsMapper, PmsProcessBillMaterials> implements IPmsProcessBillMaterialsService {
+ @Autowired
+ private IPmsProcessBillMaterialsDetailService processBillMaterialsDetailService;
@Override
public IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
@@ -40,4 +51,50 @@
}
return super.getBaseMapper().getpmsProcessBillMaterialsListData(pageData, paramMap);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateOrderBom(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
+ for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
+ MesProductionOrder order = entry.getValue();
+ PmsProcessBillMaterials materials = getByOrderId(order.getId());
+ if(materials != null) {
+ //鏇存柊鐗╂枡鏁版嵁
+ materials.setOrderId(order.getId());
+ materials.setMaterialNumber(order.getMaterialNumber());
+ materials.setMaterialName(order.getMaterialName());
+ materials.setProductionUnit(order.getProductionUnit());
+ materials.setProductionQuantity(order.getOrderQuantity());
+ this.getBaseMapper().updateById(materials);
+ //鏇存柊鐗╂枡鏄庣粏鏁版嵁
+ processBillMaterialsDetailService.removeByMaterialsId(materials.getId());
+ //杩囨护鍑烘璁㈠崟鐨勭墿鏂欎俊鎭�
+ List<OrderBomDTO> collect = orderBomDTOList.stream().filter(orderBomDTO -> entry.getKey().equals(orderBomDTO.getAUFNR())).collect(Collectors.toList());
+ processBillMaterialsDetailService.saveBatchDetail(materials.getId(), collect);
+ }else {
+ materials = new PmsProcessBillMaterials();
+ materials.setOrderId(order.getId());
+ materials.setMaterialNumber(order.getMaterialNumber());
+ materials.setMaterialName(order.getMaterialName());
+ materials.setProductionUnit(order.getProductionUnit());
+ materials.setProductionQuantity(order.getOrderQuantity());
+ this.getBaseMapper().insert(materials);
+ //杩囨护鍑烘璁㈠崟鐨勭墿鏂欎俊鎭�
+ List<OrderBomDTO> collect = orderBomDTOList.stream().filter(orderBomDTO -> entry.getKey().equals(orderBomDTO.getAUFNR())).collect(Collectors.toList());
+ processBillMaterialsDetailService.saveBatchDetail(materials.getId(), collect);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public PmsProcessBillMaterials getByOrderId(String orderId) {
+ LambdaQueryWrapper<PmsProcessBillMaterials> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PmsProcessBillMaterials::getOrderId, orderId);
+ List<PmsProcessBillMaterials> list = super.list(queryWrapper);
+ if (CollectionUtil.isNotEmpty(list)) {
+ return list.get(0);
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3