From 798919af27fe648abdc7219c973935aaf8f31d7c Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Mon, 17 Mar 2025 11:03:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=A6=82=E6=9E=9C=E6=9C=89?=
=?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=EF=BC=8C=E5=B0=B1=E5=8F=96=E6=B6=88?=
=?UTF-8?q?=E7=AD=BE=E5=AD=97=EF=BC=8C=E5=86=8D=E5=88=A0=E9=99=A4=EF=BC=8C?=
=?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E6=97=B6?=
=?UTF-8?q?=E5=80=99=E5=B0=B1=20=E5=8F=AA=E5=88=A0=E9=99=A4=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=202=E3=80=81=E4=BB=98=E6=AC=BE=E5=8D=95=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=8F=B7=E6=96=B0=E5=BC=80?=
=?UTF-8?q?=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/INingboBankPluginService.java | 2 ++
.../impl/NingboBankPluginServiceImpl.java | 12 +++++--
.../service/impl/EncapsulationImpl.java | 34 ++++++++++---------
3 files changed, 29 insertions(+), 19 deletions(-)
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<HashMap<String, Object>> 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, String>
encapsulationEntity.setDataSourceCode(jsonObject.getString("dataSourceCode"));
encapsulationEntity.setType("21");
List<EncapsulationEntity> 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"));