소스 검색

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)) {