Преглед на файлове

Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

wangliang преди 1 година
родител
ревизия
0209e902f1
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

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

@@ -848,7 +848,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             }
 
             //使用状态:中转
-            if (result.getStatus().equals(DeviceDeliveryStatusEnum.TRANSFER)) {
+            if (result.getStatus().equals(DeviceDeliveryStatusEnum.TRANSFER) || result.getStatus()
+                    .equals(DeviceDeliveryStatusEnum.TRANSFER_SIGN)) {
                 TBDeviceDelivery transferDeviceDelivery = baseMapper.selectOne(
                         new QueryWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getSourceId, result.getId()));
                 if (Objects.isNull(transferDeviceDelivery)) {