From 4852d6c95e98ef9390d9cbebce97c1bb7fcb04ad Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 16 七月 2025 23:37:58 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index 25af59b..ba63182 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -238,25 +238,26 @@
JSONArray jsonArray = JSONArray.parseArray(jsonStr);
for(int i=0;i<jsonArray.size();i++){
JSONObject jsonObject = jsonArray.getJSONObject(i);
- NcProgram d = new NcProgram();
- d.setId(jsonObject.getLong("id"));
- d.setName(jsonObject.getString("name"));
+ NcProgram prog = new NcProgram();
+ prog.setId(jsonObject.getLong("id"));
+ prog.setName(jsonObject.getString("name"));
- d.setCode(jsonObject.getString("code"));
- d.setDescription(jsonObject.getString("description"));
- d.setCategory(jsonObject.getString("category"));
- d.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
- d.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
- d.setIsLocked(jsonObject.getInteger("isLocked"));
- d.setIsTest(jsonObject.getInteger("isTest"));
- d.setMachineCode(jsonObject.getString("machineCode"));
- d.setNcNodeId(jsonObject.getLong("ncNodeId"));
- d.setDrawingNo(jsonObject.getString("drawingNo"));
- d.setProcessEdition(jsonObject.getString("processEdition"));
+ prog.setCode(jsonObject.getString("code"));
+ prog.setDescription(jsonObject.getString("description"));
+ prog.setCategory(jsonObject.getString("category"));
+ prog.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
+ prog.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
+ prog.setIsLocked(jsonObject.getInteger("isLocked"));
+ prog.setIsTest(jsonObject.getInteger("isTest"));
+ prog.setIsTextFile(jsonObject.getBoolean("isTextFile"));
+ prog.setMachineCode(jsonObject.getString("machineCode"));
+ prog.setNcNodeId(jsonObject.getLong("ncNodeId"));
+ prog.setDrawingNo(jsonObject.getString("drawingNo"));
+ prog.setProcessEdition(jsonObject.getString("processEdition"));
- setBaseProperties(d,jsonObject);
+ setBaseProperties(prog,jsonObject);
- progList.add(d);
+ progList.add(prog);
}
}
@@ -296,6 +297,7 @@
record.setUserNickname(jsonObject.getString("userNickname"));
record.setOperateResult(jsonObject.getString("operateResult"));
record.setOperateTime(jsonObject.getDate("operateTime"));
+ record.setComment(jsonObject.getString("comment"));
setBaseProperties(record,jsonObject);
recordList.add(record);
--
Gitblit v1.9.3