修改FI847和FI849

release
yishiqihuasheng 2 years ago
parent 01448b1d4d
commit 6d4bc29357
  1. 4
      dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  2. 22
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
  3. 2
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ReceiptOutServiceImpl.java

@ -1291,10 +1291,10 @@ public class InterfaceController extends AbstractController {
es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY()); es.setBSKEY(erpInvoiceData.getIS_INPUT().getBSKEY());
es.setZTYPE("S"); es.setZTYPE("S");
es.setZMESSAGE("处理成功"); 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)){ if(CollectionUtils.isEmpty(invoices)){
es.setZTYPE("E"); es.setZTYPE("E");
es.setZMESSAGE("底账数据不存在"); es.setZMESSAGE("底账数据不存在可转出发票");
outPut.setES_OUTPUT(es); outPut.setES_OUTPUT(es);
try { try {

@ -447,17 +447,17 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
UpdateWrapper updateWrapper = convertRecordInvoice(zdata1,uuid); UpdateWrapper updateWrapper = convertRecordInvoice(zdata1,uuid);
tdxSaleRecordInvoiceDao.update(null,updateWrapper); tdxSaleRecordInvoiceDao.update(null,updateWrapper);
} }
//判断是否有底账库不存在发票 }
if(notExit.size()>0){ //判断是否有底账库不存在发票
es.setZTYPE("E"); if(notExit.size()>0){
errorMsg.append("发票号码:").append(notExit).append("不存在,其余成功"); es.setZTYPE("E");
es.setZMESSAGE(errorMsg.toString()); errorMsg.append("发票号码:").append(notExit).append("不存在,其余成功");
}else { es.setZMESSAGE(errorMsg.toString());
es.setZMESSAGE("处理成功"); }else {
zdataresp.setPROMSG(promsg.toString()); es.setZMESSAGE("处理成功");
zdataresp.setPROTYP("S"); zdataresp.setPROMSG(promsg.toString());
es.setZdata(zdataresp); zdataresp.setPROTYP("S");
} es.setZdata(zdataresp);
} }
return es; return es;
} }

@ -62,7 +62,7 @@ public class ReceiptOutServiceImpl extends MpBaseServiceImpl<BaseReceiptOutDao,
outPut.setES_OUTPUT(es); outPut.setES_OUTPUT(es);
return JsonUtils.getInstance().toJsonString(outPut); return JsonUtils.getInstance().toJsonString(outPut);
} }
invoices = invoices.stream().filter(e -> "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=转出明细 // second:根据uuids查询出转出明细并转为map,key=uuid ,value=转出明细
List<BaseTDxRecordInvoiceOut> outs = listByUuids(ids); List<BaseTDxRecordInvoiceOut> outs = listByUuids(ids);
Map<String, BaseTDxRecordInvoiceOut> outMap = Map<String, BaseTDxRecordInvoiceOut> outMap =

Loading…
Cancel
Save