YiWuProject.git

			@@ -198,19 +198,20 @@
			Map<Integer, List<HollowGlassRelationInfo>> listMap = hollowGlassRelationInfos.stream().collect(Collectors.groupingBy(HollowGlassRelationInfo::getHollowSequence));

			//设置间隔板数据共所有配对玻璃使用
			List<LisecHollowFrameDetails> frameList = new ArrayList<>();
			for (int i = 1; i < relationInfo.getTotalLayer(); i++) {
			LisecHollowFrameDetails frameDetails = new LisecHollowFrameDetails();
			frameDetails.setRecType("<FR" + i + ">");
			frameDetails.setType(formulaDetails.getIntervalFrameType());
			frameDetails.setWidth(formulaDetails.getIntervalFrameWidth());
			frameDetails.setHeight(formulaDetails.getIntervalFrameHeight());
			frameList.add(frameDetails);
			}

			// for (int i = 1; i < relationInfo.getTotalLayer(); i++) {
			// LisecHollowFrameDetails frameDetails = new LisecHollowFrameDetails();
			// frameDetails.setRecType("<FR" + i + ">");
			// frameDetails.setType(formulaDetails.getIntervalFrameType());
			// frameDetails.setWidth(formulaDetails.getIntervalFrameWidth());
			// frameDetails.setHeight(formulaDetails.getIntervalFrameHeight());
			// frameList.add(frameDetails);
			// }
			List<LisecHollowGlassAndFrameDetails> glassAndFrameList = new ArrayList<>();
			listMap.forEach((e, v) -> {
			LisecHollowGlassAndFrameDetails glassAndFrame = new LisecHollowGlassAndFrameDetails();
			List<LisecHollowGlassDetails> glassList = new ArrayList<>();
			List<LisecHollowFrameDetails> frameList = new ArrayList<>();
			for (int i = 1; i <= v.size(); i++) {
			LisecHollowGlassDetails hollowGlassDetails = new LisecHollowGlassDetails();
			hollowGlassDetails.setRecType("<GL" + i + ">");
			@@ -219,7 +220,7 @@
			glassList.add(hollowGlassDetails);
			}
			glassAndFrame.setGlassList(glassList);
			glassAndFrame.setFrameList(frameList);

			glassAndFrame.setItemNum(e + "");
			glassAndFrame.setIdNum(e + "");
			glassAndFrame.setBarcode(randomNumber.substring(randomNumber.length() - 3));
			@@ -227,35 +228,43 @@
			glassAndFrame.setHeight((int) (v.get(0).getHeight() * 10) + "");
			glassAndFrame.setGlass1(e * ID_RATIO + 1 + "");
			glassAndFrame.setFrame1(formulaDetails.getFrameOne());
			frameList.add(new LisecHollowFrameDetails("<FR1",formulaDetails.getIntervalFrameTypeOne(), formulaDetails.getIntervalFrameWidthOne(), formulaDetails.getIntervalFrameHeightOne()));
			glassAndFrame.setGasCode1(formulaDetails.getCasOne());
			if (relationInfo.getTotalLayer() == 2) {
			glassAndFrame.setGlass2(e * ID_RATIO + 2 + "");
			} else if (relationInfo.getTotalLayer() == 3) {
			glassAndFrame.setGlass2(e * ID_RATIO + 2 + "");
			glassAndFrame.setFrame2(formulaDetails.getFrameTwo());
			frameList.add(new LisecHollowFrameDetails("<FR2",formulaDetails.getIntervalFrameTypeTwo(), formulaDetails.getIntervalFrameWidthTwo(), formulaDetails.getIntervalFrameHeightTwo()));
			glassAndFrame.setGasCode2(formulaDetails.getCasTwo());
			glassAndFrame.setGlass3(e * ID_RATIO + 3 + "");
			} else if (relationInfo.getTotalLayer() == 4) {
			glassAndFrame.setGlass2(e * ID_RATIO + 2 + "");
			glassAndFrame.setFrame2(formulaDetails.getFrameTwo());
			frameList.add(new LisecHollowFrameDetails("<FR2",formulaDetails.getIntervalFrameTypeTwo(), formulaDetails.getIntervalFrameWidthTwo(), formulaDetails.getIntervalFrameHeightTwo()));
			glassAndFrame.setGasCode2(formulaDetails.getCasTwo());
			glassAndFrame.setGlass3(e * ID_RATIO + 3 + "");
			glassAndFrame.setFrame3(formulaDetails.getFrameThree());
			frameList.add(new LisecHollowFrameDetails("<FR3",formulaDetails.getIntervalFrameTypeThree(), formulaDetails.getIntervalFrameWidthThree(), formulaDetails.getIntervalFrameHeightThree()));
			glassAndFrame.setGasCode3(formulaDetails.getCasThree());
			glassAndFrame.setGlass4(e * ID_RATIO + 4 + "");
			} else {
			glassAndFrame.setGlass2(e * ID_RATIO + 2 + "");
			glassAndFrame.setFrame2(formulaDetails.getFrameTwo());
			frameList.add(new LisecHollowFrameDetails("<FR2",formulaDetails.getIntervalFrameTypeTwo(), formulaDetails.getIntervalFrameWidthTwo(), formulaDetails.getIntervalFrameHeightTwo()));
			glassAndFrame.setGasCode2(formulaDetails.getCasTwo());
			glassAndFrame.setGlass3(e * ID_RATIO + 3 + "");
			glassAndFrame.setFrame3(formulaDetails.getFrameThree());
			frameList.add(new LisecHollowFrameDetails("<FR3",formulaDetails.getIntervalFrameTypeThree(), formulaDetails.getIntervalFrameWidthThree(), formulaDetails.getIntervalFrameHeightThree()));
			glassAndFrame.setGasCode3(formulaDetails.getCasThree());
			glassAndFrame.setGlass4(e * ID_RATIO + 4 + "");
			glassAndFrame.setFrame3(formulaDetails.getFrameFour());
			frameList.add(new LisecHollowFrameDetails("<FR4",formulaDetails.getIntervalFrameTypeFour(), formulaDetails.getIntervalFrameWidthFour(), formulaDetails.getIntervalFrameHeightFour()));
			glassAndFrame.setGasCode4(formulaDetails.getCasFour());
			glassAndFrame.setGlass4(e * ID_RATIO + 5 + "");
			}
			glassAndFrame.setInset(formulaDetails.getSealInsert());
			glassAndFrame.setFrameList(frameList);
			glassAndFrameList.add(glassAndFrame);
			});
			details.setGlassAndFrameList(glassAndFrameList);
			@@ -279,7 +288,7 @@
			// 将生成的文件存入指定路径
			//计算生成李赛克需要的数据给到每个属性
			StringWriter out = new StringWriter();
			File file = new File("D:\\temp", relationInfo.getFlowCardId() + randomNumber.substring(randomNumber.length() - 3) + ".trf");
			File file = new File(System.getProperty("user.dir")+"/lisec", relationInfo.getFlowCardId() + randomNumber.substring(randomNumber.length() - 3) + ".trf");
			try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
			temp.process(root, out);
			writer.write(out.toString());