Merge remote-tracking branch 'origin/dev' into dev

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);

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -34,25 +34,25 @@
                     concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
-                AND action = #{action}
+                AND io.action = #{action}
             </if>
             <if test="remark != null and remark != ''">
-                AND remark  like concat('%', #{remark}, '%')
+                AND io.remark like concat('%', #{remark}, '%')
             </if>
             <if test="mainAction != null and mainAction != ''">
-                AND mainAction = #{mainAction}
+                AND io.mainAction = #{mainAction}
             </if>
             <if test="billNo != null and billNo != ''">
-                AND billNo like concat('%', #{billNo}, '%')
+                AND io.billNo like concat('%', #{billNo}, '%')
             </if>
             <if test="corpOrderId != null and corpOrderId != ''">
-                AND corpOrderId = #{corpOrderId}
+                AND io.corpOrderId = #{corpOrderId}
             </if>
             <if test="fromCorp != null and fromCorp != ''">
-                AND fromCorp = #{fromCorp}
+                AND io.fromCorp = #{fromCorp}
             </if>
             <if test="deptCode != null and deptCode != ''">
-                AND deptCode = #{deptCode}
+                AND io.deptCode = #{deptCode}
             </if>
             <if test="invCode != null and invCode != ''">
                 AND io.invCode = #{invCode}
@@ -75,14 +75,14 @@
                         date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">
-                AND `action` in
+                AND io.`action` in
                 <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
 
             <if test="sourceTypes != null and sourceTypes.size() != 0">
-                AND fromType in
+                AND io.fromType in
                 <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -98,7 +98,7 @@
                 </foreach>
             </if>
             <if test="dealStatuses != null and dealStatuses.size() != 0">
-                AND dealStatus in
+                AND io.dealStatus in
                 <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
@@ -113,12 +113,12 @@
                 AND io.status = #{status}
             </if>
             <if test="orderType != null">
-                AND orderType = #{orderType}
+                AND io.orderType = #{orderType}
             </if>
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions2 == null">
-                    AND (`action` in
+                    AND (io.`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -127,7 +127,7 @@
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
                     and (
-                            `action` in
+                            io.`action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -136,7 +136,7 @@
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">
-                    AND ((`action` in
+                    AND ((io.`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -355,7 +355,7 @@
             </if>
             <if test="unionRemark != null and unionRemark != ''">
                 AND (io.remark like concat('%', #{unionRemark}, '%')
-                or io.outSickInfo like concat('%', #{unionRemark}, '%'))
+                        or io.outSickInfo like concat('%', #{unionRemark}, '%'))
             </if>
             <if test="busType != null">
                 AND busType = #{busType}
@@ -640,7 +640,7 @@
                 order by ${orderBy} ${sort}
             </when>
             <otherwise>
-                order by checkStatus asc,updateTime desc
+                order by checkStatus asc, updateTime desc
             </otherwise>
         </choose>
     </select>