优化

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -139,6 +139,7 @@ public class IoCollectOrderCodeManController extends BaseController {
         VailTagResultResponse vailTagResultResponse = new VailTagResultResponse();
         List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
         List<String> vailCodesList = new ArrayList<String>();
+        List<Long> bizIdList = new ArrayList<Long>();
         if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) {
             for (String code : addTagCodeReqeust.getCodeList()) {
                 VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
@@ -147,6 +148,8 @@ public class IoCollectOrderCodeManController extends BaseController {
                 vailCodeResultResponse.setStatus(1);
                 try {
                     collectOrder = collectOrderCodeManService.prescribeTagCode(addTagCodeReqeust);
+                    Long bizId = collectOrder.getBizIds().get(0);
+                    bizIdList.add(bizId);
                 } catch (JsonException e) {
                     vailCodeResultResponse.setErrMsg(e.getMessage());
                     if (e.getCode() == 502) {
@@ -156,6 +159,8 @@ public class IoCollectOrderCodeManController extends BaseController {
                         String msg = e.getMessage();
                         String[] data = msg.split(";");
                         String count = data[1];
+                        String bizId = data[0];
+                        bizIdList.add(Long.parseLong(bizId));
                         if (IntUtil.value(count) > 1) {
                             vailCodeResultResponse.setStatus(4);
                             vailCodeResultResponse.setBizId(data[0]);
@@ -170,6 +175,9 @@ public class IoCollectOrderCodeManController extends BaseController {
                 vailCodeResultResponses.add(vailCodeResultResponse);
             }
         }
+        if (collectOrder != null){
+            collectOrder.setBizIdList(bizIdList);
+        }
         vailTagResultResponse.setCollectOrder(collectOrder);
         vailTagResultResponse.setVailCodeResultResponses(vailCodeResultResponses);
         String errMsg = countSameErrMsg(vailCodeResultResponses);

src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java

@@ -288,6 +288,13 @@ public class IoCollectOrder implements Serializable {
     @ApiModelProperty(value = "关联预验收入库单号")
     private String preInBillNo;
 
+    @TableField(exist = false)
+    private List<Long> bizIds;
+
+    @TableField(exist = false)
+    private List<Long> bizIdList;
+
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java

@@ -4,6 +4,7 @@ import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CollectOrderBizRequest extends ListPageRequest {
@@ -129,4 +130,6 @@ public class CollectOrderBizRequest extends ListPageRequest {
      *  如果不为null 就是单据审核页面不需要槽位
      */
     private Integer isOrderCheck;
+
+    private List<Long> bizIdList;
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -55,6 +55,7 @@ import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -531,11 +532,14 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         }
 
         int count = 0;
+        ArrayList<Long> longs = new ArrayList<>();
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
             exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + 1);
             exitCode.setScanActCount(IntUtil.value(exitCode.getScanActCount()) + scanCount);
             exitCode.setBizIdFk(collectOrderBiz.getId());
             this.updateById(exitCode);
+            longs.add(collectOrderBiz.getId());
+            collectOrder.setBizIds(longs);
         } else {
             if (isExitRel(code, collectOrder.getBillNo())) {
                 throw new JsonException(500, "当前追溯码已上传关联关系，请勿重复扫码！");
@@ -575,6 +579,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 collectOrderCodeMan.setExpireDate(codeRelEntity.getValidateDate() + "");
             }
             this.save(collectOrderCodeMan);
+            longs.add(collectOrderBiz.getId());
+            collectOrder.setBizIds(longs);
         }
 
         collectOrder.setTagStatus(2);

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml

@@ -45,6 +45,12 @@
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat( #{ggxh}, '%')
             </if>
+            <if test="bizIdList != null and bizIdList.size >0">
+                and icob.id in
+                <foreach collection="bizIdList" item="item"  index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         group by icob.id
         ORDER BY icob.getConfirm, icob.id desc