diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index a578f25a..7c6bd12b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author jiaohongyang @@ -1290,6 +1291,7 @@ public class InterfaceController extends AbstractController { es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setZTYPE("S"); es.setZMESSAGE("处理成功"); + invoices = invoices.stream().filter(e->"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(invoices)){ es.setZTYPE("E"); es.setZMESSAGE("底账数据不存在"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index 2a7247bd..8aecbd60 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -378,11 +378,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl 1) { -// es.setZMESSAGE(errorMsg.toString() + "不存在"); -// es.setZTYPE("E"); -// return es; -// } + if (exitList.size() ==0) { + es.setZMESSAGE(errorMsg.append("发票号码").append(notExit).toString() + "不存在"); + es.setZTYPE("E"); + return es; + } log.info("exitList={}",exitList); for (ZDATA zdata1 : exitList) { //成功或者失败标识