This commit is contained in:
parent
15712e9610
commit
9bc1d7c28c
|
|
@ -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 ++;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue