From d4e2085bc9792233e55791a380ebfec6262dff73 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 26 七月 2022 16:08:08 +0800
Subject: [PATCH] 更新工作流
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 75c6a3c..bf6a1fa 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -30,6 +30,11 @@
@Autowired
private ProductBomApprovingMapper approvingMapper;
+ @Autowired
+ private ProductBomService bomService;
+
+ @Autowired
+ private ProductBomHistoryService historyService;
@Transactional
public void audit(WorksheetLink link) {
@@ -98,7 +103,16 @@
//澧炲姞->澧炲姞閮ㄤ欢(澧炲姞璁板綍,鍚屾椂鎵�鏈塭Version+1)
//淇敼->淇敼閮ㄤ欢鍥剧焊,淇敼閮ㄤ欢闈炲浘绾�(澧炲姞璁板綍,鍚屾椂淇敼闈炲師閮ㄤ欢鐨勬墍鏈塭Version+1)
//鍒犻櫎? TODO 闇�瑕佺害瀹氶�昏緫
- //鏇存柊鍒皃roduct_bom_history
+
+ //鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
+ Integer version = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
+ if(version==null){
+ version = 0;
+ }
+ Integer nextVersion = version+1;
+ //鏇存柊鍒皃roduct_bom_history,闇�瑕乻Version鍜宔Version
+ //澧炲姞鎵�鏈夐儴浠�,鎺掓煡鍑虹浉鍏崇殑鍘熼儴浠�,闈炰篃鏄洿鏂�
+ //historyService.get
//鏇存柊鍒皃roduct_bom
@@ -128,4 +142,14 @@
public List<WorksheetMain> getInfoList2(Long userId, int statusExp) {
return linkMapper.getInfoList2(userId,statusExp);
}
+
+ /**
+ *
+ * @param userId 鎬荤粡鐞嗗搴旂殑userId
+ * @param statusExp 0:鏈鎵�,1:宸插鎵�(鍖呭惈鐘舵�佸��1,2)
+ * @return
+ */
+ public List<WorksheetMain> getInfoList3(Long userId, int statusExp) {
+ return linkMapper.getInfoList3(userId,statusExp);
+ }
}
--
Gitblit v1.9.1