hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、采购订单删除接口如果有入库单，就取消签字，再删除，没有入库单的时候就 只删除订单 2、付款单更新银行卡号新开事务

This commit is contained in:
lvleigang 2025-03-17 11:03:12 +08:00
parent 512e45477d
commit 798919af27
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/INingboBankPluginService.java
View File

@ -2,6 +2,7 @@ package com.hzya.frame.plugin.a8bill.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.ningboBankTreasury.dto.res.AccTransactionRes; import com.hzya.frame.ningboBankTreasury.dto.res.AccTransactionRes;
import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -44,6 +45,7 @@ public interface INingboBankPluginService {
*/ */
void queryResult(List<HashMap<String, Object>> hashMaps,String apiCode); void queryResult(List<HashMap<String, Object>> hashMaps,String apiCode);
void updateyhzhdataTransactional(PayBillEntity updateyhzh);
/** /**
* 查询OA附件，并上传到宁波银行 * 查询OA附件，并上传到宁波银行
* @param oaId oa主键id * @param oaId oa主键id

12
buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java
View File

@ -6,7 +6,6 @@ import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.ningboBankTreasury.dto.req.SingleTransferReq; import com.hzya.frame.ningboBankTreasury.dto.req.SingleTransferReq;
import com.hzya.frame.ningboBankTreasury.dto.req.TTRemitReq; import com.hzya.frame.ningboBankTreasury.dto.req.TTRemitReq;
@ -30,6 +29,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
@ -417,8 +418,8 @@ private IFormmain0044Service formmain0044Service;
logger.info("执行U8C付款单审批接口修改账号,查询到账号，修改数据。银行账号："+yhzh+"。账号id："+updateyhzh.getBankaccbas()+",账号名称:"+updateyhzh.getAccountname()+",单据号:"+billCode); logger.info("执行U8C付款单审批接口修改账号,查询到账号，修改数据。银行账号："+yhzh+"。账号id："+updateyhzh.getBankaccbas()+",账号名称:"+updateyhzh.getAccountname()+",单据号:"+billCode);
updateyhzh.setDataSourceCode(u8cCode); updateyhzh.setDataSourceCode(u8cCode);
updateyhzh.setBillCode(billCode); updateyhzh.setBillCode(billCode);
payBillDao.updateYhzh(updateyhzh); updateyhzhdataTransactional(updateyhzh);
Thread.sleep(10000); //Thread.sleep(10000);
}else { }else {
logger.info("执行U8C付款单审批接口修改账号,未查询到账号"); logger.info("执行U8C付款单审批接口修改账号,未查询到账号");
} }
@ -462,6 +463,11 @@ private IFormmain0044Service formmain0044Service;
} }
} }
} }
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void updateyhzhdataTransactional(PayBillEntity updateyhzh) {
payBillDao.updateYhzh(updateyhzh);
}
//审批状态对应的中文 //审批状态对应的中文
private String getStateName(String state){ private String getStateName(String state){
if ("3".equals(state)){ if ("3".equals(state)){

34
service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
View File

@ -133,26 +133,28 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
encapsulationEntity.setDataSourceCode(jsonObject.getString("dataSourceCode")); encapsulationEntity.setDataSourceCode(jsonObject.getString("dataSourceCode"));
encapsulationEntity.setType("21"); encapsulationEntity.setType("21");
List<EncapsulationEntity> encapsulationEntities = encapsulationDao.queryCgrkddh(encapsulationEntity); List<EncapsulationEntity> encapsulationEntities = encapsulationDao.queryCgrkddh(encapsulationEntity);
if(encapsulationEntities == null || encapsulationEntities.size() != 1){ if(encapsulationEntities != null && encapsulationEntities.size() > 1){
returnObject.put("status", "falied"); returnObject.put("status", "falied");
returnObject.put("errormsg", "查到采购入库单错误"); returnObject.put("errormsg", "查到采购入库单错误");
return returnObject; return returnObject;
} }
//执行库存采购入库单取消签字接口 if(encapsulationEntities != null && encapsulationEntities.size() == 1){
String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode()); //执行库存采购入库单取消签字接口
JSONObject cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(0,6), cgrkdqxqz); String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode());
if (!cgrkdqxqzflag.getBoolean("flag")) { JSONObject cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(0,6), cgrkdqxqz);
returnObject.put("status", "falied"); if (!cgrkdqxqzflag.getBoolean("flag")) {
returnObject.put("errormsg", "采购入库单取消签字失败："+cgrkdqxqzflag.getString("msg")); returnObject.put("status", "falied");
return returnObject; returnObject.put("errormsg", "采购入库单取消签字失败："+cgrkdqxqzflag.getString("msg"));
} return returnObject;
//执行库存采购入库单删除 }
String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode()); //执行库存采购入库单删除
JSONObject cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(0,6), cgrkdsc); String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode());
if (!cgrkdscfiag.getBoolean("flag")) { JSONObject cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(0,6), cgrkdsc);
returnObject.put("status", "falied"); if (!cgrkdscfiag.getBoolean("flag")) {
returnObject.put("errormsg", "采购入库单删除失败："+cgrkdscfiag.getString("msg")); returnObject.put("status", "falied");
return returnObject; returnObject.put("errormsg", "采购入库单删除失败："+cgrkdscfiag.getString("msg"));
return returnObject;
}
} }
//执行采购订单弃审 //执行采购订单弃审
String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp")); String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));