From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index 4360c22..6872823 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -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());
--
Gitblit v1.8.0