From 093579c99049bf09ecf8e5d0f80179fde1ddc776 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 10 七月 2024 09:49:31 +0800 Subject: [PATCH] 下片:下片任务状态字段名称修改 大理片:1、扫码任务新增确认字校验:确认字为0,请求有id的情况不处理 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