From 82ae4f5a83ffaadc6c7f37c19050400156eb8a9e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 28 十二月 2024 21:56:20 +0800
Subject: [PATCH] 1、中空大理片笼详情页新增删除、破损、拿走操作按钮接口 2、理片笼进片任务计算目标格子优化：笼子进笼将格子分组求笼内最大组序，确保中间块玻璃破损后仍能进入，导致玻璃错乱的情况
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
index 8fbb58a..d5cc9c8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
@@ -18,13 +18,13 @@
public class ExcelToJsonConverter {
public static void main(String[] args) {
- String excelFilePath = "src/main/resources/JsonFile/alarm.xlsx";
+ String excelFilePath = "src/main/resources/JsonFile/PlcdownGlass.xlsx";
String sheetName = "Sheet1";
int addressColumnIndex = 0;
int nameColumnIndex = 1;
//int unitColumnIndex = 2;
- String outputFilePath = "src/main/resources/JsonFile/PlcAlarm.json";
+ String outputFilePath = "src/main/resources/JsonFile/PlcdownGlass.json";
try (Workbook workbook = new XSSFWorkbook(new FileInputStream(excelFilePath))) {
Sheet sheet = workbook.getSheet(sheetName);
@@ -75,8 +75,8 @@
LinkedHashMap<String, Object> resultObject = new LinkedHashMap<>();
resultObject.put("plcAddressBegin", "DB100.0");
resultObject.put("plcAddressLenght", String.valueOf(plcAddressLength));
- // resultObject.put("dataType", "word");
- resultObject.put("dataType", "bit");
+ resultObject.put("dataType", "word");
+ // resultObject.put("dataType", "bit");
resultObject.put("parameteInfor", jsonList);
Gson gson = new Gson();
--
Gitblit v1.8.0