From 680ac77cda993f21296899fc060e25e8cf49cbf9 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 17 Apr 2023 17:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E8=BD=A6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E4=B8=8B=E8=BD=A6=E6=97=B6=E9=97=B4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 06eacf31..627ec6b9 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -142,9 +142,9 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoice); return ResponseEntity.ok(JSONObject.toJSONString(data)); - }else{ + } else { TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid); - if(tdxSaleRecordInvoice != null){ + if (tdxSaleRecordInvoice != null) { R data = new R(1000, "default success"); String checkInvoice = JSONObject.toJSONString(tdxSaleRecordInvoice); @@ -253,7 +253,7 @@ public class SDNYMainProcessController extends AbstractController { for (SNInvoice invoice : invoiceInfoList) { String fplxdm = ""; String snFplx = ""; - result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm,imageId,compCode); + result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm, imageId, compCode); //价税分离判断 if (!"ok".equals(result) && !"0000".equals(result)) { @@ -371,7 +371,7 @@ public class SDNYMainProcessController extends AbstractController { // BigDecimal tax = new BigDecimal(snInvoice.getTotalTax()); // BigDecimal subtract = total.subtract(tax); info.setZJK(total.toString()); - }else { + } else { info.setZJK("0.00"); } info.setZSCSJ("000000"); @@ -394,65 +394,66 @@ public class SDNYMainProcessController extends AbstractController { List invoiceLineList = snInvoice.getInvoiceLineList(); List sapInvoiceDetailList = new ArrayList<>(); if (invoiceLineList != null && invoiceLineList.size() > 0) { - SNInvoiceDetail snInvoiceDetail = invoiceLineList.get(0); - SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail(); + for (SNInvoiceDetail snInvoiceDetail : invoiceLineList) { + SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail(); // sapInvoiceDetail.setZZWDJ(""); - sapInvoiceDetail.setIMG_ID(imageId); - sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum()); + sapInvoiceDetail.setIMG_ID(imageId); + sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum()); // sapInvoiceDetail.setZCJSJ(); // sapInvoiceDetail.setZCJRQ(); - sapInvoiceDetail.setFPYXBH(snInvoice.getFileId()); - sapInvoiceDetail.setZCFZ(snInvoice.getStationGetOn()); - sapInvoiceDetail.setZTXZ(snInvoiceDetail.getCurrentDateEnd()); - sapInvoiceDetail.setZTXQ(snInvoiceDetail.getCurrentDateStart()); - - if (snInvoiceDetail.getAmount() != null) - sapInvoiceDetail.setZJK(snInvoiceDetail.getAmount()); - sapInvoiceDetail.setZHH(snInvoiceDetail.getRowNo()); - //将类似于0.03数据格式转化为3.00 - if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != ""){ - sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); - if (snInvoiceDetail.equals("0")){ - sapInvoiceDetail.setZTAX("0.00"); - } - if (snInvoiceDetail.getTaxRate().contains(".")){ - String getTaxRate = snInvoiceDetail.getTaxRate(); - if (snInvoiceDetail.getTaxRate().length() > 4){ - getTaxRate = getTaxRate.substring(0,4); + sapInvoiceDetail.setFPYXBH(snInvoice.getFileId()); + sapInvoiceDetail.setZCFZ(snInvoice.getStationGetOn()); + sapInvoiceDetail.setZTXZ(snInvoiceDetail.getCurrentDateEnd()); + sapInvoiceDetail.setZTXQ(snInvoiceDetail.getCurrentDateStart()); + + if (snInvoiceDetail.getAmount() != null) + sapInvoiceDetail.setZJK(snInvoiceDetail.getAmount()); + sapInvoiceDetail.setZHH(snInvoiceDetail.getRowNo()); + //将类似于0.03数据格式转化为3.00 + if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != "") { + sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); + if (snInvoiceDetail.equals("0")) { + sapInvoiceDetail.setZTAX("0.00"); + } + if (snInvoiceDetail.getTaxRate().contains(".")) { + String getTaxRate = snInvoiceDetail.getTaxRate(); + if (snInvoiceDetail.getTaxRate().length() > 4) { + getTaxRate = getTaxRate.substring(0, 4); + } + BigDecimal tax = new BigDecimal(getTaxRate); + BigDecimal tax1 = tax.multiply(new BigDecimal("100")); + sapInvoiceDetail.setZTAX(tax1.toString()); } - BigDecimal tax = new BigDecimal(getTaxRate); - BigDecimal tax1 = tax.multiply(new BigDecimal("100")); - sapInvoiceDetail.setZTAX(tax1.toString()); } - } - if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null){ - info.setZTAX(sapInvoiceDetail.getZTAX()); - } + if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { + info.setZTAX(sapInvoiceDetail.getZTAX()); + } // sapInvoiceDetail.setZHBH(""); - sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice()); + sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice()); // sapInvoiceDetail.setZHID(""); - sapInvoiceDetail.setZDDZ(snInvoice.getStationGetOff()); - sapInvoiceDetail.setZHWMC(snInvoiceDetail.getCommodityName()); - sapInvoiceDetail.setZCYR(info.getZCYRMC()); - sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit()); - sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode()); - sapInvoiceDetail.setZSE(snInvoiceDetail.getTax()); - sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate()); - sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); - sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); - if (snInvoice.getInvoiceCode() != null) { - sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx); - } else { - sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber() + snFplx); + sapInvoiceDetail.setZDDZ(snInvoice.getStationGetOff()); + sapInvoiceDetail.setZHWMC(snInvoiceDetail.getCommodityName()); + sapInvoiceDetail.setZCYR(info.getZCYRMC()); + sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit()); + sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode()); + sapInvoiceDetail.setZSE(snInvoiceDetail.getTax()); + sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate()); + sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); + sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); + if (snInvoice.getInvoiceCode() != null) { + sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx); + } else { + sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber() + snFplx); + } + sapInvoiceDetailList.add(sapInvoiceDetail); } - sapInvoiceDetailList.add(sapInvoiceDetail); } info.setIT_ITEM(sapInvoiceDetailList); //获取税率 String taxRate = snInvoice.getTaxRate(); - if (taxRate !=null && taxRate.contains("%")){ + if (taxRate != null && taxRate.contains("%")) { String replace = taxRate.replace("%", ""); BigDecimal bigDecimal = new BigDecimal(replace); BigDecimal divide = bigDecimal.divide(new BigDecimal(100)); @@ -460,10 +461,10 @@ public class SDNYMainProcessController extends AbstractController { info.setZTAX(bigDecimal.multiply(new BigDecimal("0.01")).toString()); info.setZSM(getZSM(taxRate)); } - if (info.getZTAX() != null){ + if (info.getZTAX() != null) { info.setZSM(getZSM(info.getZTAX())); } - if (info.getZTAX() == null || info.getZTAX() == ""){ + if (info.getZTAX() == null || info.getZTAX() == "") { info.setZTAX("0.00"); } info.setZFPDM(snInvoice.getInvoiceCode()); @@ -488,7 +489,7 @@ public class SDNYMainProcessController extends AbstractController { info.setZFPZT(snInvoice.getState()); if (snInvoice.getState() == null) { info.setZFPZT("0"); - }else { + } else { info.setZFPZT(snInvoice.getState()); } // info.setZESCSC(""); @@ -534,13 +535,13 @@ public class SDNYMainProcessController extends AbstractController { info.setZPJLY("1"); } info.setZCYZT(snInvoice.getCheckStaus()); - if (snInvoice.getCheckStaus()==null){ + if (snInvoice.getCheckStaus() == null) { info.setZCYZT("1"); } info.setZCJR("opentext"); info.setZGXR("opentext"); info.setZQM("opentext"); - if (snInvoice.getCheckDate() != null){ + if (snInvoice.getCheckDate() != null) { String checkDate = snInvoice.getCheckDate().replace("-", ""); info.setZCYRQ(checkDate); }