From 9bc1d7c28c8599b2df46a1f18da56cae070bafb6 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 20 Dec 2024 17:56:25 +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 --- .../bonus/material/basic/service/impl/BmQrBoxServiceImpl.java | 2 ++ .../resources/mapper/material/purchase/PurchaseBindMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 2824cf36..1aba609b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -33,6 +33,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * @Author ma_sh @@ -438,6 +439,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { int num = 0; String msg = ""; if (CollectionUtil.isNotEmpty(recordList)) { + recordList = recordList.stream().filter(item -> item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())).collect(Collectors.toList()); for (BmQrBoxInfo qrBoxInfo : recordList) { if (qrBoxInfo.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())) { num ++; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index a20e7319..d04e338b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -324,7 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE pmi.task_id = #{taskId} AND pmi.type_id = #{typeId} - AND mm.ma_code IS NULL + AND mm.ma_status = '0' AND pmi.ma_code IS NOT NULL