From d8ca9ccd14fe70e83bd586468cbc3db569f91de2 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 10 八月 2022 11:42:10 +0800
Subject: [PATCH] 更新散装件审批
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index a9558d9..cd706d3 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.whyc.config.EnumWorksheetType;
import com.whyc.mapper.ProductBomApprovingMapper;
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.pojo.*;
@@ -83,7 +84,9 @@
}
@Transactional
- public void approve(WorksheetLink link, Integer componentProductFlag) {
+ public void approve(WorksheetLink link) {
+ //鏍规嵁鑺傜偣,鏌ヨ涓昏〃绫诲瀷
+ Integer type = mainService.getInfoById(link.getMainId()).getType();
link.setDealTime(new Date());
//鏇存柊鑺傜偣淇℃伅
linkMapper.updateById(link);
@@ -110,7 +113,7 @@
}else {
//瀹℃壒閫氳繃,鏇存柊涓昏〃鐘舵��
mainService.updateEndStatusById(link.getMainId(), "瀹岀粨", 5);
- if (componentProductFlag == null) { //浜у搧瀹℃壒
+ if (type.intValue() == EnumWorksheetType.ProductBom.getType()) { //浜у搧瀹℃壒
//灏嗕骇鍝佹枃浠跺鍒惰嚦姝ｅ紡璺緞
QueryWrapper<ProductBomApproving> query = Wrappers.query();
query.eq("main_id", link.getMainId());
@@ -232,7 +235,11 @@
});
//鏇存柊姝ｅ紡bom鐨勫搴攗rl
bomService.updateUrl(fileBomApprovingList);
- }else{ //鏇存柊鏁ｈ浠�-浜у搧鍏崇郴
+ }
+ else if(type.intValue() == EnumWorksheetType.Component.getType()){ //鏁ｈ浠� TODO
+
+ }
+ else if(type.intValue() == EnumWorksheetType.ComponentProduct.getType()){ //鏇存柊鏁ｈ浠�-浜у搧鍏崇郴
//鏌ユ壘鍒板搴旂殑鏁ｈ浠�-浜у搧鍏崇郴鏁版嵁
List<ComponentProductApproving> cpAList = cpAService.getListByMainId(link.getMainId());
//鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
--
Gitblit v1.9.1