From 68848209fb33f4f2bd32ce60fd394531221d2773 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 25 八月 2023 18:16:56 +0800
Subject: [PATCH] # 企业端用户
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index b2148a5..849381b 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -330,14 +330,14 @@
if(Objects.isNull(procedures)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸ュ簭鍚嶇О涓嶅瓨鍦�");
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
- queryDeviceExtDTO.setDeleted(Constants.ZERO);
- queryDeviceExtDTO.setCode(s.getDeviceCode());
- queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
- if(list.size() > 0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁惧缂栫爜涓嶅瓨鍦�");
- }
+// QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+// queryDeviceExtDTO.setDeleted(Constants.ZERO);
+// queryDeviceExtDTO.setCode(s.getDeviceCode());
+// queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
+// List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+// if(list.size() > 0){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璁惧缂栫爜涓嶅瓨鍦�");
+// }
@@ -368,7 +368,7 @@
WarehouseLocation finishWarehouseLocations = warehouseLocationMapper.selectOne(warehouseLocationQuery);
if (Objects.isNull(finishWarehouseLocations)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸插畬宸ヨ揣浣嶄笉瀛樺湪");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸插畬宸ヨ揣浣嶄笉鏄贩鍚堝睘鎬т笉瀛樺湪");
}
Map<String, WarehouseLocation> collect =new HashMap<>();
@@ -386,7 +386,7 @@
device.setDepartId(user.getCurComDepartment().getId());
device.setProcedureId(procedures.getId());
- device.setCode(StringUtils.isNotBlank(device.getCode()) ? device.getCode() : this.getNextCode(user.getCompany().getId()));
+ device.setCode(StringUtils.isNotBlank(s.getDeviceCode()) ? s.getDeviceCode() : this.getNextCode(user.getCompany().getId()));
device.setType(StringUtils.isNotBlank(device.getCode()) ? device.getCode().trim().equals("璁惧") ? 1 : 0 : 1);
device.setName(s.getDeviceName());
device.setModel(s.getModel());
--
Gitblit v1.9.3