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 7c6bd12b..132100a7 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 @@ -1291,10 +1291,10 @@ 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()); + invoices = invoices.stream().filter(e->!"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(invoices)){ es.setZTYPE("E"); - es.setZMESSAGE("底账数据不存在"); + es.setZMESSAGE("底账数据不存在可转出发票"); outPut.setES_OUTPUT(es); try { 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 8aecbd60..9ba13a1f 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 @@ -447,17 +447,17 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ - es.setZTYPE("E"); - errorMsg.append("发票号码:").append(notExit).append("不存在,其余成功"); - es.setZMESSAGE(errorMsg.toString()); - }else { - es.setZMESSAGE("处理成功"); - zdataresp.setPROMSG(promsg.toString()); - zdataresp.setPROTYP("S"); - es.setZdata(zdataresp); - } + } + //判断是否有底账库不存在发票 + if(notExit.size()>0){ + es.setZTYPE("E"); + errorMsg.append("发票号码:").append(notExit).append("不存在,其余成功"); + es.setZMESSAGE(errorMsg.toString()); + }else { + es.setZMESSAGE("处理成功"); + zdataresp.setPROMSG(promsg.toString()); + zdataresp.setPROTYP("S"); + es.setZdata(zdataresp); } return es; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java index 800aa6e4..4d37947c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java @@ -62,7 +62,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl "0".equals(e.getRzhYesorno())).collect(Collectors.toList()); + invoices = invoices.stream().filter(e -> !"0".equals(e.getRzhYesorno())).collect(Collectors.toList()); // second:根据uuids查询出转出明细并转为map,key=uuid ,value=转出明细 List outs = listByUuids(ids); Map outMap =