From 96f1aa9b86a7bd01a9b42433939fdcafa2c9b935 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 4 Apr 2025 16:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderCodeManController.java | 8 ++++++++ .../java/com/glxp/api/entity/collect/IoCollectOrder.java | 7 +++++++ .../com/glxp/api/req/collect/CollectOrderBizRequest.java | 3 +++ .../api/service/collect/IoCollectOrderCodeManService.java | 6 ++++++ .../mybatis/mapper/collect/IoCollectOrderBizMapper.xml | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 6324c6239..2e1a0ffb2 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -139,6 +139,7 @@ public class IoCollectOrderCodeManController extends BaseController { VailTagResultResponse vailTagResultResponse = new VailTagResultResponse(); List vailCodeResultResponses = new ArrayList<>(); List vailCodesList = new ArrayList(); + List bizIdList = new ArrayList(); 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); diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 0b54021df..078610319 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/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 bizIds; + + @TableField(exist = false) + private List bizIdList; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java index bd013e985..8d7616d80 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java +++ b/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 bizIdList; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index d6c99e595..b652ebc5b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/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 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 AND ggxh LIKE concat( #{ggxh}, '%') + + and icob.id in + + #{item} + + group by icob.id ORDER BY icob.getConfirm, icob.id desc