dkyChenJiang.git

			@@ -38,9 +38,6 @@
			@Autowired
			private IProjectService projectService;

			@Autowired
			private IDeviceService deviceService;

			private String fileSaveDir = Global.getProfile() + "\\template\\" ;

			/**
			@@ -130,24 +127,6 @@
			item.setProjectId(projectId);
			item.setProjectName(project.getFullName());

			// 转换出入库类型
			String proTypeCode = RecordType.getKeyByName(item.getType());
			item.setType(proTypeCode);

			// 转换设备编码
			String deviceCode = item.getDeviceCode();
			if (!ObjectUtils.isEmpty(deviceCode)){
			Device param = new Device();
			param.setCode(deviceCode);
			List<Device> devices = deviceService.selectDeviceList(param);
			if (!ObjectUtils.isEmpty(devices)){
			Device device = devices.get(0);
			item.setDeviceId(device.getId());
			item.setDeviceCode(device.getCode());
			item.setDeviceName(device.getName());
			}
			}

			item.setCreateDate(DateUtils.getNowDate());
			insertDeviceLog(item);
			}
			@@ -176,11 +155,12 @@
			private List<DeviceLog> readData(String filepath) {
			ExcelReader reader = ExcelUtil.getReader(filepath, 0);
			reader.addHeaderAlias("出入库单子号", "code");
			reader.addHeaderAlias("设备编码", "deviceCode");
			reader.addHeaderAlias("出入库类型", "type");
			reader.addHeaderAlias("出入库时间", "transactionDate");
			reader.addHeaderAlias("设备名称", "deviceName");
			reader.addHeaderAlias("类型", "type");
			reader.addHeaderAlias("入库时间", "inboundDate");
			reader.addHeaderAlias("出库时间", "outboundDate");
			reader.addHeaderAlias("经办人", "optUser");
			reader.addHeaderAlias("使用人", "applyUser");
			reader.addHeaderAlias("负责人", "applyUser");
			reader.addHeaderAlias("出入库数量", "number");
			reader.addHeaderAlias("备注", "remark");