修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -1,11 +1,8 @@
 package com.glxp.api.service.inout;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.UUID;
-import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
@@ -13,30 +10,30 @@ import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.inout.*;
-import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
-import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.res.inout.IoOrderCheckResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inv.InvPreinDetailService;
-import com.glxp.api.service.inv.InvPreinOrderService;
 import com.glxp.api.service.inv.InvPreinProductDetailService;
-import com.glxp.api.util.*;
+import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.IntUtil;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
-import net.sf.jasperreports.engine.JRException;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
@@ -195,6 +192,10 @@ public class IoCheckInoutService {
         }
         orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
         {
+            //删除之前的单据结果
+            if(null != orderDetailCodeEntity.getOrderIdFk() && !"".equals(orderDetailCodeEntity.getOrderIdFk())){
+                orderDetailResultService.deleteByOrderId(orderDetailCodeEntity.getOrderIdFk());
+            }
             //生成单据结果
             IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity();
             BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity);