From 5d9865a1b1d48cb3192ecce036f706ef582c1424 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 09:47:17 +0800
Subject: [PATCH] 去掉所有的报错正常运行
---
src/main/java/com/whyc/service/WorksheetMainService.java | 90 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index dacbee5..f4ae2ec 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -12,7 +12,6 @@
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.mapper.WorksheetMainMapper;
import com.whyc.pojo.*;
-import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.Zip4jUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,19 +48,19 @@
private ProductBomApprovingService approvingService;
@Autowired
- private ComponentProductApprovingService cpApprovingService;
+ private MaterialProductApprovingService cpApprovingService;
@Autowired
- private ComponentApprovingService cApprovingService;
+ private MaterialApprovingService cApprovingService;
@Autowired
- private ComponentService cService;
+ private MaterialService cService;
@Autowired
private ProductBomService pbService;
@Autowired
- private ComponentProductHistoryService cphService;
+ private MaterialProductHistoryService cphService;
@Autowired
private ProductSoftwareApprovingService psaService;
@@ -127,7 +126,8 @@
bomList.forEach(bom->{
bom.setMainId(main.getId());
bom.setUpUserId(user.getId());
- bom.setRejectVersion(nextRejectVersion);
+ //lxw娉ㄩ噴
+ //bom.setRejectVersion(nextRejectVersion);
bom.setCreateDate(new Date());
if(bom.getDwgUrl()==null){
bom.setDwgUrl("");
@@ -149,14 +149,14 @@
return true;
}
- public boolean componentProductSubmit(WorksheetMainDTO mainDTO, DocUser user) {
- List<ComponentProductApproving> approvingList = new LinkedList<>();
+ public boolean MaterialProductSubmit(WorksheetMainDTO mainDTO, DocUser user) {
+ List<MaterialProductApproving> approvingList = new LinkedList<>();
WorksheetMain main = mainDTO.getMain();
- List<ComponentProductApproving> addedList = mainDTO.getAddedList();
- List<ComponentProductApproving> replacedList = mainDTO.getReplacedList();
- List<ComponentProductApproving> removedList = mainDTO.getRemovedList();
+ List<MaterialProductApproving> addedList = mainDTO.getAddedList();
+ List<MaterialProductApproving> replacedList = mainDTO.getReplacedList();
+ List<MaterialProductApproving> removedList = mainDTO.getRemovedList();
- main.setType(EnumWorksheetType.ComponentProduct.getType());
+ main.setType(EnumWorksheetType.MaterialProduct.getType());
//鎻愪氦涓昏〃
main.setCreateUserId(user.getId());
//鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
@@ -227,33 +227,33 @@
return true;
}
- public Response componentSubmit(WorksheetMain main, DocUser user) {
+ public Response MaterialSubmit(WorksheetMain main, DocUser user) {
Response<Object> response = new Response<>();
- List<ComponentApproving> cApprovingList = main.getCApprovingList();
+ List<MaterialApproving> cApprovingList = main.getCApprovingList();
//鍒ゆ柇鏄柊澧炶繕鏄垹闄�
boolean isAdded = cApprovingList.get(0).getSubName()!=null;
if(isAdded) { //鏂板
//鏌ヨ鏄惁鏈� 宸茬敓鏁堟垨鑰呭凡鎻愪氦瀹℃壒鐨� 鐩稿悓鐨勬暎瑁呬欢
- List<Component> existComponentList = new LinkedList<>();
- List<ComponentApproving> existCAList = new LinkedList<>();
+ List<Material> existMaterialList = new LinkedList<>();
+ List<MaterialApproving> existCAList = new LinkedList<>();
- List<Component> componentList = cService.getList();
- List<ComponentApproving> cAList = cApprovingService.getListByStatus(1);
+ List<Material> MaterialList = cService.getList();
+ List<MaterialApproving> cAList = cApprovingService.getListByStatus(1);
for (int i = 0; i < cApprovingList.size(); i++) {
- ComponentApproving componentApproving = cApprovingList.get(i);
- for (int j = 0; j < componentList.size(); j++) {
- if (componentApproving.getSubCode().equals(componentList.get(j).getSubCode())
- && componentApproving.getSubName().equals(componentList.get(j).getSubName())
- && componentApproving.getSubModel().equals(componentList.get(j).getSubModel())
+ MaterialApproving MaterialApproving = cApprovingList.get(i);
+ for (int j = 0; j < MaterialList.size(); j++) {
+ if (MaterialApproving.getSubCode().equals(MaterialList.get(j).getSubCode())
+ && MaterialApproving.getSubName().equals(MaterialList.get(j).getSubName())
+ && MaterialApproving.getSubModel().equals(MaterialList.get(j).getSubModel())
) {
- existComponentList.add(componentList.get(j));
+ existMaterialList.add(MaterialList.get(j));
}
}
for (int j = 0; j < cAList.size(); j++) {
- if (componentApproving.getSubCode().equals(cAList.get(j).getSubCode())
- && componentApproving.getSubName().equals(cAList.get(j).getSubName())
- && componentApproving.getSubModel().equals(cAList.get(j).getSubModel())
+ if (MaterialApproving.getSubCode().equals(cAList.get(j).getSubCode())
+ && MaterialApproving.getSubName().equals(cAList.get(j).getSubName())
+ && MaterialApproving.getSubModel().equals(cAList.get(j).getSubModel())
) {
existCAList.add(cAList.get(j));
}
@@ -261,31 +261,32 @@
}
int existCASize = existCAList.size();
- int existComponentSize = existComponentList.size();
+ int existMaterialSize = existMaterialList.size();
if (existCASize != 0) {
- if (existComponentSize != 0) {
- response.setII(21, existCAList, existComponentList, "閲嶅鎻愪氦:鐜版湁鏁ｈ浠跺強姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ if (existMaterialSize != 0) {
+ response.setII(21, existCAList, existMaterialList, "閲嶅鎻愪氦:鐜版湁鏁ｈ浠跺強姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
} else {
response.set(22, existCAList, "閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
}
return response;
} else {
- if (existComponentSize != 0) {
- return response.setII(23, null, existComponentList, "閲嶅鎻愪氦:鐜版湁鏁ｈ浠朵腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ if (existMaterialSize != 0) {
+ return response.setII(23, null, existMaterialList, "閲嶅鎻愪氦:鐜版湁鏁ｈ浠朵腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
}
}
}else{ //鍒犻櫎
//鍒ゆ柇鏄惁鍦ㄦ暎瑁呬欢瀹℃壒鍒犻櫎涓�,鏄惁瀛樺湪浜у搧鍏宠仈鍙婂叧鑱斿鎵�
- ComponentApproving deleteApproving = new ComponentApproving();
- List<ComponentProductHistory> existComponentProducts = new LinkedList<>();
- List<ComponentProductApproving> existComponentProductApprovingList = new LinkedList<>();
- deleteApproving = cApprovingService.getListByComponentId(cApprovingList.get(0).getComponentId());
+ MaterialApproving deleteApproving = new MaterialApproving();
+ List<MaterialProductHistory> existMaterialProducts = new LinkedList<>();
+ List<MaterialProductApproving> existMaterialProductApprovingList = new LinkedList<>();
+ deleteApproving = cApprovingService.getListByMaterialId(cApprovingList.get(0).getMaterialId());
//鏌ョ湅浜у搧鍏宠仈
- List<ComponentProductHistory> cphLatestExistList = cphService.getLatestExistListByComponentId(cApprovingList.get(0).getComponentId());
+ List<MaterialProductHistory> cphLatestExistList = cphService.getLatestExistListByMaterialId(cApprovingList.get(0).getMaterialId());
//鏌ョ湅浜у搧鍏宠仈瀹℃壒
- List<ComponentProductApproving> cpaLatestExistList = cpApprovingService.getLatestExistListByComponentId(cApprovingList.get(0).getComponentId());
-
+ //lxw娉ㄩ噴
+ //List<MaterialProductApproving> cpaLatestExistList = cpApprovingService.getLatestExistListByMaterialId(cApprovingList.get(0).getMaterialId());
+ List<MaterialProductApproving> cpaLatestExistList =new ArrayList<>();
if(deleteApproving!=null){
return response.set(31,deleteApproving,"鎷掔粷鏈鍒犻櫎鐢宠,褰撳墠鏁ｈ浠舵鍦ㄨ繘琛屽垹闄ゅ鎵�");
}
@@ -302,7 +303,7 @@
}
}
- main.setType(EnumWorksheetType.Component.getType());
+ main.setType(EnumWorksheetType.Material.getType());
//鎻愪氦涓昏〃
main.setCreateUserId(user.getId());
//鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
@@ -588,10 +589,13 @@
Integer type = getInfoById(id).getType();
if(type.intValue() == EnumWorksheetType.ProductBom.getType()) {
return mainMapper.getLinkList(id);
- }else if(type.intValue() == EnumWorksheetType.Component.getType()){
- return mainMapper.getLinkListWithComponents(id);
+ }else if(type.intValue() == EnumWorksheetType.Material.getType()){
+ //lxw娉ㄩ噴
+ //return mainMapper.getLinkListWithMaterials(id);
+ return null;
}else{ //鏁ｈ浠�-浜у搧
- return mainMapper.getLinkListWithComponentProducts(id);
+ //return mainMapper.getLinkListWithMaterialProducts(id);
+ return null;
}
}
--
Gitblit v1.9.1