diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/INingboBankPluginService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/INingboBankPluginService.java index a60a7302..e50b56af 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/INingboBankPluginService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/INingboBankPluginService.java @@ -2,6 +2,7 @@ package com.hzya.frame.plugin.a8bill.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.ningboBankTreasury.dto.res.AccTransactionRes; +import com.hzya.frame.plugin.a8bill.entity.PayBillEntity; import java.util.HashMap; import java.util.List; @@ -44,6 +45,7 @@ public interface INingboBankPluginService { */ void queryResult(List> hashMaps,String apiCode); + void updateyhzhdataTransactional(PayBillEntity updateyhzh); /** * 查询OA附件,并上传到宁波银行 * @param oaId oa主键id diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java index d8015f18..ec471059 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/NingboBankPluginServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.map.MapBuilder; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.ningboBankTreasury.dto.req.SingleTransferReq; import com.hzya.frame.ningboBankTreasury.dto.req.TTRemitReq; @@ -30,6 +29,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; @@ -417,8 +418,8 @@ private IFormmain0044Service formmain0044Service; logger.info("执行U8C付款单审批接口修改账号,查询到账号,修改数据。银行账号:"+yhzh+"。账号id:"+updateyhzh.getBankaccbas()+",账号名称:"+updateyhzh.getAccountname()+",单据号:"+billCode); updateyhzh.setDataSourceCode(u8cCode); updateyhzh.setBillCode(billCode); - payBillDao.updateYhzh(updateyhzh); - Thread.sleep(10000); + updateyhzhdataTransactional(updateyhzh); + //Thread.sleep(10000); }else { 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){ if ("3".equals(state)){ diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java index ac5d7de5..8ea6881b 100644 --- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java +++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java @@ -133,26 +133,28 @@ public class EncapsulationImpl extends BaseService encapsulationEntity.setDataSourceCode(jsonObject.getString("dataSourceCode")); encapsulationEntity.setType("21"); List encapsulationEntities = encapsulationDao.queryCgrkddh(encapsulationEntity); - if(encapsulationEntities == null || encapsulationEntities.size() != 1){ + if(encapsulationEntities != null && encapsulationEntities.size() > 1){ returnObject.put("status", "falied"); returnObject.put("errormsg", "查到采购入库单错误"); return returnObject; } - //执行库存采购入库单取消签字接口 - 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); - if (!cgrkdqxqzflag.getBoolean("flag")) { - returnObject.put("status", "falied"); - 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); - if (!cgrkdscfiag.getBoolean("flag")) { - returnObject.put("status", "falied"); - returnObject.put("errormsg", "采购入库单删除失败:"+cgrkdscfiag.getString("msg")); - 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); + if (!cgrkdqxqzflag.getBoolean("flag")) { + returnObject.put("status", "falied"); + 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); + if (!cgrkdscfiag.getBoolean("flag")) { + returnObject.put("status", "falied"); + returnObject.put("errormsg", "采购入库单删除失败:"+cgrkdscfiag.getString("msg")); + return returnObject; + } } //执行采购订单弃审 String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));