From fe5fc6a0892ce9565141ce37805ab3041b9027d8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 13 Jan 2025 10:48:44 +0800 Subject: [PATCH] =?UTF-8?q?1/13=20=E7=A0=81=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderCodeAutoMapper.java | 3 +- .../collect/IoCollectOrderCodeManMapper.java | 2 + .../collect/IoCollectCodeBackService.java | 77 +++++++++++-------- .../IoCollectOrderCodeAutoService.java | 4 + .../collect/IoCollectOrderCodeManService.java | 4 + .../collect/IoCollectCodeBackMapper.xml | 2 +- .../collect/IoCollectOrderCodeAutoMapper.xml | 5 ++ .../collect/IoCollectOrderCodeManMapper.xml | 5 ++ 8 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeAutoMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeAutoMapper.java index a3eb04b4f..f1ac93c29 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeAutoMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeAutoMapper.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,5 +13,5 @@ import java.util.List; public interface IoCollectOrderCodeAutoMapper extends BaseMapper { List filterList(CollectOrderCodeAutoRequest collectOrderCodeAutoRequest); - + Integer getScanCount(@Param("billNo")String billNo,@Param("relId") Long relId); } diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java index 6bdfeedd1..746e852ed 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java @@ -6,6 +6,7 @@ import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +18,5 @@ public interface IoCollectOrderCodeManMapper extends BaseMapper= collectOrderBizBackup.getScanCount()) { + if (checkCount >= scanCount) { return ResultVOUtils.error(500, "追溯码数量超出"); } IoCollectCodeBackup ioCollectCodeBackup = getIoCollectCodeBackup(filterCodeRequest.getBillNo(), filterCodeRequest.getCode()); @@ -167,7 +171,7 @@ public class IoCollectCodeBackService extends ServiceImpl collectOrderBizResponses = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest); - if (collectOrderBizResponses.isEmpty()) { - return false; - } - CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(0); - if (udiRelevanceResponse.getId().equals(collectOrderBizResponse.getRelId())){ - if ( filterCodeRequest.getCodeList().size() > collectOrderBizResponse.getScanCount()){ + private boolean checkScanCountExceeded(IoCollectCodeRequest filterCodeRequest, UdiRelevanceResponse udiRelevanceResponse, IoCollectOrderBizBackup collectOrderBizBackup) { + Integer scanCount = getScanCount(filterCodeRequest,udiRelevanceResponse); +// if (udiRelevanceResponse.getId().equals(collectOrderBizBackup.getRelId())){ + if ( filterCodeRequest.getCodeList().size() > scanCount){ throw new JsonException(500,"追溯码数量超出"); } - } +// } Integer checkCount = ioCollectOrderCheckCodeService.getCountByRelIdAndBillNo(udiRelevanceResponse.getId(), filterCodeRequest.getBillNo()); - return checkCount == collectOrderBizResponse.getScanCount(); + return checkCount == scanCount; } public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) { AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse(); @@ -243,6 +240,14 @@ public class IoCollectCodeBackService extends ServiceImpl checkCodeList = ioCollectOrderCheckCodes.stream() - .map(IoCollectOrderCheckCode::getCode) - .filter(code -> !ioCollectCodeBackups.stream() + + + List checkCodeList = ioCollectOrderCheckCodes.stream() + .filter(ioc -> !ioCollectCodeBackups.stream() + .filter(backup -> backup.getScanCodeCheckStatus() != null && backup.getScanCodeCheckStatus() != 3) .map(IoCollectCodeBackup::getCode) - .anyMatch(code::equals)) + .anyMatch(ioc.getCode()::equals)) .collect(Collectors.toList()); + + System.out.println(checkCodeList); // 对比原始码表多出来的码 checkCodeList + + + //检查码是否存在队列如果存在移除 - for (String code : checkCodeList) { - IoSplitFifoCodeEntity ioSplitFifoCodeEntity = ioSplitFifoCodeService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoCodeEntity::getCode, code)); + for (IoCollectOrderCheckCode checkCode : checkCodeList) { + IoSplitFifoCodeEntity ioSplitFifoCodeEntity = ioSplitFifoCodeService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoCodeEntity::getCode, checkCode.getCode())); if (ioSplitFifoCodeEntity != null) { ioSplitFifoCodeService.removeById(ioSplitFifoCodeEntity); } @@ -364,10 +377,14 @@ public class IoCollectCodeBackService extends ServiceImpl collectCodeBackups = new ArrayList<>(); for (IoCollectOrderCheckCode ioCollectOrderCheckCode : ioCollectOrderCheckCodes) { - IoCollectCodeBackup ioCollectCodeBackup = new IoCollectCodeBackup(); - BeanUtils.copyProperties(ioCollectOrderCheckCode, ioCollectCodeBackup); - ioCollectCodeBackup.setScanCodeCheckStatus(1); - collectCodeBackups.add(ioCollectCodeBackup); + IoCollectCodeBackup one = getOne(new LambdaQueryWrapper().eq(IoCollectCodeBackup::getCode, ioCollectOrderCheckCode.getCode())); + if (one == null){ + IoCollectCodeBackup ioCollectCodeBackup = new IoCollectCodeBackup(); + BeanUtils.copyProperties(ioCollectOrderCheckCode, ioCollectCodeBackup); + ioCollectCodeBackup.setId(null); + ioCollectCodeBackup.setScanCodeCheckStatus(1); + collectCodeBackups.add(ioCollectCodeBackup); + } } saveBatch(collectCodeBackups); orderBackup.setCheckCodeStatus(1); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java index 6db12b198..c0c0b3b45 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java @@ -38,4 +38,8 @@ public class IoCollectOrderCodeAutoService extends ServiceImpl group by iccb.id - order by bp.nameCode + order by bp.nameCode,iccb.code diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml index 692c3b0ff..994d6aee2 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml @@ -30,4 +30,9 @@ + diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml index 546bef2e0..52042d366 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml @@ -44,4 +44,9 @@ limit 1 +