diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index e38f1651c..6dc4fef41 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/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);
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 2146274ec..ef7a19759 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -34,25 +34,25 @@
concat('%', #{corpName}, '%')
- AND action = #{action}
+ AND io.action = #{action}
- AND remark like concat('%', #{remark}, '%')
+ AND io.remark like concat('%', #{remark}, '%')
- AND mainAction = #{mainAction}
+ AND io.mainAction = #{mainAction}
- AND billNo like concat('%', #{billNo}, '%')
+ AND io.billNo like concat('%', #{billNo}, '%')
- AND corpOrderId = #{corpOrderId}
+ AND io.corpOrderId = #{corpOrderId}
- AND fromCorp = #{fromCorp}
+ AND io.fromCorp = #{fromCorp}
- AND deptCode = #{deptCode}
+ AND io.deptCode = #{deptCode}
AND io.invCode = #{invCode}
@@ -75,14 +75,14 @@
date_format(#{endAduditTime}, '%Y-%m-%d')
- AND `action` in
+ AND io.`action` in
#{item}
- AND fromType in
+ AND io.fromType in
#{item}
@@ -98,7 +98,7 @@
- AND dealStatus in
+ AND io.dealStatus in
#{item}
@@ -113,12 +113,12 @@
AND io.status = #{status}
- AND orderType = #{orderType}
+ AND io.orderType = #{orderType}
- AND (`action` in
+ AND (io.`action` in
#{item}
@@ -127,7 +127,7 @@
and (
- `action` in
+ io.`action` in
#{item}
@@ -136,7 +136,7 @@
- AND ((`action` in
+ AND ((io.`action` in
#{item}
@@ -355,7 +355,7 @@
AND (io.remark like concat('%', #{unionRemark}, '%')
- or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+ or io.outSickInfo like concat('%', #{unionRemark}, '%'))
AND busType = #{busType}
@@ -640,7 +640,7 @@
order by ${orderBy} ${sort}
- order by checkStatus asc,updateTime desc
+ order by checkStatus asc, updateTime desc