修改代码

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -299,6 +299,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<OrderChild> selectOrderChildListByOrderGoodsNoAndStatusGE(String orderGoodsNo, Integer status) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
                 .ge(ObjectUtil.isNotNull(status),OrderChild::getStatus, status)
+                .le(ObjectUtil.isNotNull(status),OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
         );    }
 
     @Override

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -101,6 +101,8 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .or()
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
         );
     }
 

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

@@ -46,16 +46,16 @@ public abstract class GoodsOrderStrategy {
         //多个定向单不允许车辆重复
         List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
         Set<String> set = new HashSet<>();
-        int i = 0;
         for (OrderGoodsChildParams item : orderGoodsChildParams) {
             if(CollectionUtils.isNotEmpty(item.getTruckList())){
+                int lastSize = set.size() + item.getTruckList().size();
                 set.addAll(item.getTruckList());
-                i = i+item.getTruckList().size();
+                if (!Objects.equals(lastSize,set.size() +item.getTruckList().size())) {
+                    throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
+                }
             }
         }
-        if(!Objects.equals(set.size(),i) ){
-            throw new ServiceSystemException(ResultEnum.DATA_ERROR,"定向单选择车辆重复");
-        }
+
         if(CollectionUtils.isNotEmpty(set)){
             OrderGoodsTruckBindDao orderGoodsTruckBindDao = SpringContextUtils.getBeanByClass(OrderGoodsTruckBindDao.class);
             List<OrderGoodsTruckBind>  binds = orderGoodsTruckBindDao.judgeTruckIsBindDxOrder(set);