mdm.git - Gitblit

			@@ -25,7 +25,6 @@
			import org.springblade.mdm.program.entity.NcProgram;
			import org.springblade.mdm.program.entity.NcProgramExchange;
			import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
			import org.springblade.mdm.program.vo.DncSendBackData;
			import org.springblade.mdm.program.vo.MdmProgramImportVO;
			import org.springblade.mdm.utils.CustomBinaryReader;
			import org.springframework.stereotype.Service;
			@@ -36,7 +35,6 @@
			import java.nio.file.Path;
			import java.nio.file.Paths;
			import java.time.Duration;
			import java.time.LocalDateTime;
			import java.util.*;

			/**
			@@ -146,7 +144,7 @@
			d.setIsTest(jsonObject.getInteger("isTest"));
			d.setMachineCode(jsonObject.getString("machineCode"));
			d.setNcNodeId(jsonObject.getLong("ncNodeId"));
			d.setPartNo(jsonObject.getString("partNo"));
			d.setDrawingNo(jsonObject.getString("drawingNo"));
			d.setProcessEdition(jsonObject.getString("processEdition"));

			fileDataMap.put(d.getName(),d);
			@@ -252,7 +250,7 @@
			d.setIsTest(jsonObject.getInteger("isTest"));
			d.setMachineCode(jsonObject.getString("machineCode"));
			d.setNcNodeId(jsonObject.getLong("ncNodeId"));
			d.setPartNo(jsonObject.getString("partNo"));
			d.setDrawingNo(jsonObject.getString("drawingNo"));
			d.setProcessEdition(jsonObject.getString("processEdition"));

			setBaseProperties(d,jsonObject);
			@@ -273,7 +271,7 @@
			node.setDescription(jsonObject.getString("description"));
			node.setNodeType(jsonObject.getString("nodeType"));
			node.setProcessName(jsonObject.getString("processName"));
			node.setPartNo(jsonObject.getString("partNo"));
			node.setDrawingNo(jsonObject.getString("drawingNo"));
			node.setMachineCode(jsonObject.getString("machineCode"));
			node.setParentId(jsonObject.getLong("parentId"));
			node.setParentIds(jsonObject.getString("parentIds"));