提货bug&出货查询

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java

@@ -623,7 +623,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
                 OrderDO order = orderService.selectOne(OrderDO::getOrderNo, createReqVO.getOrderId());
                 OrderBackInfoDto orderDO = orderQueryService.info(order.getOrderId());
 
-                if (orderDO.getConsigneeVO().getHarvestMethod() == 2) {
+                if (orderDO.getConsigneeVO() == null || orderDO.getConsigneeVO().getHarvestMethod() == 2) {
                     if (StringUtils.isNotBlank(orderDO.getTidanNo())) {
                         errorOrderNo.add(orderDO.getOrderNo() + "(" + orderDO.getTidanNo() + ")");
                     } else {

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1575,12 +1575,12 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
             query.setWarehouseIdList(warehouseIdList);
         }
-//        if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
-//            List<WarehouseDO> warehouseList =
-//                    warehouseService.findByCountryIdList(query.getCountryIdList());
-//            warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
-//            query.setWarehouseIdList(warehouseIdList);
-//        }
+        if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
+            List<WarehouseDO> warehouseList =
+                    warehouseService.findByCountryIdList(query.getCountryIdList());
+            warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
+            query.setWarehouseIdList(warehouseIdList);
+        }
         //上面都是处理查询条件相关逻辑
         return boxInfoQuery1(boxMapper.selectPage2(page, query), false);
     }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/box/BoxQueryVO.java

@@ -131,4 +131,168 @@ public class BoxQueryVO {
     @ApiModelProperty(value = "发货方式：1、多票，2、单票")
     private Integer deliveryType;
 
+    @ApiModelProperty(value = "始发仓多选")
+    private List<Long> startWarehouseIdList;
+
+    @ApiModelProperty(value = "目的国多选")
+    private List<Long> countryIdList;
+
+    @ApiModelProperty(value = "目的城市多选")
+    private List<Long> destCityIdList;
+
+    @ApiModelProperty(value = "目的仓多选")
+    private List<Long> destWarehouseIdList;
+
+    @ApiModelProperty(value = "状态多选")
+    private List<Integer> boxStatusList;
+
+    @ApiModelProperty(value = "起运港多选")
+    private List<Long> bigPortIdList;
+
+    @ApiModelProperty(value = "目的港多选")
+    private List<Long> destPortIdList;
+
+    @ApiModelProperty(value = "订舱公司多选")
+    private List<Long> spaceCompanyIdList;
+
+    @ApiModelProperty(value = "驳船港多选")
+    private List<Long> bargePortIdList;
+
+    /**
+     * 预计驳船时间
+     */
+    @ApiModelProperty(value = "预计驳船开始时间")
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String bargeBeginTime;
+    @ApiModelProperty(value = "预计驳船结束时间")
+//    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String bargeEndTime;
+    /**
+     * 预计开船时间
+     */
+    @ApiModelProperty(value = "预计开船开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String sailBeginTime;
+    @ApiModelProperty(value = "预计开船结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String sailEndTime;
+
+    /**
+     * 截补料时间
+     */
+    @ApiModelProperty(value = "截补料开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String ladingBillBeginTime;
+    @ApiModelProperty(value = "截补料结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String ladingBillEndTime;
+
+    /**
+     * VGM提交时间
+     */
+    @ApiModelProperty(value = "VGM提交开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String customsBeginTime;
+    @ApiModelProperty(value = "VGM提交结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String customsEndTime;
+
+    /**
+     * 截关时间
+     */
+    @ApiModelProperty(value = "截关开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String cutOffBeginTime;
+    @ApiModelProperty(value = "截关结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String cutOffEndTime;
+
+    @ApiModelProperty(value = "报关方式多选-海运空运共用")
+    private List<Integer> dcCustomsTypeList;
+    @ApiModelProperty(value = "报关公司多选-海运空运共用")
+    private List<Integer> dcCompanyIdList;
+    @ApiModelProperty(value = "放行开始时间-海运空运共用")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dcPassBeginTime;
+    @ApiModelProperty(value = "放行结束时间-海运空运共用")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dcPassEndTime;
+
+    /**
+     * 实际开船时间
+     */
+    @ApiModelProperty(value = "实际开船开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dtRealShipBeginTime;
+    @ApiModelProperty(value = "实际开船结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dtRealShipEndTime;
+    /**
+     * 预计到港时间
+     */
+    @ApiModelProperty(value = "预计到港开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dtEstArrivalBeginTime;
+    @ApiModelProperty(value = "预计到港结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String dtEstArrivalEndTime;
+
+    @ApiModelProperty(value = "出单方式多选")
+    private List<Integer> cdOutBillTypeList;
+    @ApiModelProperty(value = "Agent list状态")
+    private Integer cdAgentlistType;
+    @ApiModelProperty(value = "Soncap状态")
+    private Integer cdSoncapType;
+
+    /**
+     * 预计清关时间
+     */
+    @ApiModelProperty(value = "预计清关开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String clEstBeginTime;
+
+    /**
+     * 预计清关时间
+     */
+    @ApiModelProperty(value = "预计清关结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String clEstEndTime;
+
+    //---------------------------空运--------------------------
+
+    @ApiModelProperty(value = "目的港清关多选")
+    private List<Integer> destinationClearanceList;
+
+    @ApiModelProperty(value = "发货方式多选")
+    private List<Integer> deliveryTypeList;
+
+    @ApiModelProperty(value = "出货渠道多选")
+    private List<Long> shippingChannelIdList;
+
+    @ApiModelProperty(value = "空运起运港多选")
+    private List<Long> departurePortIdList;
+
+    @ApiModelProperty(value = "空运目的港多选")
+    private List<Long> airDestPortIdList;
+
+    @ApiModelProperty(value = "航程")
+    private Integer voyage;
+
+    @ApiModelProperty(value = "订舱代理多选")
+    private List<Long> shipperIdList;
+
+    @ApiModelProperty(value = "航空公司多选")
+    private List<Long> airlineCompanyIdList;
+
+    @ApiModelProperty(value = "预计起飞开始时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String flyBeginTime;
+
+    @ApiModelProperty(value = "预计起飞结束时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String flyEndTime;
+
+    @ApiModelProperty(value = "代理公司Agent多选")
+    private List<Long> agentIdList;
+
 }