1.修复单据编辑查询数据重复问题

master
x_z 3 years ago
parent 11de396b84
commit d8536385c8

@ -3,12 +3,13 @@ package com.glxp.sale.admin.dao.inout;
import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inout.OrderFilterRequest;
import com.glxp.sale.admin.res.inout.OrderNoResult;
import com.glxp.sale.admin.req.inout.OrderQueryRequest; import com.glxp.sale.admin.req.inout.OrderQueryRequest;
import com.glxp.sale.admin.res.inout.OrderNoResult;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Set;
@Mapper @Mapper
public interface OrderDao { public interface OrderDao {
@ -62,7 +63,7 @@ public interface OrderDao {
*/ */
OrderEntity selectByBillNo(String billNo); OrderEntity selectByBillNo(String billNo);
List<OrderEntity> selectByIds(@Param("orderIds") List<String> orderIds); List<OrderEntity> selectByIds(@Param("orderIds") Set<String> orderIds);
/** /**
* *

@ -329,7 +329,7 @@ public class OrderServiceImpl implements OrderService {
} }
//通过源单据查询所有关联的单据数据 //通过源单据查询所有关联的单据数据
public void getLinkedOrderId(String id, List<String> orderIds) { public void getLinkedOrderId(String id, Set<String> orderIds) {
List<String> list = getOneOrderById(id); List<String> list = getOneOrderById(id);
if (!orderIds.containsAll(list)) { if (!orderIds.containsAll(list)) {
//找出不包含在原有集合中的单据号,回调方法 //找出不包含在原有集合中的单据号,回调方法
@ -372,7 +372,7 @@ public class OrderServiceImpl implements OrderService {
*/ */
@Override @Override
public List<OrderEntity> getAllOrder(OrderEntity orderEntity) { public List<OrderEntity> getAllOrder(OrderEntity orderEntity) {
List<String> orderIds = new ArrayList<>(); Set<String> orderIds = new HashSet<>();
orderIds.add(orderEntity.getId()); orderIds.add(orderEntity.getId());
getLinkedOrderId(orderEntity.getId(), orderIds); getLinkedOrderId(orderEntity.getId(), orderIds);

Loading…
Cancel
Save