From 79054eef527c991f9a84ab3bc3fd2603a5521eb1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 26 一月 2026 12:45:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/dto/BomImportDto.java | 37 ++++++
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 4
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 4
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 248 ++++++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 4
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 2
src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java | 4
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 2
src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java | 2
src/main/java/com/ruoyi/production/service/ProductBomService.java | 10 +
src/main/java/com/ruoyi/production/service/ProductStructureService.java | 2
src/main/java/com/ruoyi/production/controller/ProductBomController.java | 35 ++++-
13 files changed, 331 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cb6dd6c..522a324 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -27,13 +27,13 @@
private String maintenancePlanTimeReq;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
+ private String maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
+ private String maintenanceActuallyTime;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private String maintenanceActuallyTimeReq;
diff --git a/src/main/java/com/ruoyi/production/controller/ProductBomController.java b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
index b225685..b6c9bce 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductBomController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
@@ -7,16 +7,23 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductBomDto;
-import com.ruoyi.production.dto.ProductProcessDto;
-import com.ruoyi.production.pojo.*;
-import com.ruoyi.production.service.*;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProductBom;
+import com.ruoyi.production.pojo.ProductProcessRoute;
+import com.ruoyi.production.pojo.ProductStructure;
+import com.ruoyi.production.service.ProcessRouteService;
+import com.ruoyi.production.service.ProductBomService;
+import com.ruoyi.production.service.ProductProcessRouteService;
+import com.ruoyi.production.service.ProductStructureService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -55,7 +62,7 @@
@ApiModelProperty("鏂板BOM")
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add( @RequestBody ProductBom productBom) {
+ public AjaxResult add(@RequestBody ProductBom productBom) {
return productBomService.add(productBom);
}
@@ -72,14 +79,14 @@
public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
List<ProcessRoute> list = processRouteService.list(Wrappers.<ProcessRoute>lambdaQuery().in(ProcessRoute::getBomId, ids));
List<ProductProcessRoute> list2 = productProcessRouteService.list(Wrappers.<ProductProcessRoute>lambdaQuery().in(ProductProcessRoute::getBomId, ids));
- if (list.size()>0 || list2.size()>0){
+ if (list.size() > 0 || list2.size() > 0) {
return AjaxResult.error("璇OM宸茬粡瀛樺湪瀵瑰簲鐨勫伐鑹鸿矾绾�,鏃犳硶杩涜鍒犻櫎");
}
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎bom瀛愯〃
- productStructureService.remove(Wrappers.<ProductStructure>lambdaQuery().in(ProductStructure::getBomId,ids));
+ productStructureService.remove(Wrappers.<ProductStructure>lambdaQuery().in(ProductStructure::getBomId, ids));
return AjaxResult.success(productBomService.removeBatchByIds(ids));
}
@@ -91,4 +98,18 @@
return AjaxResult.success(productBoms);
}
+
+ @PostMapping("uploadBom")
+ @Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
+ @ApiOperation("鏍规嵁Excel瀵煎叆BOM")
+ public AjaxResult uploadBom(@RequestParam("file") MultipartFile file) {
+ return productBomService.uploadBom(file);
+ }
+
+ @PostMapping("exportBom")
+ @Log(title = "瀵煎嚭BOM鏂囦欢", businessType = BusinessType.EXPORT)
+ @ApiOperation("瀵煎嚭BOM鏂囦欢")
+ public void exportBom(HttpServletResponse response, @RequestParam Integer bomId) {
+ productBomService.exportBom(response, bomId);
+ }
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
index 5d28332..89ead6d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -34,7 +34,7 @@
@ApiOperation("BOM鏌ョ湅瀛愰泦璇︽儏")
@GetMapping("/listBybomId/{bomId}")
- public R listBybomId( @PathVariable("bomId") Long bomId){
+ public R listBybomId( @PathVariable("bomId") Integer bomId){
return R.ok(productStructureService.listBybomId(bomId));
}
}
diff --git a/src/main/java/com/ruoyi/production/dto/BomImportDto.java b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
new file mode 100644
index 0000000..0cea81a
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/BomImportDto.java
@@ -0,0 +1,37 @@
+package com.ruoyi.production.dto;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class BomImportDto {
+
+ @Excel(name = "鐖堕」浜у搧缂栧彿")
+ private String parentCode;
+
+ @Excel(name = "鐖堕」浜у搧鍚嶇О")
+ private String parentName;
+
+ @Excel(name = "鐖堕」浜у搧瑙勬牸")
+ private String parentSpec;
+
+ @Excel(name = "瀛愰」浜у搧缂栧彿")
+ private String childCode;
+
+ @Excel(name = "瀛愰」浜у搧鍚嶇О")
+ private String childName;
+
+ @Excel(name = "瀛愰」浜у搧瑙勬牸")
+ private String childSpec;
+
+ @Excel(name = "鍗曚綅鐢ㄩ噺")
+ private BigDecimal unitQty;
+
+ @Excel(name = "鎶曟枡宸ュ簭")
+ private String process;
+
+ @Excel(name = "澶囨敞")
+ private String remark;
+}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
index bd1831f..bd59242 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
@@ -13,7 +13,7 @@
@Mapper
public interface ProductStructureMapper extends BaseMapper<ProductStructure> {
- List<ProductStructureDto> listBybomId(@Param("bomId") Long bomId);
+ List<ProductStructureDto> listBybomId(@Param("bomId") Integer bomId);
- List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Long bomId, @Param("processId") Long processId);
+ List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Integer bomId, @Param("processId") Long processId);
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index 2eabc15..fe661b3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -40,5 +40,5 @@
private String processRouteCode;
@ApiModelProperty(value = "BOM鐨処D")
- private Long bomId;
+ private Integer bomId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
index fac6d15..833de7c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
@@ -51,7 +51,7 @@
private LocalDateTime updateTime;
@ApiModelProperty("鍏宠仈bom鐨刬d")
- private Long bomId;
+ private Integer bomId;
@ApiModelProperty("宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index 34a3ee3..32b39b6 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
@@ -50,7 +50,7 @@
/**
* 鍏宠仈BOMid
*/
- private Long bomId;
+ private Integer bomId;
/**
* 鐖惰妭鐐笽D
diff --git a/src/main/java/com/ruoyi/production/service/ProductBomService.java b/src/main/java/com/ruoyi/production/service/ProductBomService.java
index 0736338..d812f9f 100644
--- a/src/main/java/com/ruoyi/production/service/ProductBomService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductBomService.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductBomDto;
-import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.pojo.ProductBom;
-import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
/**
* <p>
@@ -21,4 +23,8 @@
IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto);
AjaxResult add(ProductBom productBom);
+
+ AjaxResult uploadBom(MultipartFile file);
+
+ void exportBom(HttpServletResponse response, Integer bomId);
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductStructureService.java b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
index b85a040..ebdddb1 100644
--- a/src/main/java/com/ruoyi/production/service/ProductStructureService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
@@ -12,6 +12,6 @@
Boolean addProductStructureDto(ProductStructureDto productStructureDto);
- List<ProductStructureDto> listBybomId(Long bomId);
+ List<ProductStructureDto> listBybomId(Integer bomId);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
index 06d4d09..2554b5e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -1,23 +1,36 @@
package com.ruoyi.production.service.impl;
+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 com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.basic.service.IProductService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.dto.BomImportDto;
import com.ruoyi.production.dto.ProductBomDto;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.ProductBomMapper;
-import com.ruoyi.production.mapper.ProductStructureMapper;
import com.ruoyi.production.pojo.ProductBom;
+import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductBomService;
+import com.ruoyi.production.service.ProductProcessService;
+import com.ruoyi.production.service.ProductStructureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -31,13 +44,20 @@
public class ProductBomServiceImpl extends ServiceImpl<ProductBomMapper, ProductBom> implements ProductBomService {
@Autowired
+ private IProductService productService;
+
+ @Autowired
private ProductBomMapper productBomMapper;
+
@Autowired
private IProductModelService productModelService;
@Autowired
- private ProductStructureMapper productStructureMapper;
+ private ProductStructureService productStructureService;
+
+ @Autowired
+ private ProductProcessService productProcessService;
@Override
public IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto) {
@@ -49,7 +69,6 @@
public AjaxResult add(ProductBom productBom) {
boolean save = productBomMapper.insert(productBom) > 0;
if (save) {
- // 鏍规嵁id鐢熸垚no瀛楁锛欸X + 8浣嶆暟瀛楋紙涓嶈冻8浣嶅墠闈㈣ˉ0锛�
String no = "BM." + String.format("%05d", productBom.getId());
productBom.setBomNo(no);
productBomMapper.updateById(productBom);
@@ -69,12 +88,231 @@
productStructure.setProductModelId(productBom.getProductModelId());
productStructure.setUnit(productModel.getUnit());
productStructure.setUnitQuantity(BigDecimal.valueOf(1));
- productStructure.setBomId(Long.valueOf(productBom.getId()));
+ productStructure.setBomId(productBom.getId());
- productStructureMapper.insert(productStructure);
+ productStructureService.save(productStructure);
return AjaxResult.success();
}
return AjaxResult.error();
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult uploadBom(MultipartFile file) {
+ ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
+ List<BomImportDto> list;
+ try {
+ list = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ return AjaxResult.error("Excel瑙ｆ瀽澶辫触");
+ }
+
+ if (list == null || list.isEmpty()) return AjaxResult.error("鏁版嵁涓虹┖");
+
+ // 澶勭悊宸ュ簭
+ list.forEach(dto -> {
+ dto.setParentName(clean(dto.getParentName()));
+ dto.setParentSpec(clean(dto.getParentSpec()));
+ dto.setChildName(clean(dto.getChildName()));
+ dto.setChildSpec(clean(dto.getChildSpec()));
+ });
+ handleProcess(list);
+ Map<String, Long> processMap = productProcessService.list().stream()
+ .collect(Collectors.toMap(ProductProcess::getName, ProductProcess::getId, (k1, k2) -> k1));
+
+ // 鍒涘缓 BOM 鏁版嵁
+ BomImportDto first = list.get(0);
+ ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
+ ProductBom bom = new ProductBom();
+ bom.setProductModelId(rootModel.getId());
+ bom.setVersion("1.0");
+ productBomMapper.insert(bom);
+ bom.setBomNo("BM." + String.format("%05d", bom.getId()));
+ productBomMapper.updateById(bom);
+
+ // 璁板綍宸茬粡鎻掑叆缁撴瀯鐨勮妭鐐癸細Key = "鍚嶇О+瑙勬牸", Value = structure_id
+ Map<String, Long> treePathMap = new HashMap<>();
+
+ for (int i = 0; i < list.size(); i++) {
+ BomImportDto dto = list.get(i);
+ String parentKey = dto.getParentName() + "|" + dto.getParentSpec();
+ String childKey = dto.getChildName() + "|" + dto.getChildSpec();
+
+ //澶勭悊鏍硅妭鐐�,绗竴琛屼笖瀛愰」涓虹┖
+ if (i == 0 && StringUtils.isBlank(dto.getChildName())) {
+ ProductStructure rootNode = new ProductStructure();
+ rootNode.setBomId(bom.getId());
+ rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
+ rootNode.setProductModelId(rootModel.getId());
+ rootNode.setUnitQuantity(BigDecimal.ONE);
+ rootNode.setUnit(rootModel.getUnit());
+ productStructureService.save(rootNode);
+
+ treePathMap.put(parentKey, rootNode.getId());
+ continue;
+ }
+
+ // 澶勭悊瀛愬眰绾ц妭鐐�
+ // 鎵惧埌鐖惰妭鐐瑰湪鏁版嵁搴撻噷鐨� ID
+ Long parentStructureId = treePathMap.get(parentKey);
+ if (parentStructureId == null) {
+ // 濡傛灉 Map 閲屾壘涓嶅埌锛岃鏄� Excel 椤哄簭涔变簡鎴栬�呮暟鎹湁璇�
+ throw new ServiceException("瀵煎叆澶辫触: 鐖堕」[" + dto.getParentName() + "]蹇呴』鍦ㄥ叾瀛愰」涔嬪墠瀹氫箟");
+ }
+
+ // 鑾峰彇瀛愰」妯″瀷淇℃伅
+ ProductModel childModel = findModel(dto.getChildName(), dto.getChildSpec());
+
+ // 鎻掑叆缁撴瀯琛�
+ ProductStructure node = new ProductStructure();
+ node.setBomId(bom.getId());
+ node.setParentId(parentStructureId); // 鐖惰妭鐐笽D
+ node.setProductModelId(childModel.getId());
+ node.setUnitQuantity(dto.getUnitQty());
+ node.setUnit(childModel.getUnit());
+ if (processMap.containsKey(dto.getProcess())) {
+ node.setProcessId(processMap.get(dto.getProcess()));
+ }
+ productStructureService.save(node);
+
+ // 鎶婂綋鍓嶅瓙椤硅褰曞埌 Map,浣滀负浠ュ悗鏇存繁灞傜骇鐨勭埗椤规煡鎵句緷鎹�
+ // 鍚屼竴鐖堕」涓嬬殑鍚屽悕瀛愰」涓嶉渶瑕侀噸澶嶈褰�
+ treePathMap.put(childKey, node.getId());
+ }
+
+ return AjaxResult.success("BOM瀵煎叆鎴愬姛");
+ }
+
+
+ @Override
+ public void exportBom(HttpServletResponse response, Integer bomId) {
+ if (bomId == null) {
+ return;
+ }
+
+ List<ProductStructureDto> treeData = productStructureService.listBybomId(bomId);
+ if (treeData == null || treeData.isEmpty()) {
+ return;
+ }
+
+ // 灏嗘爲褰㈢粨鏋勬墎骞冲寲 浣跨敤 BFS绠楁硶 瀵煎嚭,鎸夊眰绾ч『搴�
+ List<BomImportDto> exportList = new ArrayList<>();
+
+ // Map<ID, Node> idMap 鐢ㄤ簬鏌ユ壘鐖惰妭鐐�
+ Map<Long, ProductStructureDto> idMap = new HashMap<>();
+ populateMap(treeData, idMap);
+
+ // treeData 鐨勭涓�涓槸鏍硅妭鐐�
+ for (ProductStructureDto root : treeData) {
+ // 娣诲姞鏍硅妭鐐�
+ BomImportDto rootRow = new BomImportDto();
+ rootRow.setParentName(root.getProductName());
+ rootRow.setParentSpec(root.getModel());
+ rootRow.setUnitQty(root.getUnitQuantity());
+ rootRow.setRemark("");
+ exportList.add(rootRow);
+
+ // BFS 閬嶅巻-闃熷垪
+ Queue<ProductStructureDto> queue = new LinkedList<>();
+ if (root.getChildren() != null) {
+ queue.addAll(root.getChildren());
+ }
+
+ while (!queue.isEmpty()) {
+ ProductStructureDto child = queue.poll();
+
+ // 鏌ユ壘鐖惰妭鐐�
+ ProductStructureDto parent = idMap.get(child.getParentId());
+ if (parent == null) {
+ // 闄や簡鏈�澶栧眰鑺傜偣,鍏朵粬鑺傜偣鐨勭埗绫昏偗瀹氭槸涓嶄細涓虹┖鐨�
+ continue;
+ }
+
+ BomImportDto row = new BomImportDto();
+ // 鐖剁被淇℃伅
+ row.setParentName(parent.getProductName());
+ row.setParentSpec(parent.getModel());
+ // 瀛愮被淇℃伅
+ row.setChildName(child.getProductName());
+ row.setChildSpec(child.getModel());
+ row.setUnitQty(child.getUnitQuantity());
+ row.setProcess(child.getProcessName());
+
+ exportList.add(row);
+
+ // 灏嗗瓙鑺傜偣鐨勫瓙鑺傜偣鍔犲叆闃熷垪-涓嬩竴灞�
+ if (child.getChildren() != null && !child.getChildren().isEmpty()) {
+ queue.addAll(child.getChildren());
+ }
+ }
+ }
+
+ ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
+ util.exportExcel(response, exportList, "BOM缁撴瀯瀵煎嚭");
+ }
+
+ private void populateMap(List<ProductStructureDto> nodes, Map<Long, ProductStructureDto> map) {
+ if (nodes == null || nodes.isEmpty()) {
+ return;
+ }
+ for (ProductStructureDto node : nodes) {
+ map.put(node.getId(), node);
+ populateMap(node.getChildren(), map);
+ }
+ }
+
+ private ProductModel findModel(String name, String spec) {
+ Product product = productService.getOne(new LambdaQueryWrapper<Product>()
+ .eq(Product::getProductName, name).last("limit 1"));
+ if (product == null) throw new ServiceException("浜у搧鏈淮鎶わ細" + name);
+
+ ProductModel model = productModelService.getOne(new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getProductId, product.getId())
+ .eq(ProductModel::getModel, spec).last("limit 1"));
+ if (model == null) throw new ServiceException("瑙勬牸鏈淮鎶わ細" + name + "[" + spec + "]");
+ return model;
+ }
+
+ private void handleProcess(List<BomImportDto> list) {
+
+ Set<String> processNames = list.stream()
+ .map(BomImportDto::getProcess)
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.toSet());
+
+ if (processNames.isEmpty()) {
+ return;
+ }
+
+ List<ProductProcess> exists = productProcessService.list(
+ new LambdaQueryWrapper<ProductProcess>().in(ProductProcess::getName, processNames)
+ );
+
+ Set<String> existNames = exists.stream()
+ .map(ProductProcess::getName)
+ .collect(Collectors.toSet());
+
+ List<ProductProcess> needSave = processNames.stream()
+ .filter(n -> !existNames.contains(n))
+ .map(n -> {
+ ProductProcess p = new ProductProcess();
+ p.setName(n);
+ return p;
+ })
+ .collect(Collectors.toList());
+
+ if (!needSave.isEmpty()) {
+ productProcessService.saveBatch(needSave);
+ needSave.forEach(p -> p.setNo("GX" + String.format("%08d", p.getId())));
+ productProcessService.updateBatchById(needSave);
+ }
+ }
+
+ private String clean(String s) {
+ if (s == null) return null;
+ return s.replaceAll("[\\u00A0\\u3000]", "").trim();
+ }
}
+
+
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 6b43c18..381b642 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -27,7 +27,7 @@
@Transactional
public Boolean addProductStructureDto(ProductStructureDto dto) {
- Long bomId = dto.getBomId();
+ Integer bomId = dto.getBomId();
// 灏嗘爲鎵佸钩鍖�
List<ProductStructureDto> flatDtoList = new ArrayList<>();
@@ -130,7 +130,7 @@
@Override
- public List<ProductStructureDto> listBybomId(Long bomId) {
+ public List<ProductStructureDto> listBybomId(Integer bomId) {
List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
Map<Long, ProductStructureDto> map = new HashMap<>();
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9d5dd33..7046102 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -44,6 +44,10 @@
<if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
</if>
+ <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+ and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
+ and dm.maintenance_actually_time < date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
+ </if>
</where>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
--
Gitblit v1.9.3