From 1dfabbdc426148ea94d976c47cbbbf21ccd7c8a3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 12 Dec 2024 19:34:39 +0800 Subject: [PATCH] =?UTF-8?q?12/12=20=E5=B7=B2=E5=AE=8C=E6=88=90=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=20=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/res/collect/CollectOrderBizResponse.java | 2 ++ .../service/collect/IoCollectCodeBackService.java | 13 +++++++++---- .../collect/IoCollectOrderBizBackupMapper.xml | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 99840709d..2fb367581 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -169,6 +169,8 @@ public class CollectOrderBizResponse { private Integer fifoSplit; private Integer billNo; + private String packUnit; + // /** // * 未赋码数量 // */ diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index d6ab7fcde..42e02e986 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -17,9 +17,11 @@ import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.res.inout.AddEnterCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; @@ -229,11 +231,14 @@ public class IoCollectCodeBackService extends ServiceImpl ioCollectOrderCheckCodes = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, filterCodeRequest.getBillNo())); List ioCollectOrderBizBackups = ioCollectOrderBizBackupService.listByBillNo(filterCodeRequest.getBillNo()); - for (IoCollectOrderBizBackup ioCollectOrderBizBackup : ioCollectOrderBizBackups) { - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(ioCollectOrderBizBackup.getNameCode()); + CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); + collectOrderBizRequest.setOrderIdFk(filterCodeRequest.getBillNo()); + List list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); + for (CollectOrderBizResponse collectOrderBizResponse : list) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode()); Integer checkCount = ioCollectOrderCheckCodeService.getCountByRelIdAndBillNo(udiRelevanceResponse.getId(), filterCodeRequest.getBillNo()); - if (checkCount != ioCollectOrderBizBackup.getScanCount()) { - return ResultVOUtils.error(500, ioCollectOrderBizBackup.getCpmctymc() + "追溯码未校验"); + if (checkCount != collectOrderBizResponse.getScanActCount()) { + return ResultVOUtils.error(500, udiRelevanceResponse.getCpmctymc() + "追溯码未校验完成"); } } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index 349762b8e..db323e012 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -6,6 +6,7 @@ SELECT icobb.*, bp.nameCode diCode, bp.zczbhhzbapzbh, + bp.packUnit, bp.manufactory, COALESCE(bp.bzgg,bp.ggxh) AS spec FROM io_collect_order_biz_backup icobb