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

Merge branches 'dev-v6.0.1' and 'dev0310' of http://10.1.1.216/xm/sdenergy/jxpt/pt-sdenergy into dev-v6.0.1

Browse Source
release
yefei 2 years ago
parent 249c181cbb 44874a4314
commit 8352919f4a
8 changed files with 199 additions and 149 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. 1
      dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java
  2. 5
      dxhy-core/src/main/java/com/dxhy/core/model/CheckRecordInvoiceDetailVO.java
  3. 112
      dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
  4. 4
      dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java
  5. 4
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  6. 5
      dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java
  7. 5
      dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoiceDetail.java
  8. 66
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

1
dxhy-core/src/main/java/com/dxhy/core/job/entity/TDxRecordInvoiceDetail.java
Unescape View File

@ -91,4 +91,5 @@ public class TDxRecordInvoiceDetail implements Serializable {
* 商品编码
*/
private String goodsNum;
}

5
dxhy-core/src/main/java/com/dxhy/core/model/CheckRecordInvoiceDetailVO.java
Unescape View File

@ -50,6 +50,11 @@ public class CheckRecordInvoiceDetailVO {
*/
private String taxRate;
/**
* 税码
*/
private String taxCode;
/**
* 税额
*/

112
dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java
Unescape View File

@ -95,7 +95,7 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
JSONObject checkInfo = null;
String invoiceCode = pramsMap.get("invoiceCode");
String invoiceNo = pramsMap.get("invoiceNo");
String uuid = (StringUtils.isEmpty(invoiceCode)?"":invoiceCode) + invoiceNo;
String uuid = (StringUtils.isEmpty(invoiceCode) ? "" : invoiceCode) + invoiceNo;
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
QueryWrapper<TDxRecordInvoice> queryWrapper = new QueryWrapper<>();
@ -144,22 +144,17 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
/**
* 根据数据拼接需要返回的报文
*
* @param invoiceRecord
* 底账表信息
* @param vehicleSaleInfo
* 机动车表信息
* @param invoiceDetailList
* 底账明细表信息
* @param img
* 图片信息
* @param invoiceRecord 底账表信息
* @param vehicleSaleInfo 机动车表信息
* @param invoiceDetailList 底账明细表信息
* @param img 图片信息
* @return 返回
*
*/
private JSONObject createCheckInfo(TDxRecordInvoice invoiceRecord, TDxVehicleSaleInvoice vehicleSaleInfo,
List<TDxRecordInvoiceDetail> invoiceDetailList, TDxInvoiceImg img) {
JSONObject checkInfo = new JSONObject();
InvoiceSubjectVO checkRecordVo = this.convertToCheckRecordVo(invoiceRecord, img,invoiceDetailList);
InvoiceSubjectVO checkRecordVo = this.convertToCheckRecordVo(invoiceRecord, img, invoiceDetailList);
// 取发票上的价税合计
String totalAmount = checkRecordVo.getTotalAmount();
@ -194,10 +189,10 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
}
}
checkInfo.put("invoiceDetails", detail);
if("11".equals(invoiceRecord.getInvoiceType())){
if ("11".equals(invoiceRecord.getInvoiceType())) {
checkInfo.put("detailAmountSum", totalAmount);
checkInfo.put("taxAmountSum", checkRecordVo.getTaxAmount());
}else {
} else {
checkInfo.put("detailAmountSum", MathUtil.round(invoiceRecord.getInvoiceAmount().toPlainString()));
if (StringUtils.isNotBlank(se) && invoiceRecord.getTaxAmount().compareTo(new BigDecimal(0)) == 0) {
checkInfo.put("taxAmountSum", se);
@ -215,7 +210,7 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
return checkInfo;
}
private InvoiceSubjectVO convertToCheckRecordVo(TDxRecordInvoice invoiceRecord, TDxInvoiceImg img,List<TDxRecordInvoiceDetail> invoiceDetailList) {
private InvoiceSubjectVO convertToCheckRecordVo(TDxRecordInvoice invoiceRecord, TDxInvoiceImg img, List<TDxRecordInvoiceDetail> invoiceDetailList) {
InvoiceSubjectVO checkRecordVo = new InvoiceSubjectVO();
// 字典值转换
String fpzt = dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceRecord.getInvoiceStatus());
@ -271,17 +266,17 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
: MathUtil.round(invoiceRecord.getInvoiceAmount().toPlainString()));
checkRecordVo.setTaxAmount(
invoiceRecord.getTaxAmount() == null ? "" : MathUtil.round(invoiceRecord.getTaxAmount().toPlainString()));
if("11".equals(invoiceRecord.getInvoiceType())){
if ("11".equals(invoiceRecord.getInvoiceType())) {
BigDecimal detailAmount = new BigDecimal(0);
if(CollectionUtils.isNotEmpty(invoiceDetailList)){
for (TDxRecordInvoiceDetail tdxRecordInvoiceDetail:invoiceDetailList){
if(tdxRecordInvoiceDetail.getDetailAmount()!=null){
if (CollectionUtils.isNotEmpty(invoiceDetailList)) {
for (TDxRecordInvoiceDetail tdxRecordInvoiceDetail : invoiceDetailList) {
if (tdxRecordInvoiceDetail.getDetailAmount() != null) {
detailAmount = detailAmount.add(new BigDecimal(tdxRecordInvoiceDetail.getDetailAmount()));
}
}
}
checkRecordVo.setTotalAmount(MathUtil.round(detailAmount.toPlainString()));
}else {
} else {
if (invoiceRecord.getTotalAmount() == null) {
BigDecimal add = invoiceRecord.getInvoiceAmount().add(invoiceRecord.getTaxAmount());
checkRecordVo.setTotalAmount(MathUtil.round(add.toPlainString()));
@ -346,10 +341,8 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
/**
* 转义认证类型
*
* @param rzlx
* 认证类型
* @param rzlx 认证类型
* @return 返回
*
*/
private String getRzlx(String rzlx) {
String rzlxmc = "";
@ -366,10 +359,8 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
/**
* 转义签收方式
*
* @param qsType
* 前首富昂视
* @param qsType 前首富昂视
* @return 类型
*
*/
private String getQsType(String qsType) {
String qsfs = "";
@ -392,10 +383,8 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
/**
* 转义签收状态
*
* @param qsStatus
* 签收状态
* @param qsStatus 签收状态
* @return 返回
*
*/
private String getQsStatus(String qsStatus) {
String qszt = "";
@ -410,10 +399,8 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
/**
* 转义认证方式
*
* @param rzhType
* 认证方式
* @param rzhType 认证方式
* @return 返回
*
*/
private String getRztype(String rzhType) {
String rzType = "";
@ -539,15 +526,19 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
CheckRecordInvoiceDetailVO checkRecordDetailVo = new CheckRecordInvoiceDetailVO();
if (StringHelper.trimEnter(tDxRecordInvoiceDetail.getTaxRate()).matches("[0-9]+")) {
checkRecordDetailVo.setTaxRate(StringHelper.trimEnter(tDxRecordInvoiceDetail.getTaxRate()) + "%");
} else if(tDxRecordInvoiceDetail.getTaxRate().contains(".")){
} else if (tDxRecordInvoiceDetail.getTaxRate().contains(".")) {
String taxRate = StringHelper.trimEnter(tDxRecordInvoiceDetail.getTaxRate());
if(taxRate.contains(".")){
if (taxRate.contains(".")) {
taxRate = taxRate.replace(".", "").replace("0", "");
}
checkRecordDetailVo.setTaxRate(taxRate + "%");
}else {
} else {
checkRecordDetailVo.setTaxRate(StringHelper.trimEnter(tDxRecordInvoiceDetail.getTaxRate()));
}
if (checkRecordDetailVo.getTaxRate() != null)
checkRecordDetailVo.setTaxCode(getZSM(checkRecordDetailVo.getTaxRate()));
checkRecordDetailVo.setCph(StringHelper.trimEnter(tDxRecordInvoiceDetail.getCph()));
checkRecordDetailVo.setDetailAmount(StringHelper.trimEnter(tDxRecordInvoiceDetail.getDetailAmount()));
checkRecordDetailVo.setDetailNo(StringHelper.trimEnter(tDxRecordInvoiceDetail.getDetailNo()));
@ -570,7 +561,7 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
JSONObject checkInfo = null;
String invoiceCode = pramsMap.get("invoiceCode");
String invoiceNo = pramsMap.get("invoiceNo");
String uuid = (StringUtils.isEmpty(invoiceCode)?"":invoiceCode) + invoiceNo;
String uuid = (StringUtils.isEmpty(invoiceCode) ? "" : invoiceCode) + invoiceNo;
DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
@ -607,4 +598,55 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
}
return this.createCheckInfo(invoiceRecord, vehicleSaleInfo, invoiceDetailList, img);
}
private String getZSM(String taxRate) {
String sm = "";
switch (taxRate) {
// 发票采集
case "0.00":
sm = "J0";
break;
case "免税":
sm = "J0";
break;
case "16%":
sm = "J1";
break;
case "13%":
sm = "J2";
break;
case "10%":
sm = "J3";
break;
case "9%":
sm = "J4";
break;
case "6%":
sm = "J5";
break;
case "5%":
sm = "J6";
break;
case "3%":
sm = "J7";
break;
case "2%":
sm = "J8";
break;
case "1%":
sm = "J9";
break;
case "17%":
sm = "JC";
break;
default:
sm = "";
break;
}
return sm;
}
}

4
dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java
Unescape View File

@ -59,9 +59,7 @@ public class ErpWebConfiguration implements WebMvcConfigurer {
*/
private ArrayList<String> getIncludePathPatterns() {
ArrayList<String> list = new ArrayList<>();
String[] urls = {"/order/**"
};
String[] urls = {"/order/**"};
Collections.addAll(list, urls);
return list;
}

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

@ -233,9 +233,7 @@ public class SDNYMainProcessController extends AbstractController {
for (SNInvoice invoice : invoiceInfoList) {
String fplxdm = "";
String snFplx = "";
String invoiceCode = invoice.getInvoiceCode();
String invoiceNo = invoice.getInvoiceNumber();
result = snPushCheckRecordService.updateInvoicePoll(snRequestObject, company, taxNo, reimburse, invoice, fplxdm, invoiceCode, invoiceNo);
result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm,imageId,compCode);
//价税分离判断
if (!"ok".equals(result) && !"0000".equals(result)) {

5
dxhy-erp/src/main/java/com/dxhy/erp/entity/TDxRecordInvoiceDetail.java
Unescape View File

@ -114,4 +114,9 @@ public class TDxRecordInvoiceDetail implements Serializable {
*/
private String goodsNum;
/**
* 税码
*/
private String taxCode;
}

5
dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoiceDetail.java
Unescape View File

@ -75,4 +75,9 @@ public class SNInvoiceDetail {
*/
private String type = "";
/**
* 类型
*/
private String taxCode = "";
}

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

@ -98,7 +98,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
return post;
}
public String pushInvoiceToRecordInvoice(SNRequestObject snRequestObject, String taxNo, String company) throws Exception {
public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company) throws Exception {
QueryWrapper<BaseTDxTaxCurrent> currentWrapper = new QueryWrapper<>();
currentWrapper.eq("taxno", taxNo);
@ -106,12 +106,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
BaseTDxTaxCurrent current = baseTDxTaxCurrentDao.selectOne(currentWrapper);
List<SNInvoice> invoiceInfoList = snRequestObject.getInvoiceInfoList();
if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
for (SNInvoice snInvoice : invoiceInfoList) {
String fpdm = snInvoice.getInvoiceCode();
String fphm = snInvoice.getInvoiceNumber();
@ -138,15 +132,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
recordInvoice.setUuid(fpdm + fphm);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(kprq != null) {
if (kprq != null) {
recordInvoice.setInvoiceDate(sdf.parse(kprq));
}else{
} else {
recordInvoice.setInvoiceDate(new Date());
log.error("开票日期为空.请检查发票");
}
recordInvoice.setInvoiceCode(fpdm);
recordInvoice.setInvoiceNo(fphm);
if (je != null) {
recordInvoice.setInvoiceAmount(new BigDecimal(je));
}
if (se != null) {
recordInvoice.setTaxAmount(new BigDecimal(se));
}
@ -169,40 +166,39 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
} else {
baseTDxRecordInvoiceDao.insert(recordInvoice);
}
}
}
return "";
}
public Integer pushInvoiceToRecordInvoice2(SNRequestObject snRequestObject) {
public Integer pushInvoiceToRecordInvoice2(SNInvoice snInvoice,String imageId,String compCode) {
DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
int update = 0;
List<SNInvoice> invoiceInfoList = snRequestObject.getInvoiceInfoList();
if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
for (SNInvoice snInvoice : invoiceInfoList) {
String fpdm = snInvoice.getInvoiceCode();
String fphm = snInvoice.getInvoiceNumber();
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
recordWrapper.eq("uuid", fpdm + fphm);
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
recordInvoice.setImageId(snRequestObject.getImageId());
recordInvoice.setCompCode(snRequestObject.getCompCode());
recordInvoice.setImageId(imageId);
recordInvoice.setCompCode(compCode);
update = baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
}
} else {
String imageId = snRequestObject.getImageId();
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
recordWrapper.eq("image_id", imageId);
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
recordInvoice.setImageId("");
recordInvoice.setCompCode("");
update = baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
}
// if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
// for (SNInvoice snInvoice : invoiceInfoList) {
//
// }
// } else {
// String imageId = snRequestObject.getImageId();
// QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
// recordWrapper.eq("image_id", imageId);
// BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
// recordInvoice.setImageId("");
// recordInvoice.setCompCode("");
//
// update = baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
// }
return update;
}
@ -501,7 +497,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
if (num > 9) {
taxRateDetail = "0." + taxRateDetail;
} else {
if(!taxRateDetail.startsWith("0")){
if (!taxRateDetail.startsWith("0")) {
taxRateDetail = "0.0" + taxRateDetail;
}
}
@ -544,7 +540,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
return jsonObject;
}
public String updateInvoicePoll(@RequestBody SNRequestObject snRequestObject, String company, String taxNo, TDxInvoiceReimburse reimburse, SNInvoice invoice, String fplxdm, String invoiceCode, String invoiceNo) throws Exception {
public String updateInvoicePoll(String company, String taxNo, TDxInvoiceReimburse reimburse, SNInvoice invoice, String fplxdm,String imageId,String compCode) throws Exception {
String result = "0000";
//判断发票类型
@ -562,16 +558,16 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
if (data != null) {
invoice.setIsDeductible(data.getIsDeductible());
invoice.setTaxRate(data.getTaxRate());
if(data.getInvoiceAmount() != null) {
if (data.getInvoiceAmount() != null) {
invoice.setTotalAmount(data.getInvoiceAmount().toString());
}
if(data.getTaxAmount() != null) {
if (data.getTaxAmount() != null) {
invoice.setTotalTax(data.getTaxAmount().toString());
}
}
if (!"ok".equals(invoiceResult.getMsg()) && !"0000".equals(invoiceResult.getMsg())) {
log.info("价税分离失败:{}",invoiceResult.getMsg());
log.info("价税分离失败:{}", invoiceResult.getMsg());
return invoiceResult.getMsg();
}
@ -597,11 +593,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
|| "08".equals(fplxdm) || "10".equals(fplxdm) || "11".equals(fplxdm) || "14".equals(fplxdm)
|| "15".equals(fplxdm) || "31".equals(fplxdm) || "32".equals(fplxdm)) {
//可查验发票,已入库,更新票池
Integer integer = this.pushInvoiceToRecordInvoice2(snRequestObject);
Integer integer = this.pushInvoiceToRecordInvoice2(invoice,imageId,compCode);
log.info("可查验发票，更新底账库完成");
} else {
//不可查验发票,未入库,插入票池
this.pushInvoiceToRecordInvoice(snRequestObject, taxNo, company);
this.pushInvoiceToRecordInvoice(invoice, taxNo, company);
log.info("不可查验发票，插入底账库成功");
}
@ -610,7 +606,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
}
private TDxInvoiceReimburse convertToReimburse(SNInvoice invoice, TDxInvoiceReimburse reimburse, String fplxdm, String company) {
reimburse.setId(IdUtils.nextId());
reimburse.setInvoiceType(fplxdm);
reimburse.setInvoiceCode(invoice.getInvoiceCode());
reimburse.setInvoiceNo(invoice.getInvoiceNumber());

Write Preview
Loading…
Cancel
Save