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

Merge remote-tracking branch 'origin/dev0310' into dev0310

Browse Source
release
yefei 2 years ago
parent 7f0bcee85f 0d73328f32
commit 41e35e9f02
5 changed files with 86 additions and 39 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-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
  2. 100
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
  3. 20
      dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java
  4. 2
      dxhy-extend/src/main/java/com/dxhy/extend/model/SNSAPObject.java
  5. 2
      dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/VouncherSyncServiceImpl.java

1
dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java
Unescape View File

@ -1147,6 +1147,7 @@ public class InterfaceController extends AbstractController {
//进项税转出
}else if("FI849".equals(requestParam.getIS_INPUT().getIFYWID())){
resultString = transferOut(requestParam);
//票账比对数据推送
}else if("FI848".equals(requestParam.getIS_INPUT().getIFYWID())){
resultString = insertVouncherRecord(requestParam);
}

100
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
Unescape View File

@ -9,9 +9,12 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.dxhy.common.enums.FplxEnum;
import com.dxhy.erp.entity.*;
import com.dxhy.erp.model.*;
import com.dxhy.erp.service.TDxInvoiceReimburseService;
import com.dxhy.erp.utils.JsonUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
@ -28,10 +31,6 @@ 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.entity.AuthRecord;
import com.dxhy.erp.entity.RecordInvoice;
import com.dxhy.erp.entity.SysDeptEntity;
import com.dxhy.erp.entity.TdxRecordInvoice;
import com.dxhy.erp.model.auth.InterfaceCode;
import com.dxhy.erp.service.InvoiceAuthService;
import com.dxhy.erp.utils.CheckUtils;
@ -53,6 +52,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
SysDeptDao sysDeptDao;
@Resource
TdxRecordInvoiceDao tDxrecordInvoiceDao;
@Resource
TDxInvoiceReimburseService tDxInvoiceReimburseService;
@Override
public String applyInvoiceAuth(GlobalInfo globalInfo, Map<String, String> map, HttpServletRequest request,
@ -334,12 +335,35 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
authDateReq.setApplyRzlx("1");
StringBuilder errorMsg = new StringBuilder();
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
List<String> fplxList = new ArrayList<>();
fplxList.add("01");
fplxList.add("03");
fplxList.add("04");
fplxList.add("08");
fplxList.add("10");
fplxList.add("11");
fplxList.add("14");
fplxList.add("31");
fplxList.add("32");
for(ZDATA zdata1:zdata){
String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
if(recordInvoiceByUuid==null){
errorMsg.append("发票号码:"+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 {
//查询票池
QueryWrapper<TDxInvoiceReimburse> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("uuid",uuid);
TDxInvoiceReimburse tDxInvoiceReimburse = tDxInvoiceReimburseService.getBaseMapper().selectOne(queryWrapper);
if(tDxInvoiceReimburseService==null){
errorMsg.append("发票号码"+zdata1.getZFPHM());
}
}
}
if(errorMsg.length()>1){
es.setZMESSAGE(errorMsg.toString()+"不存在");
@ -352,8 +376,42 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
boolean flag = false;
String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
if(recordInvoiceByUuid!=null){
if(fplxList.contains(zdata1.getZFPLX())){
TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
if(recordInvoiceByUuid!=null){
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.eq("uuid",uuid);
//会计凭证号
updateWrapper.set("snvoucher_number",zdata1.getBELNR());
//凭证过账日期
updateWrapper.set("posting_time",zdata1.getBUDAT());
//账期
updateWrapper.set("account_period",zdata1.getBUDAT());
updateWrapper.set("bzdh",zdata1.getZBZDH());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
int update = tDxrecordInvoiceDao.update(null, updateWrapper);
if(update>0){
DynamicContextHolder.push(DbConstant.BASICS_READ);
SysDeptEntity org = sysDeptDao.getOrg(recordInvoiceByUuid.getGfTaxNo());
zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
//如果设置的自动认证走申请认证逻辑
if(org!=null && "1".equals(org.getAutoRz()) && ("01".equals(zdata1.getZFPLX()) || "03".equals(zdata1.getZFPLX())
|| "08".equals(zdata1.getZFPLX()) || "14".equals(zdata1.getZFPLX())
|| "31".equals(zdata1.getZFPLX())) && StringUtils.isNotBlank(zdata1.getBUDAT())){
if(!"4".equals(recordInvoiceByUuid.getAuthStatus()) && !"3".equals(recordInvoiceByUuid.getAuthStatus())
&& !"2".equals(recordInvoiceByUuid.getAuthStatus())){
Map<String,Object> authState = new HashMap<>();
authState.put("rz_user",zdata1.getZJBRT());
authState.put("applyTaxPeriod",zdata1.getBUDAT().substring(0,7).replace("-",""));
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
tDxrecordInvoiceDao.updateRz(authState,"1","1",recordInvoiceByUuid.getUuid());
}
}
}else {
flag=true;
}
}
}else {
UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.eq("uuid",uuid);
//会计凭证号
@ -362,29 +420,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("posting_time",zdata1.getBUDAT());
//账期
updateWrapper.set("account_period",zdata1.getBUDAT());
updateWrapper.set("bzdh",zdata1.getZBZDH());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
int update = tDxrecordInvoiceDao.update(null, updateWrapper);
if(update>0){
DynamicContextHolder.push(DbConstant.BASICS_READ);
SysDeptEntity org = sysDeptDao.getOrg(recordInvoiceByUuid.getGfTaxNo());
zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
//如果设置的自动认证走申请认证逻辑
if(org!=null && "1".equals(org.getAutoRz()) && ("01".equals(zdata1.getZFPLX()) || "03".equals(zdata1.getZFPLX())
|| "08".equals(zdata1.getZFPLX()) || "14".equals(zdata1.getZFPLX())
|| "31".equals(zdata1.getZFPLX())) && StringUtils.isNotBlank(zdata1.getBUDAT())){
if(!"4".equals(recordInvoiceByUuid.getAuthStatus()) && !"3".equals(recordInvoiceByUuid.getAuthStatus())
&& !"2".equals(recordInvoiceByUuid.getAuthStatus())){
Map<String,Object> authState = new HashMap<>();
authState.put("rz_user",zdata1.getZJBRT());
authState.put("applyTaxPeriod",zdata1.getBUDAT().substring(0,7).replace("-",""));
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
tDxrecordInvoiceDao.updateRz(authState,"1","1",recordInvoiceByUuid.getUuid());
}
}
}else {
flag=true;
}
tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
}
if(!flag){
promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功! ");
}

20
dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java
Unescape View File

@ -2,6 +2,7 @@ package com.dxhy.extend.controller;
import cn.hutool.http.HttpRequest;
import cn.hutool.json.JSONUtil;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.http.HttpUtils;
import com.dxhy.common.constant.CommonConstants;
@ -16,9 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.*;
/**
* @Author wangzhikun
@ -42,9 +41,12 @@ public class VouncherSyncController {
String startTime= map.get("startTime");
//结束日期
String month=map.get("endTime");
//GJAHR nian
String gjahr=map.get("gjahr");
SNSAPObject object = new SNSAPObject();
object.setSYSID("FPXT");
object.setIFYWID("FI845");
object.setIFYWID("FI842");
object.setBSKEY(UUID.randomUUID().toString().replace("-", ""));
//object.setSAPKEY("");
@ -54,12 +56,13 @@ public class VouncherSyncController {
// object.setZFILED4("");
object.setZFILED5("200");
Map<String,String> requestMap = new HashMap<>();
List<Object> list = new ArrayList<>();
requestMap.put("ZGSDM",companyCode);
requestMap.put("GJAHR","");
requestMap.put("GJAHR",gjahr);
requestMap.put("MONAT",month);
requestMap.put("ZDATEF",startTime);
requestMap.put("ZFLAG",ifAll);
object.setZDATA(requestMap);
object.setZDATA(JSONObject.toJSONString(requestMap));
JSONObject request = new JSONObject();
request.put("IS_INPUT",object);
try{
@ -91,14 +94,15 @@ public class VouncherSyncController {
// object.setZFILED2("");
// object.setZFILED3("");
// object.setZFILED4("");
object.setZFILED5("200");
Map<String,String> requestMap = new HashMap<>();
requestMap.put("ZGSDM","123");
requestMap.put("GJAHR","");
requestMap.put("MONAT","");
requestMap.put("ZDATEF","2023");
requestMap.put("ZFLAG","X");
object.setZDATA(requestMap);
object.setZDATA(JSONObject.toJSONString(requestMap));
object.setZFILED5("200");
JSONObject request = new JSONObject();
request.put("IS_INPUT",object);
System.out.println(JSONObject.toJSONString(request));

2
dxhy-extend/src/main/java/com/dxhy/extend/model/SNSAPObject.java
Unescape View File

@ -1,9 +1,11 @@
package com.dxhy.extend.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.annotation.JSONType;
import lombok.Data;
@Data
@JSONType(orders = {"SYSID","IFYWID","BSKEY","SAPKEY","ZORG","ZFILED1","ZFILED2","ZFILED3","ZFILED4","ZFILED5","ZDATA"})
public class SNSAPObject {
/**

2
dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/VouncherSyncServiceImpl.java
Unescape View File

@ -27,7 +27,7 @@ public class VouncherSyncServiceImpl implements VouncherSyncService {
log.info("请求同步凭证号数据{}",request);
HttpRequest httpRequest = new HttpRequest(url);
httpRequest.basicAuth(userName,password);
String body = httpRequest.body(request).timeout(300000).execute().body();
String body = httpRequest.body(request).timeout(300000).header("Content-Type","application/json").execute().body();
long endTime = System.currentTimeMillis();
log.debug("以字符串调用post请求url:{},耗时:{},返回参数{}", url, endTime - startTime,body);
return body;

Write Preview
Loading…
Cancel
Save