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

Merge branch 'dev0310' of http://10.1.1.216/xm/sdenergy/jxpt/pt-sdenergy into dev0310

Browse Source
release
wangzhikun 2 years ago
parent 55e160db0f 0c89933ee2
commit 9f77f03e14
2 changed files with 97 additions and 79 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. 13
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  2. 163
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

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

@ -62,8 +62,6 @@ public class SDNYMainProcessController extends AbstractController {
return ResponseEntity.ok(R.error("发票代码不能为空！"));
}
// pramsMap.put("invoiceType", iu.getFplxdm());
if (pramsMap.get("invoiceNumber").isEmpty()) {
return ResponseEntity.ok(R.error("发票号码不能为空！"));
@ -80,6 +78,10 @@ public class SDNYMainProcessController extends AbstractController {
return ResponseEntity.ok(R.error("开票日期不能为空！"));
}
if (pramsMap.get("invoiceType").isEmpty()) {
return ResponseEntity.ok(R.error("开票日期不能为空！"));
}
if (SNFplxEnum.ZP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
|| SNFplxEnum.JDC.getSnFplxDm().equals(pramsMap.get("invoiceType"))
|| SNFplxEnum.DZZP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
@ -113,9 +115,12 @@ public class SDNYMainProcessController extends AbstractController {
|| SNFplxEnum.QDPP.getSnFplxDm().equals(pramsMap.get("invoiceType"))
) {
pramsMap.put("invoiceType", fplxdm);
//查验发票数据
checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap);
try {
checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap);
} catch (Exception e) {
e.printStackTrace();
}
if (!checkInvoiceResult.containsKey("code")) {
return ResponseEntity.ok(R.ok().put("data", checkInvoiceResult));

163
dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
Unescape View File

@ -88,8 +88,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao;
public String pushCheckResultToSAP(JSONObject result) throws Exception {
result.put("systemSign", "");
result.put("roleIds", "");
log.info("获取角色请求参数：{} , 请求地址：{}", result, snYxUrl);
String post = HttpUtil.post(snYxUrl, result, 30000);
log.info("获取角色返回信息：{}", post);
@ -113,6 +111,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
String fpdm = snInvoice.getInvoiceCode();
String fphm = snInvoice.getInvoiceNumber();
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
currentWrapper.eq("uuid", fpdm + fphm);
BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper);
String kprq = snInvoice.getBillingDate();
String je = snInvoice.getTotalAmount();
String xfsh = snInvoice.getSalesTaxNo();
@ -145,7 +150,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
recordInvoice.setInvoiceStatus("0");
recordInvoice.setInvoiceType(invoiceType);
recordInvoice.setCompany(company);
baseTDxRecordInvoiceDao.insert(recordInvoice);
if(baseTDxRecordInvoice != null) {
baseTDxRecordInvoiceDao.update(recordInvoice,recordWrapper);
}else{
baseTDxRecordInvoiceDao.insert(recordInvoice);
}
}
}
@ -185,7 +195,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
return queryInvoiceResult;
}
public JSONObject singleCheckInvoice(Map<String, String> pramsMap) {
public JSONObject singleCheckInvoice(Map<String, String> pramsMap) throws Exception{
//1.封装查验参数
ApiRequest apiRequest = new ApiRequest();
@ -231,80 +241,83 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
if ("0000".equals(contentMap.get("code"))) {
HashMap<String, Object> invoiceData = JSONObject.parseObject(contentMap.get("data").toString(), HashMap.class);
if("0001".equals(invoiceData.get("cyjg"))) {
jsonObject.put("invoiceType", invoiceType);
jsonObject.put("administrativeDivisionNo", "");
jsonObject.put("administrativeDivisionName", "");
jsonObject.put("invoiceCode", invoiceData.get("fpdm"));
jsonObject.put("invoiceNumber", invoiceData.get("fphm"));
jsonObject.put("billingDate", invoiceData.get("kprq"));
jsonObject.put("purchaserName", invoiceData.get("gmfmc"));
jsonObject.put("purchaserTaxNo", invoiceData.get("gmfsbh"));
jsonObject.put("purchaserBank", invoiceData.get("gmfyhzh"));
jsonObject.put("purchaserAddressPhone", invoiceData.get("gmfdzdh"));
jsonObject.put("salesName", invoiceData.get("xhfmc"));
jsonObject.put("salesTaxNo", invoiceData.get("xhfsbh"));
jsonObject.put("salesAddressPhone", invoiceData.get("xhfdzdh"));
jsonObject.put("salesBank", invoiceData.get("xhfyhzh"));
jsonObject.put("totalAmount", invoiceData.get("totalAmount"));
jsonObject.put("totalTax", invoiceData.get("fpse"));
jsonObject.put("amountTax", invoiceData.get("jshj"));
jsonObject.put("amountTaxCN", "");
jsonObject.put("checkCode", invoiceData.get("jym"));
jsonObject.put("state", invoiceData.get("zfbz"));
jsonObject.put("carrierName", invoiceData.get("cyrmc"));
jsonObject.put("carrierTaxNo", invoiceData.get("cyrsbh"));
jsonObject.put("draweeName", invoiceData.get("spfmc"));
jsonObject.put("draweeTaxNo", invoiceData.get("spfsbh"));
jsonObject.put("cargoInformation", invoiceData.get("ysgwxx"));
jsonObject.put("transportRoute", invoiceData.get("qydjyddd"));
jsonObject.put("machineCode", invoiceData.get("skph"));
jsonObject.put("tonnage", invoiceData.get("ccdw"));
jsonObject.put("taxAuthorityNo", invoiceData.get("zgswjgdm"));
jsonObject.put("taxAuthorityName", invoiceData.get("zgswjgmc"));
jsonObject.put("remarks", invoiceData.get("bz"));
jsonObject.put("vehicleType", invoiceData.get("cllx"));
jsonObject.put("brandModel", invoiceData.get("cpxh"));
jsonObject.put("originPlace", invoiceData.get("cd"));
jsonObject.put("certificateNo", invoiceData.get("hgzs"));
jsonObject.put("inspectionListNo", invoiceData.get("sjdh"));
jsonObject.put("engineNo", invoiceData.get("fdjhm"));
jsonObject.put("vehicleNo", invoiceData.get("clsbh"));
jsonObject.put("importCertificateNo", invoiceData.get("jszmsh"));
jsonObject.put("paymentVoucherNo", invoiceData.get("wspzhm"));
jsonObject.put("passengersLimited", invoiceData.get("xcrs"));
jsonObject.put("tollSign", invoiceData.get("txfbz"));
jsonObject.put("zeroTaxRateSign", invoiceData.get("lslbs"));
jsonObject.put("source", "");
jsonObject.put("idcardNo", invoiceData.get("sfzh"));
List<Map<String, String>> returnDetailList = new ArrayList<>();
JSONArray detailList = (JSONArray) invoiceData.get("detailList");
for (int i = 0; i < detailList.size(); i++) {
JSONObject detail = (JSONObject) detailList.get(i);
Map<String, String> snDetailMap = new HashMap<String, String>();
snDetailMap.put("rowNo", ++i + "");
snDetailMap.put("commodityCode", detail.getString("mxbh"));
snDetailMap.put("commodityName", detail.getString("hwmc"));
snDetailMap.put("specificationModel", detail.getString("ggxh"));
snDetailMap.put("unit", detail.getString("jldw"));
snDetailMap.put("quantity", detail.getString("spsl"));
snDetailMap.put("unitPrice", detail.getString("hsdj"));
snDetailMap.put("amount", detail.getString("je"));
snDetailMap.put("taxRate", detail.getString("sl"));
snDetailMap.put("tax", detail.getString("se"));
snDetailMap.put("currentDateEnd", detail.getString("txrqz"));
snDetailMap.put("currentDateStart", detail.getString("txrqq"));
snDetailMap.put("licensePlateNum", detail.getString("cph"));
snDetailMap.put("type", detail.getString("lx"));
returnDetailList.add(snDetailMap);
}
jsonObject.put("invoiceType", invoiceType);
jsonObject.put("administrativeDivisionNo", "");
jsonObject.put("administrativeDivisionName", "");
jsonObject.put("invoiceCode", invoiceData.get("fpdm"));
jsonObject.put("invoiceNumber", invoiceData.get("fphm"));
jsonObject.put("billingDate", invoiceData.get("kprq"));
jsonObject.put("purchaserName", invoiceData.get("gmfmc"));
jsonObject.put("purchaserTaxNo", invoiceData.get("gmfsbh"));
jsonObject.put("purchaserBank", invoiceData.get("gmfyhzh"));
jsonObject.put("purchaserAddressPhone", invoiceData.get("gmfdzdh"));
jsonObject.put("salesName", invoiceData.get("xhfmc"));
jsonObject.put("salesTaxNo", invoiceData.get("xhfsbh"));
jsonObject.put("salesAddressPhone", invoiceData.get("xhfdzdh"));
jsonObject.put("salesBank", invoiceData.get("xhfyhzh"));
jsonObject.put("totalAmount", invoiceData.get("totalAmount"));
jsonObject.put("totalTax", invoiceData.get("fpse"));
jsonObject.put("amountTax", invoiceData.get("jshj"));
jsonObject.put("amountTaxCN", "");
jsonObject.put("checkCode", invoiceData.get("jym"));
jsonObject.put("state", invoiceData.get("zfbz"));
jsonObject.put("carrierName", invoiceData.get("cyrmc"));
jsonObject.put("carrierTaxNo", invoiceData.get("cyrsbh"));
jsonObject.put("draweeName", invoiceData.get("spfmc"));
jsonObject.put("draweeTaxNo", invoiceData.get("spfsbh"));
jsonObject.put("cargoInformation", invoiceData.get("ysgwxx"));
jsonObject.put("transportRoute", invoiceData.get("qydjyddd"));
jsonObject.put("machineCode", invoiceData.get("skph"));
jsonObject.put("tonnage", invoiceData.get("ccdw"));
jsonObject.put("taxAuthorityNo", invoiceData.get("zgswjgdm"));
jsonObject.put("taxAuthorityName", invoiceData.get("zgswjgmc"));
jsonObject.put("remarks", invoiceData.get("bz"));
jsonObject.put("vehicleType", invoiceData.get("cllx"));
jsonObject.put("brandModel", invoiceData.get("cpxh"));
jsonObject.put("originPlace", invoiceData.get("cd"));
jsonObject.put("certificateNo", invoiceData.get("hgzs"));
jsonObject.put("inspectionListNo", invoiceData.get("sjdh"));
jsonObject.put("engineNo", invoiceData.get("fdjhm"));
jsonObject.put("vehicleNo", invoiceData.get("clsbh"));
jsonObject.put("importCertificateNo", invoiceData.get("jszmsh"));
jsonObject.put("paymentVoucherNo", invoiceData.get("wspzhm"));
jsonObject.put("passengersLimited", invoiceData.get("xcrs"));
jsonObject.put("tollSign", invoiceData.get("txfbz"));
jsonObject.put("zeroTaxRateSign", invoiceData.get("lslbs"));
jsonObject.put("source", "");
jsonObject.put("idcardNo", invoiceData.get("sfzh"));
List<Map<String, String>> returnDetailList = new ArrayList<>();
JSONArray detailList = (JSONArray) invoiceData.get("detailList");
for (int i = 0;i<detailList.size();i++) {
JSONObject detail = (JSONObject) detailList.get(i);
Map<String, String> snDetailMap = new HashMap<String, String>();
snDetailMap.put("rowNo", i + "");
snDetailMap.put("commodityCode", detail.getString("mxbh"));
snDetailMap.put("commodityName", detail.getString("hwmc"));
snDetailMap.put("specificationModel", detail.getString("ggxh"));
snDetailMap.put("unit", detail.getString("jldw"));
snDetailMap.put("quantity", detail.getString("spsl"));
snDetailMap.put("unitPrice", detail.getString("hsdj"));
snDetailMap.put("amount", detail.getString("je"));
snDetailMap.put("taxRate", detail.getString("sl"));
snDetailMap.put("tax", detail.getString("se"));
snDetailMap.put("currentDateEnd", detail.getString("txrqz"));
snDetailMap.put("currentDateStart", detail.getString("txrqq"));
snDetailMap.put("licensePlateNum", detail.getString("cph"));
snDetailMap.put("type", detail.getString("lx"));
returnDetailList.add(snDetailMap);
i++;
jsonObject.put("invoiceLineList", returnDetailList);
}else{
jsonObject.put("cyjg",invoiceData.get("cyjg"));
jsonObject.put("cyjgxx",invoiceData.get("cyjgxx"));
}
jsonObject.put("invoiceLineList", returnDetailList);
} else {
jsonObject.put("code", contentMap.get("code"));
jsonObject.put("message", contentMap.get("message"));

Write Preview
Loading…
Cancel
Save