From cf3eb8aade51e277d6d732e28e89f64ac3adca6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 16:19:51 +0800
Subject: [PATCH] 大屏
---
server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
index 5d6781e..39931c4 100644
--- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -30,10 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 鐢熶骇璁惧淇℃伅鎺ュ彛
@@ -162,7 +159,7 @@
find.setModel(device.getModel());
find.setProcedureId(device.getProcedureId());
find.setStationCode(device.getStationCode());
- find.setType(device.getType());
+ find.setType(Objects.nonNull(device.getType()) ? device.getType() : Constants.ONE);
find.setGroupId(device.getGroupId());
find.setProduceWarehouseLocationId(device.getProduceWarehouseLocationId());
find.setFinishWarehouseLocationId(device.getFinishWarehouseLocationId());
@@ -244,7 +241,7 @@
Iterator<String> it = multipartRequest.getFileNames();
while (it.hasNext()) {
MultipartFile file = multipartRequest.getFile((String) it.next());
- deviceExtService.importPlans(file);
+ deviceService.importPlans(file);
break;
}
}
--
Gitblit v1.9.3