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 ed467084..8866fd7d 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 @@ -1,5 +1,6 @@ package com.dxhy.erp.controller; +import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.HashMap; @@ -1174,17 +1175,18 @@ public class InterfaceController extends AbstractController { public String transferOut(ErpInvoiceData erpInvoiceData){ String zdata = erpInvoiceData.getIS_INPUT().getZDATA(); - Map map=JsonUtils.getInstance().parseObject(zdata,Map.class); - String invoiceCode = map.get("invoiceCode"); - String invoiceNo = map.get("invoiceNo"); - String outTaxAmount = map.get("outTaxAmount"); - String outReason = map.get("outReason"); - String outTaxPeriod = map.get("outTaxPeriod"); + List list = JSON.parseArray(zdata, Map.class); + Map map = list.get(0); + String invoiceCode =(String) map.get("ZFPDM"); + String invoiceNo = (String)map.get("ZFPHM"); + BigDecimal bigDecimal = (BigDecimal) map.get("JXSZC"); + String outReason = (String)map.get("ZZCYY"); + String outTaxPeriod = (String)map.get("BUDAT"); String uuid = invoiceCode+invoiceNo; BaseInvoiceEditVO baseInvoiceEditVO = new BaseInvoiceEditVO(); baseInvoiceEditVO.setPrimaryKey(uuid); baseInvoiceEditVO.setOutReason(outReason); - baseInvoiceEditVO.setOutTax(outTaxAmount); + baseInvoiceEditVO.setOutTax(bigDecimal.toString()); baseInvoiceEditVO.setOutStatus("1"); baseInvoiceEditVO.setOutTaxPeriod(outTaxPeriod); UserInfo userInfo = new UserInfo(); 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 5bdf40f1..ff95c202 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 @@ -332,6 +332,21 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl1){ + es.setZMESSAGE(errorMsg.toString()+"不存在"); + es.setZTYPE("E"); + return es; + } + for(ZDATA zdata1:zdata){ //成功或者失败标识 boolean flag = false; @@ -354,7 +369,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl