需求121 PDA-集运签收-批量签收

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsServiceImpl.java

@@ -363,10 +363,6 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
         if (StringUtils.isBlank(updateReqVO.getExpressNo())) {
             throw new ServiceException(30004, "包裹快递号不能为空");
         }
-        if (updateReqVO.getExpressId() == null) {
-            throw new ServiceException(30004, "请选择快递公司");
-        }
-
         Long count = consMapper.selectCount(new LambdaQueryWrapperX<ConsDO>().eq(ConsDO::getExpressNo, updateReqVO.getExpressNo())
                 .ne(ConsDO::getId, updateReqVO.getId()));
         if (count > 0) {

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java

@@ -226,18 +226,13 @@ public class ConsController {
         }
 
         //获取签收图片
-        if (cons.getSigned()) {
-            ConsMediaDO consMedia = consentMediaService.getOne(new LambdaQueryWrapperX<ConsMediaDO>().eq(ConsMediaDO::getConsId, cons.getId())
-                    .eq(ConsMediaDO::getBizId, cons.getId())
-                    .eq(ConsMediaDO::getMediaBusinessType, 3));
-            consBackVO.setMediaUrl(consMedia == null ? "" : consMedia.getMediaUrl());
-        }
+        ConsMediaDO consMedia = consentMediaService.getOne(new LambdaQueryWrapperX<ConsMediaDO>().eq(ConsMediaDO::getConsId, cons.getId())
+                .eq(ConsMediaDO::getBizId, cons.getId())
+                .eq(ConsMediaDO::getMediaBusinessType, 3));
+        consBackVO.setMediaUrl(consMedia == null ? "" : consMedia.getMediaUrl());
         // 物流信息查询
         LogisticsInfoDto initialLogisticsInfoDto =
                 warehouseLineMapper.getStartInfoAndDestInfoByLineId(cons.getWarehouseLineId());
-//        if (Objects.isNull(initialLogisticsInfoDto)) {
-//            throw exception(NOT_FIND_LOGISTICS_INFO);
-//        }
         //初始物流信息
         consBackVO.setInitialLogisticsInfoDto(initialLogisticsInfoDto);
         return success(consBackVO);