From 3504ed684a4e947787644c1003a2b7d40e684820 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 23 八月 2022 16:55:21 +0800
Subject: [PATCH] 产品bom审批更新
---
src/main/java/com/whyc/service/WorksheetMainService.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index f7fbe79..be8bc6c 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -48,6 +48,9 @@
private ProductBomApprovingService approvingService;
@Autowired
+ private ProductApprovingService paService;
+
+ @Autowired
private MaterialProductApprovingService cpApprovingService;
@Autowired
@@ -71,8 +74,8 @@
@Transactional
public boolean submit(WorksheetMain main, DocUser user) {
main.setType(1);
- List<ProductBomApproving> bomList = main.getApprovingBomList();
- int rejectVersion=-1;
+ ProductApproving productApproving = main.getProductApproving();
+ List<ProductBomApproving> bomList = productApproving.getBomApprovingList();
//鎻愪氦涓昏〃
main.setCreateUserId(user.getId());
//鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
@@ -81,8 +84,6 @@
main.setLevel(2);
main.setStatus(1);
mainMapper.insert(main);
- }else {
- rejectVersion = approvingService.getRejectVersion(main.getId());
}
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
@@ -93,7 +94,6 @@
link.setDealDesc(main.getDealDesc());
link.setLinkStatus(0);
link.setEnableArchive(0);
- link.setRejectVersion(rejectVersion+1);
linkMapper.insert(link);
}
else if(user.getRoleId().equals("1002")){
@@ -101,8 +101,6 @@
main.setLevel(1);
main.setStatus(2);
mainMapper.insert(main);
- }else {
- rejectVersion = approvingService.getRejectVersion(main.getId());
}
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
@@ -113,7 +111,6 @@
link.setDealDesc(main.getDealDesc());
link.setLinkStatus(0);
link.setEnableArchive(1);
- link.setRejectVersion(rejectVersion+1);
linkMapper.insert(link);
}
else if(user.getRoleId().equals("1003")){
@@ -124,13 +121,35 @@
return false;
}
//浜у搧bom/鍥剧焊鍥剧墖鎻愪氦
- //鏌ヨ褰撳墠椹冲洖鐗堟湰
- int nextRejectVersion = rejectVersion+1;
+ if(productApproving.getCustomCode()!=null && bomList.get(0).getId()!=null) { //涓庡墠绔害瀹� 瀹氬埗琛ㄥ崟鍙峰叧鑱斾骇鍝�,鍒欏叧鑱旂殑浜у搧id鍐欏叆id
+ List<ProductBom> productBomList = pbService.getBomByProductId(bomList.get(0).getId());
+
+ bomList.clear();
+ productBomList.forEach(bom->{
+ ProductBomApproving approving = new ProductBomApproving();
+ approving.setCategory(bom.getCategory());
+ approving.setSubCode(bom.getSubCode());
+ approving.setSubName(bom.getSubName());
+ approving.setSubModel(bom.getSubModel());
+ approving.setUnit(bom.getUnit());
+ approving.setQuantity(bom.getQuantity());
+ approving.setProducer(bom.getProducer());
+ approving.setMaterial(bom.getMaterial());
+ approving.setThickness(bom.getThickness());
+ approving.setSurfaceDetail(bom.getSurfaceDetail());
+ approving.setNotes(bom.getNotes());
+
+ bomList.add(approving);
+ });
+ }
+ productApproving.setMainId(main.getId());
+ productApproving.setCreateTime(new Date());
+ paService.insert(productApproving);
+
bomList.forEach(bom->{
- bom.setMainId(main.getId());
+ //bom.setMainId(main.getId());
+ bom.setProductApprovingId(productApproving.getId());
bom.setUpUserId(user.getId());
- //lxw娉ㄩ噴
- //bom.setRejectVersion(nextRejectVersion);
bom.setCreateDate(new Date());
if(bom.getDwgUrl()==null){
bom.setDwgUrl("");
--
Gitblit v1.9.1