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/WorksheetMainService.java | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index f46fac5..8bc441f 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -41,9 +41,6 @@
@Autowired
private ProductBomApprovingService approvingService;
- @Autowired
- private ProductBomService bomService;
-
@Transactional
public boolean submit(WorksheetMain main, DocUser user) {
List<ProductBomApproving> bomList = main.getApprovingBomList();
@@ -88,16 +85,8 @@
return false;
}
//浜у搧bom/鍥剧焊鍥剧墖鎻愪氦
-
- //鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
- Integer version = bomService.getProduct(bomList.get(0).getParentModel()).getVersion();
- if(version==null){
- version = 0;
- }
- Integer finalVersion = version;
bomList.forEach(bom->{
bom.setMainId(main.getId());
- bom.setVersion(finalVersion+1);
});
approvingService.insert(bomList);
return true;
@@ -294,7 +283,7 @@
public Response<PageInfo<WorksheetMain>> getHandledListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),1);
+ List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),1);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
--
Gitblit v1.9.1