From a5aeea36d3f2f15fc0951db86190b8e0c781c43d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 12 八月 2022 10:16:05 +0800
Subject: [PATCH] 更新散装件审批
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 10de558..a746430 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -43,12 +43,22 @@
@Autowired
private ComponentProductApprovingService cpAService;
+ @Autowired
+ private ComponentApprovingService cAService;
+
+ @Autowired
+ private ComponentService cService;
+
@Transactional
public void audit(WorksheetLink link) {
link.setDealTime(new Date());
//鏇存柊鑺傜偣淇℃伅
linkMapper.updateById(link);
if(link.getLinkStatus() == 2){ //椹冲洖
+ //鏌ョ湅鏄惁涓烘暎瑁呬欢瀹℃壒,鏄垯闇�瑕佹洿鏂版暎瑁呬欢瀹℃壒琛ㄤ腑鐨勭姸鎬佷负瀹岀粨
+ if(mainService.getInfoById(link.getMainId()).getType().equals(EnumWorksheetType.Component.getType())){
+ cAService.endType(link.getMainId());
+ }
//椤圭洰缁忕悊椹冲洖,椹冲洖鍗崇粓姝�
mainService.updateEndStatusById(link.getMainId(),"缁忕悊椹冲洖,椹冲洖鍘熷洜:"+link.getDealReason(),0);
//椤圭洰缁忕悊椹冲洖鍓�,杩樻浘缁忚繃鎬荤粡鐞�,鍒欓渶瑕佸鍔犳�荤粡鐞嗛┏鍥炲師鍥�
@@ -233,8 +243,25 @@
//鏇存柊姝ｅ紡bom鐨勫搴攗rl
bomService.updateUrl(fileBomApprovingList);
}
- else if(type.intValue() == EnumWorksheetType.Component.getType()){ //鏁ｈ浠� TODO
-
+ else if(type.intValue() == EnumWorksheetType.Component.getType()){ //鏁ｈ浠�
+ //灏嗘暎瑁呬欢浠庡鎵硅〃涓浆绉诲埌姝ｅ紡琛�
+ List<Component> componentList = new LinkedList<>();
+ List<ComponentApproving> approvingList = cAService.getListByMainId(link.getMainId());
+ approvingList.forEach(approve->{
+ Component component = new Component();
+ component.setCategory(approve.getCategory());
+ component.setSubCode(approve.getSubCode());
+ component.setSubName(approve.getSubName());
+ component.setSubModel(approve.getSubModel());
+ component.setUnit(approve.getUnit());
+ component.setQuantity(approve.getQuantity());
+ component.setProducer(approve.getProducer());
+ component.setNotes(approve.getNotes());
+ componentList.add(component);
+ });
+ cService.insertBatch(componentList);
+ //鏇存柊鏁ｈ浠跺鎵瑰瓙琛ㄤ腑type涓哄畬缁�
+ cAService.endType(link.getMainId());
}
else if(type.intValue() == EnumWorksheetType.ComponentProduct.getType()){ //鏇存柊鏁ｈ浠�-浜у搧鍏崇郴
//鏌ユ壘鍒板搴旂殑鏁ｈ浠�-浜у搧鍏崇郴鏁版嵁
--
Gitblit v1.9.1