bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2024-12-20 17:56:25 +08:00
parent 15712e9610
commit 9bc1d7c28c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
View File

@ -33,6 +33,7 @@ import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Author ma_sh * @Author ma_sh
@ -438,6 +439,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
int num = 0; int num = 0;
String msg = ""; String msg = "";
if (CollectionUtil.isNotEmpty(recordList)) { if (CollectionUtil.isNotEmpty(recordList)) {
recordList = recordList.stream().filter(item -> item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())).collect(Collectors.toList());
for (BmQrBoxInfo qrBoxInfo : recordList) { for (BmQrBoxInfo qrBoxInfo : recordList) {
if (qrBoxInfo.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())) { if (qrBoxInfo.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())) {
num ++; num ++;

2
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml
View File

@ -324,7 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE WHERE
pmi.task_id = #{taskId} pmi.task_id = #{taskId}
AND pmi.type_id = #{typeId} AND pmi.type_id = #{typeId}
AND mm.ma_code IS NULL AND mm.ma_status = '0'
AND pmi.ma_code IS NOT NULL AND pmi.ma_code IS NOT NULL
</select> </select>