luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改上车时间和下车时间字段

Browse Source
release
yishiqihuasheng 2 years ago
parent cc27566544
commit 680ac77cda
1 changed files with 55 additions and 54 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 109
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

109
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -142,9 +142,9 @@ public class SDNYMainProcessController extends AbstractController {
data.put("data", checkInvoice); data.put("data", checkInvoice);
return ResponseEntity.ok(JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data));
}else{ } else {
TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid); TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid);
if(tdxSaleRecordInvoice != null){ if (tdxSaleRecordInvoice != null) {
R data = new R(1000, "default success"); R data = new R(1000, "default success");
String checkInvoice = JSONObject.toJSONString(tdxSaleRecordInvoice); String checkInvoice = JSONObject.toJSONString(tdxSaleRecordInvoice);
@ -253,7 +253,7 @@ public class SDNYMainProcessController extends AbstractController {
for (SNInvoice invoice : invoiceInfoList) { for (SNInvoice invoice : invoiceInfoList) {
String fplxdm = ""; String fplxdm = "";
String snFplx = ""; 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)) { if (!"ok".equals(result) && !"0000".equals(result)) {
@ -371,7 +371,7 @@ public class SDNYMainProcessController extends AbstractController {
// BigDecimal tax = new BigDecimal(snInvoice.getTotalTax()); // BigDecimal tax = new BigDecimal(snInvoice.getTotalTax());
// BigDecimal subtract = total.subtract(tax); // BigDecimal subtract = total.subtract(tax);
info.setZJK(total.toString()); info.setZJK(total.toString());
}else { } else {
info.setZJK("0.00"); info.setZJK("0.00");
} }
info.setZSCSJ("000000"); info.setZSCSJ("000000");
@ -394,65 +394,66 @@ public class SDNYMainProcessController extends AbstractController {
List<SNInvoiceDetail> invoiceLineList = snInvoice.getInvoiceLineList(); List<SNInvoiceDetail> invoiceLineList = snInvoice.getInvoiceLineList();
List<SAPInvoiceDetail> sapInvoiceDetailList = new ArrayList<>(); List<SAPInvoiceDetail> sapInvoiceDetailList = new ArrayList<>();
if (invoiceLineList != null && invoiceLineList.size() > 0) { if (invoiceLineList != null && invoiceLineList.size() > 0) {
SNInvoiceDetail snInvoiceDetail = invoiceLineList.get(0); for (SNInvoiceDetail snInvoiceDetail : invoiceLineList) {
SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail(); SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail();
// sapInvoiceDetail.setZZWDJ(""); // sapInvoiceDetail.setZZWDJ("");
sapInvoiceDetail.setIMG_ID(imageId); sapInvoiceDetail.setIMG_ID(imageId);
sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum()); sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum());
// sapInvoiceDetail.setZCJSJ(); // sapInvoiceDetail.setZCJSJ();
// sapInvoiceDetail.setZCJRQ(); // sapInvoiceDetail.setZCJRQ();
sapInvoiceDetail.setFPYXBH(snInvoice.getFileId()); sapInvoiceDetail.setFPYXBH(snInvoice.getFileId());
sapInvoiceDetail.setZCFZ(snInvoice.getStationGetOn()); sapInvoiceDetail.setZCFZ(snInvoice.getStationGetOn());
sapInvoiceDetail.setZTXZ(snInvoiceDetail.getCurrentDateEnd()); sapInvoiceDetail.setZTXZ(snInvoiceDetail.getCurrentDateEnd());
sapInvoiceDetail.setZTXQ(snInvoiceDetail.getCurrentDateStart()); sapInvoiceDetail.setZTXQ(snInvoiceDetail.getCurrentDateStart());
if (snInvoiceDetail.getAmount() != null) if (snInvoiceDetail.getAmount() != null)
sapInvoiceDetail.setZJK(snInvoiceDetail.getAmount()); sapInvoiceDetail.setZJK(snInvoiceDetail.getAmount());
sapInvoiceDetail.setZHH(snInvoiceDetail.getRowNo()); sapInvoiceDetail.setZHH(snInvoiceDetail.getRowNo());
//将类似于0.03数据格式转化为3.00 //将类似于0.03数据格式转化为3.00
if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != ""){ if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != "") {
sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate());
if (snInvoiceDetail.equals("0")){ if (snInvoiceDetail.equals("0")) {
sapInvoiceDetail.setZTAX("0.00"); sapInvoiceDetail.setZTAX("0.00");
} }
if (snInvoiceDetail.getTaxRate().contains(".")){ if (snInvoiceDetail.getTaxRate().contains(".")) {
String getTaxRate = snInvoiceDetail.getTaxRate(); String getTaxRate = snInvoiceDetail.getTaxRate();
if (snInvoiceDetail.getTaxRate().length() > 4){ if (snInvoiceDetail.getTaxRate().length() > 4) {
getTaxRate = getTaxRate.substring(0,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) {
if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null){ info.setZTAX(sapInvoiceDetail.getZTAX());
info.setZTAX(sapInvoiceDetail.getZTAX()); }
}
// sapInvoiceDetail.setZHBH(""); // sapInvoiceDetail.setZHBH("");
sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice()); sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice());
// sapInvoiceDetail.setZHID(""); // sapInvoiceDetail.setZHID("");
sapInvoiceDetail.setZDDZ(snInvoice.getStationGetOff()); sapInvoiceDetail.setZDDZ(snInvoice.getStationGetOff());
sapInvoiceDetail.setZHWMC(snInvoiceDetail.getCommodityName()); sapInvoiceDetail.setZHWMC(snInvoiceDetail.getCommodityName());
sapInvoiceDetail.setZCYR(info.getZCYRMC()); sapInvoiceDetail.setZCYR(info.getZCYRMC());
sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit()); sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit());
sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode()); sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode());
sapInvoiceDetail.setZSE(snInvoiceDetail.getTax()); sapInvoiceDetail.setZSE(snInvoiceDetail.getTax());
sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate()); sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate());
sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate()));
sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
if (snInvoice.getInvoiceCode() != null) { if (snInvoice.getInvoiceCode() != null) {
sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx); sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx);
} else { } else {
sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber() + snFplx); sapInvoiceDetail.setZTID(snInvoice.getInvoiceNumber() + snFplx);
}
sapInvoiceDetailList.add(sapInvoiceDetail);
} }
sapInvoiceDetailList.add(sapInvoiceDetail);
} }
info.setIT_ITEM(sapInvoiceDetailList); info.setIT_ITEM(sapInvoiceDetailList);
//获取税率 //获取税率
String taxRate = snInvoice.getTaxRate(); String taxRate = snInvoice.getTaxRate();
if (taxRate !=null && taxRate.contains("%")){ if (taxRate != null && taxRate.contains("%")) {
String replace = taxRate.replace("%", ""); String replace = taxRate.replace("%", "");
BigDecimal bigDecimal = new BigDecimal(replace); BigDecimal bigDecimal = new BigDecimal(replace);
BigDecimal divide = bigDecimal.divide(new BigDecimal(100)); 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.setZTAX(bigDecimal.multiply(new BigDecimal("0.01")).toString());
info.setZSM(getZSM(taxRate)); info.setZSM(getZSM(taxRate));
} }
if (info.getZTAX() != null){ if (info.getZTAX() != null) {
info.setZSM(getZSM(info.getZTAX())); info.setZSM(getZSM(info.getZTAX()));
} }
if (info.getZTAX() == null || info.getZTAX() == ""){ if (info.getZTAX() == null || info.getZTAX() == "") {
info.setZTAX("0.00"); info.setZTAX("0.00");
} }
info.setZFPDM(snInvoice.getInvoiceCode()); info.setZFPDM(snInvoice.getInvoiceCode());
@ -488,7 +489,7 @@ public class SDNYMainProcessController extends AbstractController {
info.setZFPZT(snInvoice.getState()); info.setZFPZT(snInvoice.getState());
if (snInvoice.getState() == null) { if (snInvoice.getState() == null) {
info.setZFPZT("0"); info.setZFPZT("0");
}else { } else {
info.setZFPZT(snInvoice.getState()); info.setZFPZT(snInvoice.getState());
} }
// info.setZESCSC(""); // info.setZESCSC("");
@ -534,13 +535,13 @@ public class SDNYMainProcessController extends AbstractController {
info.setZPJLY("1"); info.setZPJLY("1");
} }
info.setZCYZT(snInvoice.getCheckStaus()); info.setZCYZT(snInvoice.getCheckStaus());
if (snInvoice.getCheckStaus()==null){ if (snInvoice.getCheckStaus() == null) {
info.setZCYZT("1"); info.setZCYZT("1");
} }
info.setZCJR("opentext"); info.setZCJR("opentext");
info.setZGXR("opentext"); info.setZGXR("opentext");
info.setZQM("opentext"); info.setZQM("opentext");
if (snInvoice.getCheckDate() != null){ if (snInvoice.getCheckDate() != null) {
String checkDate = snInvoice.getCheckDate().replace("-", ""); String checkDate = snInvoice.getCheckDate().replace("-", "");
info.setZCYRQ(checkDate); info.setZCYRQ(checkDate);
} }

Write Preview
Loading…
Cancel
Save