同步凭证号接口开发

release
wangzhikun 2 years ago
parent d8768fe744
commit eaf1e087a5
  1. 11
      dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java
  2. 1
      dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java
  3. 2
      dxhy-core/src/main/resources/mapper/ConfirmDao.xml
  4. 36
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
  5. 5
      dxhy-sign/src/main/java/com/dxhy/sign/util/InvoiceQueryUtil.java

@ -203,6 +203,17 @@ public class InvoiceUtil {
return valid;
}
public static void main(String[] args) {
String fphm ="1033697";
boolean valid = false;
if (!StringHelper.isBlank(fphm)
&& (FPHM8_PATTERN.matcher(fphm).matches() || FPHM10_PATTERN.matcher(fphm).matches())) {
valid = true;
}
System.out.println(valid);
}
/**
* 判断金额是否合法
*

@ -88,7 +88,6 @@ public class TAcOrg implements Serializable {
private String dataAceId;
private String dataAceKey;
private Date firstCollectDate;
public Date getFirstCollectDate() {
return firstCollectDate;
}

@ -19,7 +19,7 @@
</select>
<select id="getPullSapDataTaxNo" resultType="com.dxhy.core.job.entity.TAcOrg">
select g.taxno, g.db_name, g.company, g.taxname
select g.taxno, g.db_name, g.company, g.taxname,g.org_code orgcode
from sys_dept g
where g.org_type = '5'
and g.upgrade_status = '1'

@ -12,10 +12,7 @@ import com.dxhy.common.enums.ReturnCodeEnum;
import com.dxhy.common.service.impl.MpBaseServiceImpl;
import com.dxhy.common.util.pojo.Authorize;
import com.dxhy.common.util.pojo.GlobalInfo;
import com.dxhy.erp.dao.AuthRecordDao;
import com.dxhy.erp.dao.RecordInvoiceDao;
import com.dxhy.erp.dao.SysDeptDao;
import com.dxhy.erp.dao.TdxRecordInvoiceDao;
import com.dxhy.erp.dao.*;
import com.dxhy.erp.entity.*;
import com.dxhy.erp.model.*;
import com.dxhy.erp.model.auth.InterfaceCode;
@ -48,6 +45,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
TdxRecordInvoiceDao tDxrecordInvoiceDao;
@Resource
TDxInvoiceReimburseService tDxInvoiceReimburseService;
@Resource
TdxSaleRecordInvoiceDao tdxSaleRecordInvoiceDao;
@Override
public String applyInvoiceAuth(GlobalInfo globalInfo, Map<String, String> map, HttpServletRequest request,
@ -342,22 +341,16 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
for(ZDATA zdata1:zdata){
String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
if(fplxList.contains(zdata1.getZFPLX())){
TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
if(recordInvoiceByUuid==null){
errorMsg.append("发票号码:"+zdata1.getZFPHM());
}
}else {
TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
//查询票池
QueryWrapper<TDxInvoiceReimburse> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("uuid",uuid);
TDxInvoiceReimburse tDxInvoiceReimburse = tDxInvoiceReimburseService.getBaseMapper().selectOne(queryWrapper);
if(tDxInvoiceReimburse==null){
errorMsg.append("发票号码"+zdata1.getZFPHM());
}
QueryWrapper<TDxInvoiceReimburse> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("uuid",uuid);
TDxInvoiceReimburse tDxInvoiceReimburse = tDxInvoiceReimburseService.getBaseMapper().selectOne(queryWrapper);
//没法区分来源是不是销项发票
TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid);
if(recordInvoiceByUuid==null && tDxInvoiceReimburse==null && tdxSaleRecordInvoice==null){
errorMsg.append("发票号码:"+zdata1.getZFPHM());
}
}
if(errorMsg.length()>1){
es.setZMESSAGE(errorMsg.toString()+"不存在");
@ -402,8 +395,6 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
tDxrecordInvoiceDao.updateRz(authState,"1","1",recordInvoiceByUuid.getUuid());
}
}
}else {
flag=true;
}
}
}else {
@ -420,7 +411,10 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
}
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.set("voucher_no",zdata1.getBELNR());
updateWrapper.set("document_number",zdata1.getZBZDH());
tdxSaleRecordInvoiceDao.update(null,updateWrapper);
if(!flag){
promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功! ");
}

@ -69,6 +69,8 @@ public class InvoiceQueryUtil {
public String interfaceCode;
@Value("${invioceCheck.enterprisePermissionFlag}")
public boolean enterprisePermissionFlag;
@Value("${invioceCheck.checkTaxNo:}")
public String checkTaxNo;
@Resource
private SignCheckLogDao checkDao;
@ -91,6 +93,9 @@ public class InvoiceQueryUtil {
*/
public JSONObject queryInvoice(String invoiceCode, String invoiceNo, String invoiceDate, String invoiceAmount,
String checkCode, String taxNo,String invoiceType) {
if(checkTaxNo!=null && checkTaxNo!=""){
taxNo=checkTaxNo;
}
JSONObject invoiceResult = new JSONObject();

Loading…
Cancel
Save