~whyclxw/CadDrawManager.git

			@@ -15,10 +15,7 @@
			import javax.annotation.Resource;
			import java.io.File;
			import java.io.IOException;
			import java.util.Date;
			import java.util.LinkedList;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			@@ -46,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.endStatus(link.getMainId());
			}
			//项目经理驳回,驳回即终止
			mainService.updateEndStatusById(link.getMainId(),"经理驳回,驳回原因:"+link.getDealReason(),0);
			//项目经理驳回前,还曾经过总经理,则需要增加总经理驳回原因
			@@ -187,7 +194,7 @@
			}
			//更新散件表当前版本,更新eVersion
			List<ComponentProductHistory> cphList = cphService.getListByParentModel(approvingList.get(0).getParentModel(),currentVersion);
			cphService.updateVersionBatch(cphList);
			if(cphList.size()!=0){cphService.updateVersionBatch(cphList);}

			/更新到product_bom/
			//查询新的版本
			@@ -236,8 +243,34 @@
			//更新正式bom的对应url
			bomService.updateUrl(fileBomApprovingList);
			}
			else if(type.intValue() == EnumWorksheetType.Component.getType()){ //散装件 TODO

			else if(type.intValue() == EnumWorksheetType.Component.getType()){ //散装件
			List<ComponentApproving> approvingList = cAService.getListByMainId(link.getMainId());
			List<Component> componentList = new LinkedList<>();
			//区分是新增还是删除
			Integer componentId = approvingList.get(0).getComponentId();
			if(componentId==null) { //新增
			//将散装件从审批表中转移到正式表
			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());
			component.setCreateDate(new Date());
			component.setStatus(1);
			componentList.add(component);
			});
			cService.insertBatch(componentList);
			}else{ //删除
			List<Integer> componentIdList = approvingList.stream().map(ComponentApproving::getComponentId).collect(Collectors.toList());
			cService.deleteBatch(componentIdList);
			}
			//更新散装件审批子表中type为完结
			cAService.endStatus(link.getMainId());
			}
			else if(type.intValue() == EnumWorksheetType.ComponentProduct.getType()){ //更新散装件-产品关系
			//查找到对应的散装件-产品关系数据
			@@ -285,11 +318,21 @@
			//处理思路:先解除关联,再替换,再关联
			if(removedList.size()!=0){
			removedList.forEach(remove -> {
			nowHistoryList.forEach(nowHistory -> {
			/*nowHistoryList.forEach(nowHistory -> {
			if (remove.getComponentId().intValue() == nowHistory.getComponentId()) {
			nowHistoryList.remove(nowHistory);
			}
			});
			});*/
			Iterator<ComponentProductHistory> iterator = nowHistoryList.iterator();
			while (iterator.hasNext()){
			ComponentProductHistory next = iterator.next();
			if(remove.getComponentId().intValue() == next.getComponentId()
			&&remove.getSubName().equals(next.getSubName())
			){
			iterator.remove();
			break;
			}
			}
			});
			}

			@@ -297,51 +340,98 @@
			if(replacedList.size()!=0){
			replacedList.forEach(replace -> {
			//当前生效的散装件-产品列表
			nowHistoryList.forEach(nowHistory -> {
			/*nowHistoryList.forEach(nowHistory -> {
			if (replace.getComponentId().intValue() == nowHistory.getComponentId()) {
			nowHistoryList.remove(nowHistory);
			}
			});
			//下个版本新增的散装件-产品列表
			});*/
			if(nowHistoryList.size()!=0) {
			Iterator<ComponentProductHistory> iterator = nowHistoryList.iterator();
			while (iterator.hasNext()) {
			ComponentProductHistory next = iterator.next();
			if (replace.getComponentId().intValue() == next.getComponentId()
			&& replace.getSubName().equals(next.getSubName())
			) {
			iterator.remove();
			break;
			}
			}
			}
			//下个版本新增替换的散装件-产品列表
			ComponentProductHistory newHistory = new ComponentProductHistory();
			newHistory.setComponentId(replace.getComponentId());
			newHistory.setParentModel(replace.getParentModel());
			newHistory.setSubName(replace.getSubName());
			newHistory.setQuantity(replace.getQuantity());
			newHistory.setCreateTime(new Date());
			newHistory.setLinkType(2);
			newHistory.setSVersion(nextVersion);
			newHistory.setEVersion(nextVersion);
			newHistoryList.add(newHistory);
			//当前生效的bom列表
			nowBomHistoryList.forEach(nowBomHistory->{
			/*nowBomHistoryList.forEach(nowBomHistory->{
			if(replace.getSubName().equals(nowBomHistory.getSubName())){
			nowBomHistoryList.remove(nowBomHistory);
			}
			});
			});*/
			Iterator<ProductBomHistory> iterator1 = nowBomHistoryList.iterator();
			while (iterator1.hasNext()){
			if(replace.getSubName().equals(iterator1.next().getSubName())){
			iterator1.remove();
			break;
			}
			}
			});
			}

			//处理关联
			addedList.forEach(add -> {
			nowHistoryList.forEach(nowHistory -> {
			/*nowHistoryList.forEach(nowHistory -> {
			if (add.getComponentId().intValue() == nowHistory.getComponentId()) {
			nowHistoryList.remove(nowHistory);
			}
			});
			});*/
			if(nowHistoryList.size()!=0) {
			Iterator<ComponentProductHistory> iterator = nowHistoryList.iterator();
			while (iterator.hasNext()) {
			ComponentProductHistory next = iterator.next();
			if (add.getComponentId().intValue() == next.getComponentId()
			&& add.getSubName().equals(next.getSubName())
			) {
			iterator.remove();
			break;
			}
			}
			}

			ComponentProductHistory newHistory = new ComponentProductHistory();
			newHistory.setComponentId(add.getComponentId());
			newHistory.setParentModel(add.getParentModel());
			newHistory.setSubName(add.getSubName());
			newHistory.setQuantity(add.getQuantity());
			newHistory.setCreateTime(new Date());
			newHistory.setLinkType(1);
			newHistory.setSVersion(nextVersion);
			newHistory.setEVersion(nextVersion);
			newHistoryList.add(newHistory);

			});

			//处理完成,进行表单数据更新,分为nowHistoryList,newHistoryList,nowBomHistoryList
			//nowHistoryList.forEach(nowHis->nowHis.setEVersion(nextVersion));
			newHistoryList.forEach(newHis->{newHis.setEVersion(nextVersion);newHis.setSVersion(nextVersion);});
			nowBomHistoryList.forEach(nowBomHis->nowBomHis.setEVersion(nextVersion));
			if(newHistoryList.size()!=0){newHistoryList.forEach(newHis->{newHis.setEVersion(nextVersion);newHis.setSVersion(nextVersion);});}
			if(nowBomHistoryList.size()!=0){nowBomHistoryList.forEach(nowBomHis->nowBomHis.setEVersion(nextVersion));}

			cphService.updateVersionBatch(nowHistoryList);
			cphService.insertBatch(newHistoryList);
			historyService.updateVersionBatch(nowBomHistoryList);
			if(nowHistoryList.size()!=0){cphService.updateVersionBatch(nowHistoryList);}
			if(newHistoryList.size()!=0){cphService.insertBatch(newHistoryList);}
			if(nowBomHistoryList.size()!=0){historyService.updateVersionBatch(nowBomHistoryList);}
			//更新ProductBom
			List<ProductBomHistory> newBomList = historyService.getListByParentModel(cpAList.get(0).getParentModel(), nextVersion);
			bomService.updateNewBom(newBomList);
			}
			else if(type.intValue() == EnumWorksheetType.ProductSoftware.getType()){
			//转移记录
			}
			}
			}