kaifabu/ZQC
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
RuicyWu
2025-12-16 08:47:51 +08:00
parent bedffac4a6
commit a1c78c5fba
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps-customize/src/main/java/com/seeyon/apps/u8c/aop/FormDataSaveAop.java
View File

@@ -287,14 +287,19 @@ public class FormDataSaveAop {
if(viewItemKey.equals("收款单位编号")) { if(viewItemKey.equals("收款单位编号")) {
u8CYfDanParentVo.setHbbm(value); u8CYfDanParentVo.setHbbm(value);
} }
if(viewItemKey.equals("发票金额")) {
u8CYfChildren.setDfbbje(value);
u8CYfChildren.setDfybje(value);
}
if(viewItemKey.equals("税率")) { if(viewItemKey.equals("税率")) {
u8CYfDanParentVo.setHbbm(value); String sl = value;
u8CYfChildren.setSl(Double.valueOf((Double.parseDouble(sl) * 100) + "").intValue() + "");
} }
if(viewItemKey.equals("税额")) { if(viewItemKey.equals("税额")) {
u8CYfDanParentVo.setHbbm(value); u8CYfChildren.setDfybsj(value);
} }
if(viewItemKey.equals("无税金额")) { if(viewItemKey.equals("无税金额")) {
u8CYfDanParentVo.setHbbm(value); u8CYfChildren.setDfybwsje(value);
} }
} }
} }

39
apps-customize/src/main/java/com/seeyon/apps/u8c/node/U8CFkdSaveAuditNode.java
View File

@@ -49,13 +49,14 @@ public class U8CFkdSaveAuditNode extends U8CCommonNode{
billVo.setParentvo(parentVo); billVo.setParentvo(parentVo);
billVo.setChildren(childrenList); billVo.setChildren(childrenList);
parentVo.setDjbh(getStringValue(formDataVo,"单据编号")); parentVo.setDjbh(getStringValue(formDataVo,"单据编号"));
parentVo.setDjrq(getStringValue(formDataVo,"填报日期")); parentVo.setDjrq(getStringValue(formDataVo,"支付日期"));
parentVo.setShrq(getStringValue(formDataVo,"填报日期")); parentVo.setShrq(getStringValue(formDataVo,"支付日期"));
ColSummary colSummary = formDataVo.getColSummary(); ColSummary colSummary = formDataVo.getColSummary();
String subject = colSummary.getSubject(); String subject = colSummary.getSubject();
Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员")); Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员"));
V3xOrgMember member = orgManager.getMemberById(ksOaId); V3xOrgMember member = orgManager.getMemberById(ksOaId);
U8CFkdSaveAuditChildren u8CFkdSaveAuditChildren = new U8CFkdSaveAuditChildren(); U8CFkdSaveAuditChildren u8CFkdSaveAuditChildren = new U8CFkdSaveAuditChildren();
parentVo.setBfyhzh(getStringValue(formDataVo,"支付银行账号"));
if(!subject.contains("付款申请")){ if(!subject.contains("付款申请")){
parentVo.setHbbm(getKsCode(member.getName())); parentVo.setHbbm(getKsCode(member.getName()));
u8CFkdSaveAuditChildren.setZy(getStringValue(formDataVo, "借支说明")); u8CFkdSaveAuditChildren.setZy(getStringValue(formDataVo, "借支说明"));
@@ -69,7 +70,7 @@ public class U8CFkdSaveAuditNode extends U8CCommonNode{
parentVo.setSzxmid(EnumMapUtils.getEnumItemCode(getDbValue(formDataVo,"借支类型"))); parentVo.setSzxmid(EnumMapUtils.getEnumItemCode(getDbValue(formDataVo,"借支类型")));
} }
U8cParamsPreHandler.preHandleJzFkdBillVoParentvo(parentVo); U8cParamsPreHandler.preHandleJzFkdBillVoParentvo(parentVo);
parentVo.setBfyhzh(getStringValue(formDataVo,"支付银行账号"));
}else { }else {
parentVo.setHbbm(getStringValue(formDataVo,"收款单位编号")); parentVo.setHbbm(getStringValue(formDataVo,"收款单位编号"));
u8CFkdSaveAuditChildren.setZy(getStringValue(formDataVo, "付款说明")); u8CFkdSaveAuditChildren.setZy(getStringValue(formDataVo, "付款说明"));
@@ -103,7 +104,7 @@ public class U8CFkdSaveAuditNode extends U8CCommonNode{
} }
try { try {
String isReceivedInvoice = getStringValue(formDataVo, "是否到票"); String isReceivedInvoice = getStringValue(formDataVo, "是否到票");
if("已到票".equals(isReceivedInvoice)) { if("已到票".equals(isReceivedInvoice) || "无需到票".equals(isReceivedInvoice)) {
return true; return true;
} }
} catch (Exception e) { } catch (Exception e) {
@@ -114,20 +115,7 @@ public class U8CFkdSaveAuditNode extends U8CCommonNode{
@Override @Override
public boolean preCheck(FormDataVo formDataVo) throws NoSuchFieldException { public boolean preCheck(FormDataVo formDataVo) throws NoSuchFieldException {
ColSummary colSummary = formDataVo.getColSummary(); return false;
String subject = colSummary.getSubject();
if(!subject.contains("付款申请")) {
return false;
}
try {
String isReceivedInvoice = getStringValue(formDataVo, "是否到票");
if("无需到票".equals(isReceivedInvoice)) {
return true;
}
} catch (Exception e) {
}
return false;
} }
@Override @Override
@@ -148,16 +136,23 @@ public class U8CFkdSaveAuditNode extends U8CCommonNode{
billVo.setChildren(u8CYfChildrenList); billVo.setChildren(u8CYfChildrenList);
billVo.setParentvo(u8CYfDanParentVo); billVo.setParentvo(u8CYfDanParentVo);
u8CYfDanParentVo.setDjbh(getStringValue(formDataVo, "单据编号") + "YFD"); u8CYfDanParentVo.setDjbh(getStringValue(formDataVo, "单据编号") + "YFD");
u8CYfDanParentVo.setDjrq(getStringValue(formDataVo, "填报日期")); u8CYfDanParentVo.setDjrq(getStringValue(formDataVo,"支付日期"));
u8CYfDanParentVo.setShrq(getStringValue(formDataVo, "填报日期")); u8CYfDanParentVo.setShrq(getStringValue(formDataVo,"支付日期"));
u8CYfDanParentVo.setHbbm(getStringValue(formDataVo, "收款单位编号")); u8CYfDanParentVo.setHbbm(getStringValue(formDataVo, "收款单位编号"));
U8cParamsPreHandler.preHandleYfdBillVoParentvo(u8CYfDanParentVo); U8cParamsPreHandler.preHandleYfdBillVoParentvo(u8CYfDanParentVo);
U8CYfChildren u8CYfChildren = new U8CYfChildren(); U8CYfChildren u8CYfChildren = new U8CYfChildren();
u8CYfChildren.setZy(getStringValue(formDataVo, "付款说明")); u8CYfChildren.setZy(getStringValue(formDataVo, "付款说明"));
u8CYfChildren.setSzxmid(EnumMapUtils.getEnumItemCode(getDbValue(formDataVo,"费用类型"))); u8CYfChildren.setSzxmid(EnumMapUtils.getEnumItemCode(getDbValue(formDataVo,"费用类型")));
u8CYfChildren.setJobid(getStringValue(formDataVo, "项目编号")); u8CYfChildren.setJobid(getStringValue(formDataVo, "项目编号"));
u8CYfChildren.setDfbbje(getStringValue(formDataVo, "发票金额")); String isReceivedInvoice = getStringValue(formDataVo, "是否到票");
u8CYfChildren.setDfybje(getStringValue(formDataVo, "发票金额")); String dfybje = null;
if("已到票".equals(isReceivedInvoice)) {
dfybje = getStringValue(formDataVo, "发票金额");
}else if("无需到票".equals(isReceivedInvoice)) {
dfybje = getStringValue(formDataVo, "支付金额");
}
u8CYfChildren.setDfbbje(dfybje);
u8CYfChildren.setDfybje(dfybje);
String sl = getStringValue(formDataVo,"税率"); String sl = getStringValue(formDataVo,"税率");
if(sl != null) { if(sl != null) {
u8CYfChildren.setSl(Double.valueOf((Double.parseDouble(sl) * 100) + "").intValue() + ""); u8CYfChildren.setSl(Double.valueOf((Double.parseDouble(sl) * 100) + "").intValue() + "");

4
apps-customize/src/main/java/com/seeyon/apps/u8c/node/U8CSkdSaveAuditAddNode.java
View File

@@ -32,8 +32,8 @@ public class U8CSkdSaveAuditAddNode extends U8CCommonNode{
billVoList.add(billVo); billVoList.add(billVo);
U8CSkdParentVo parentVo = new U8CSkdParentVo(); U8CSkdParentVo parentVo = new U8CSkdParentVo();
parentVo.setDjbh(getStringValue(formDataVo,"单据编号")); parentVo.setDjbh(getStringValue(formDataVo,"单据编号"));
parentVo.setDjrq(getStringValue(formDataVo,"填报日期")); parentVo.setDjrq(getStringValue(formDataVo,"收款日期"));
parentVo.setShrq(getStringValue(formDataVo,"填报日期")); parentVo.setShrq(getStringValue(formDataVo,"收款日期"));
U8cParamsPreHandler.preHandleSkdBillVoParentvo(parentVo); U8cParamsPreHandler.preHandleSkdBillVoParentvo(parentVo);
List<U8CSkdChildren> childrenList = new ArrayList<>(); List<U8CSkdChildren> childrenList = new ArrayList<>();
billVo.setChildren(childrenList); billVo.setChildren(childrenList);

8
apps-customize/src/main/java/com/seeyon/apps/u8c/node/U8CYfDanSaveAuditNode.java
View File

@@ -49,8 +49,8 @@ public class U8CYfDanSaveAuditNode extends U8CCommonNode{
billVo.setChildren(u8CYfChildrenList); billVo.setChildren(u8CYfChildrenList);
billVo.setParentvo(u8CYfDanParentVo); billVo.setParentvo(u8CYfDanParentVo);
u8CYfDanParentVo.setDjbh(getStringValue(formDataVo, "单据编号")); u8CYfDanParentVo.setDjbh(getStringValue(formDataVo, "单据编号"));
u8CYfDanParentVo.setDjrq(getStringValue(formDataVo, "填报日期")); u8CYfDanParentVo.setDjrq(getStringValue(formDataVo, "支付日期"));
u8CYfDanParentVo.setShrq(getStringValue(formDataVo, "填报日期")); u8CYfDanParentVo.setShrq(getStringValue(formDataVo, "支付日期"));
Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员")); Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员"));
V3xOrgMember member = orgManager.getMemberById(ksOaId); V3xOrgMember member = orgManager.getMemberById(ksOaId);
if(member != null) { if(member != null) {
@@ -117,8 +117,8 @@ public class U8CYfDanSaveAuditNode extends U8CCommonNode{
billVo.setParentvo(parentVo); billVo.setParentvo(parentVo);
billVo.setChildren(childrenList); billVo.setChildren(childrenList);
parentVo.setDjbh(getStringValue(formDataVo,"单据编号") + "FKD"); parentVo.setDjbh(getStringValue(formDataVo,"单据编号") + "FKD");
parentVo.setDjrq(getStringValue(formDataVo,"填报日期")); parentVo.setDjrq(getStringValue(formDataVo,"支付日期"));
parentVo.setShrq(getStringValue(formDataVo,"填报日期")); parentVo.setShrq(getStringValue(formDataVo,"支付日期"));
Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员")); Long ksOaId = Long.valueOf(getDbValue(formDataVo, "填报人员"));
V3xOrgMember member = orgManager.getMemberById(ksOaId); V3xOrgMember member = orgManager.getMemberById(ksOaId);
if(member != null) { if(member != null) {

4
apps-customize/src/main/java/com/seeyon/apps/u8c/node/U8CYsDanSaveAuditNode.java
View File

@@ -28,11 +28,11 @@ public class U8CYsDanSaveAuditNode extends U8CCommonNode{
ArapBillVoChildren children = new ArapBillVoChildren(); ArapBillVoChildren children = new ArapBillVoChildren();
ArapBillVoParentvo parentvo = new ArapBillVoParentvo(); ArapBillVoParentvo parentvo = new ArapBillVoParentvo();
parentvo.setDjbh(getStringValue(formDataVo, "单据编号")); parentvo.setDjbh(getStringValue(formDataVo, "单据编号"));
parentvo.setDjrq(getStringValue(formDataVo, "填报日期")); parentvo.setDjrq(getStringValue(formDataVo, "开票日期"));
parentvo.setHbbm(getStringValue(formDataVo, "甲方单位编号")); parentvo.setHbbm(getStringValue(formDataVo, "甲方单位编号"));
parentvo.setVeinvnumber(getStringValue(formDataVo, "发票号码")); parentvo.setVeinvnumber(getStringValue(formDataVo, "发票号码"));
parentvo.setSzxmid("15008"); parentvo.setSzxmid("15008");
parentvo.setShrq(getStringValue(formDataVo, "填报日期")); parentvo.setShrq(getStringValue(formDataVo, "开票日期"));
children.setZy(getStringValue(formDataVo, "开票申请说明")); children.setZy(getStringValue(formDataVo, "开票申请说明"));
children.setJobid(getStringValue(formDataVo, "项目编号")); children.setJobid(getStringValue(formDataVo, "项目编号"));
children.setJfybje(getStringValue(formDataVo,"本次开票金额含税")); children.setJfybje(getStringValue(formDataVo,"本次开票金额含税"));

6
apps-customize/src/main/java/com/seeyon/apps/u8c/po/U8cParamsPreHandler.java
View File

@@ -87,7 +87,7 @@ public class U8cParamsPreHandler {
u8CYfDanParentVo.setDjlxbm("D1"); u8CYfDanParentVo.setDjlxbm("D1");
u8CYfDanParentVo.setDwbm("10"); u8CYfDanParentVo.setDwbm("10");
u8CYfDanParentVo.setPj_jsfs("20"); u8CYfDanParentVo.setPj_jsfs("20");
u8CYfDanParentVo.setWldx("0"); u8CYfDanParentVo.setWldx("1");
u8CYfDanParentVo.setBzbm("CNY"); u8CYfDanParentVo.setBzbm("CNY");
u8CYfDanParentVo.setLrr("13997704117"); u8CYfDanParentVo.setLrr("13997704117");
u8CYfDanParentVo.setShr("13986834633"); u8CYfDanParentVo.setShr("13986834633");
@@ -97,7 +97,7 @@ public class U8cParamsPreHandler {
u8CFkdSaveAuditParentVo.setDjlxbm("D3"); u8CFkdSaveAuditParentVo.setDjlxbm("D3");
u8CFkdSaveAuditParentVo.setDwbm("10"); u8CFkdSaveAuditParentVo.setDwbm("10");
u8CFkdSaveAuditParentVo.setPj_jsfs("20"); u8CFkdSaveAuditParentVo.setPj_jsfs("20");
u8CFkdSaveAuditParentVo.setWldx("0"); u8CFkdSaveAuditParentVo.setWldx("1");
u8CFkdSaveAuditParentVo.setBzbm("CNY"); u8CFkdSaveAuditParentVo.setBzbm("CNY");
u8CFkdSaveAuditParentVo.setLrr("18995908579"); u8CFkdSaveAuditParentVo.setLrr("18995908579");
u8CFkdSaveAuditParentVo.setShr("13997704117"); u8CFkdSaveAuditParentVo.setShr("13997704117");
@@ -107,7 +107,7 @@ public class U8cParamsPreHandler {
u8CFkdSaveAuditParentVo.setDjlxbm("D2"); u8CFkdSaveAuditParentVo.setDjlxbm("D2");
u8CFkdSaveAuditParentVo.setDwbm("10"); u8CFkdSaveAuditParentVo.setDwbm("10");
u8CFkdSaveAuditParentVo.setPj_jsfs("20"); u8CFkdSaveAuditParentVo.setPj_jsfs("20");
u8CFkdSaveAuditParentVo.setWldx("0"); u8CFkdSaveAuditParentVo.setWldx("1");
u8CFkdSaveAuditParentVo.setBzbm("CNY"); u8CFkdSaveAuditParentVo.setBzbm("CNY");
u8CFkdSaveAuditParentVo.setLrr("18995908579"); u8CFkdSaveAuditParentVo.setLrr("18995908579");
u8CFkdSaveAuditParentVo.setShr("13997704117"); u8CFkdSaveAuditParentVo.setShr("13997704117");