From 820224c80bb64721df20f52fcb5c388a991e83b0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 10 八月 2022 09:24:22 +0800
Subject: [PATCH] 产品管理查询信息时要显示替换件以及以前存在的关联关系
---
src/main/java/com/whyc/service/ProductBomService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomService.java b/src/main/java/com/whyc/service/ProductBomService.java
index 5bc9d86..88f7100 100644
--- a/src/main/java/com/whyc/service/ProductBomService.java
+++ b/src/main/java/com/whyc/service/ProductBomService.java
@@ -9,11 +9,9 @@
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.dto.ZipUtils;
+import com.whyc.mapper.ComponentMapper;
import com.whyc.mapper.ProductBomMapper;
-import com.whyc.pojo.DocUser;
-import com.whyc.pojo.ProductBom;
-import com.whyc.pojo.ProductBomApproving;
-import com.whyc.pojo.ProductBomHistory;
+import com.whyc.pojo.*;
import com.whyc.util.ActionUtil;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.Cell;
@@ -40,6 +38,8 @@
@Autowired(required = false)
private ProductBomMapper mapper;
+ @Autowired(required = false)
+ private ComponentMapper cponentMapper;
@Autowired
private DocLogService logService;
//鍥剧焊鍒嗙被妫�绱�
@@ -196,11 +196,13 @@
}
/**
* 鑾峰彇鎵�鏈変骇鍝佷俊鎭�*/
- public Response getAllBom() {
+ public Response getAllBom(int pageCurr,int pageSize) {
+ PageHelper.startPage(pageCurr,pageSize);
QueryWrapper wrapper=new QueryWrapper();
wrapper.select("distinct parent_code","parent_name","parent_model","version").orderByAsc("id");
List list=mapper.selectList(wrapper);
- return new Response().setII(1,list!=null?true:false,list,"杩斿洖鏁版嵁");
+ PageInfo pageInfo=new PageInfo(list);
+ return new Response().setII(1,list!=null?true:false,pageInfo,"杩斿洖鏁版嵁");
}
//浜у搧鎵撳寘涓嬭浇
public void downloadBom(HttpServletRequest req, HttpServletResponse resp, String parentModel) {
@@ -362,6 +364,21 @@
//鏍规嵁姣嶆枡鍨嬪彿鏌ヨ瀛愪欢淇℃伅鍙婃湁鏈�鏂扮増鏈叧鑱旂殑鏁ｈ浠朵俊鎭�
public Response getSubByComponentProduct(String parentModel) {
List<ProductBom> list=mapper.getSubByComponentProduct(parentModel);
+ //鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁ｈ浠�
+ ProductBom replaceBom=cponentMapper.getReplaceComponent(parentModel);
+ //濡傛灉瀛樺湪鏇挎崲鍏崇郴锛屾煡璇㈠嚭鍘熷瓙浠剁殑鍏宠仈鍏崇郴(灏嗗師瀛愪欢鍚嶇О鏀惧湪parent_name涓�)
+ if(replaceBom!=null&&!replaceBom.getSubName().isEmpty()) {
+ //replaceBom琛ㄧず涓烘浛鎹欢
+ replaceBom.setReplaceStatus(1);
+ if (replaceBom.getParentName() != null && !replaceBom.getParentName().isEmpty()) {
+ //鏌ヨ鍑哄瓨鍦ㄧ殑鏃х殑鍏宠仈瀛愪欢,杩樿涓庡師BOM鐗堟湰涓�鑷�
+ List<Component> oldCponent = mapper.getOldComponent(replaceBom.getParentName());
+ replaceBom.setComponents(oldCponent);
+ }
+ //杩樺師replaceBom鐨刾arent_model涓虹┖
+ replaceBom.setParentName(null);
+ }
+ list.add(replaceBom);
return new Response().setII(1,list.size()>0?true:false,list,"杩斿洖鏁版嵁");
}
}
--
Gitblit v1.9.1