From b572e82dcafea0fd893d908c7bb0e048483a1dd3 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 13:38:54 +0800
Subject: [PATCH] fix: 生产计划下发时产品类型ID未保存
---
src/main/java/com/ruoyi/production/controller/ProductBomController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductBomController.java b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
index 0ad7d59..b485981 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductBomController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,11 +12,9 @@
import com.ruoyi.production.dto.ProductBomDto;
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;
@@ -49,15 +48,12 @@
private ProcessRouteService processRouteService;
@Autowired
- private ProductProcessRouteService productProcessRouteService;
-
- @Autowired
private ProductStructureService productStructureService;
@GetMapping("/listPage")
@Log(title = "BOM-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("BOM-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, ProductBomDto productBomDto) {
+ public AjaxResult listPage(Page<ProductBom> page, ProductBomDto productBomDto) {
IPage<ProductBomDto> listPage = productBomService.listPage(page, productBomDto);
return AjaxResult.success(listPage);
}
@@ -81,8 +77,7 @@
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
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) {
return AjaxResult.error("璇OM宸茬粡瀛樺湪瀵瑰簲鐨勫伐鑹鸿矾绾�,鏃犳硶杩涜鍒犻櫎");
}
if (CollectionUtils.isEmpty(ids)) {
@@ -101,13 +96,21 @@
return AjaxResult.success(productBoms);
}
+ @GetMapping("/getDictCode")
+ @Log(title = "BOM-鏍规嵁閫夋嫨鐨勪骇鍝佸瀷鍙锋煡璇㈠瓨鍦ㄧ殑bom", businessType = BusinessType.OTHER)
+ @ApiOperation("BOM-鏍规嵁閫夋嫨鐨勪骇鍝佸瀷鍙锋煡璇㈠瓨鍦ㄧ殑bom")
+ public AjaxResult getDictCode(Long dictCode) {
+ List<ProductBom> bomList = productBomService.list(new LambdaQueryWrapper<ProductBom>().eq(ProductBom::getDictCode, dictCode));
+ return AjaxResult.success(bomList);
+ }
+
@PostMapping("uploadBom")
@PreAuthorize("@ss.hasPermi('product:bom:import')")
@Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
@ApiOperation("鏍规嵁Excel瀵煎叆BOM")
- public AjaxResult uploadBom(@RequestParam("file") MultipartFile file) {
- return productBomService.uploadBom(file);
+ public AjaxResult uploadBom(@RequestParam("file") MultipartFile file, @RequestParam("dictCode") Long dictCode) {
+ return productBomService.uploadBom(file, dictCode);
}
@PostMapping("exportBom")
--
Gitblit v1.9.3