From b159e50bbf0f055a69ba5430fb956021ab90b450 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期五, 17 五月 2024 17:41:07 +0800
Subject: [PATCH] 进出库管理调整字段
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index f958545..12845c1 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -130,24 +130,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 +158,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");
--
Gitblit v1.9.1