Sfoglia il codice sorgente

fix: 去掉批量返还对项目类型设备的限制

caozixuan 1 anno fa
parent
commit
77aff99268

+ 4 - 1
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -91,6 +91,9 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         List<DeviceDeliveryImportDto> deviceDeliveryImportDtoList = deviceDeliveryImportDtoLinkedMultiValueMap.get(
                 BasicExcelListener.SUCCESS);
 
+        if (errorData.toString().length() > 0){
+            throw ExceptionResultEnum.ERROR.exception(errorData.toString());
+        }
         // 派单序列号集合
         List<String> crmNoList = tbCrmService.list(new QueryWrapper<TBCrm>().lambda().eq(TBCrm::getEnable, true))
                 .stream().map(TBCrm::getCrmNo).distinct().collect(Collectors.toList());
@@ -657,7 +660,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 }
                 InOutTypeEnum type = tbDeviceDelivery.getDeliveryType();
                 DeviceDeliveryStatusEnum status = tbDeviceDelivery.getStatus();
-                if (!InOutTypeEnum.OUT.equals(type) || !DeviceDeliveryStatusEnum.RECEIVE.equals(status) || DeviceUsageTypeEnum.PROJECT.equals(tbDeviceDelivery.getUsageType())) {
+                if (!InOutTypeEnum.OUT.equals(type) || !DeviceDeliveryStatusEnum.RECEIVE.equals(status)) {
                     throw ExceptionResultEnum.ERROR.exception(
                             String.format("所选设备序列号为[%s]的记录的发货状态必须是[%s][%s],且不能是[%s]用途", serialNo, InOutTypeEnum.OUT.getTitle(),
                                     DeviceDeliveryStatusEnum.RECEIVE.getTitle(), DeviceUsageTypeEnum.PROJECT.getTitle()));