소스 검색

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

wangliang 1 년 전
부모
커밋
038cfcfb46
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

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

@@ -824,8 +824,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
     @Override
     public List<DevicePlaceResult> placeList(String crmNo) {
         List<DevicePlaceResult> devicePlaceResults = baseMapper.listDevicePlace(crmNo,
-                Arrays.asList(DeviceDeliveryStatusEnum.USING, DeviceDeliveryStatusEnum.TRANSFER, DeviceDeliveryStatusEnum.IN),
-                InOutTypeEnum.OUT);
+                Arrays.asList(DeviceDeliveryStatusEnum.USING, DeviceDeliveryStatusEnum.TRANSFER, DeviceDeliveryStatusEnum.IN,
+                        DeviceDeliveryStatusEnum.TRANSFER_SIGN), InOutTypeEnum.OUT);
         for (DevicePlaceResult result : devicePlaceResults) {
             result.setHaveSign(Boolean.FALSE);