wenyx
/
CXKG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同默认合同号，以及甲方和核算组织的联动关系

This commit is contained in:
“wyx12345678” 2024-05-31 17:18:59 +08:00
parent 1db49e5e80
commit 1ae5f3e079
13 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/7.5/checksums/checksums.lock
View File

Binary file not shown.

BIN
.gradle/7.5/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/7.5/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/7.5/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/7.5/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/7.5/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.gradle/file-system.probe
View File

Binary file not shown.

9
.idea/sonarlint/issuestore/index.pb
View File

@ -0,0 +1,9 @@
‰
Yshkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/DailyLoanBillFormPlugin.java,d\2\d2e9ae880051a1e90b9577794368f8674dfe1369
n
>shkd-cosmic-debug/src/main/java/shkd/plugin/SSOLoginPugin.java,8\7\87c0137d669220d572dfa58a8bd96ae32207854f
 
pshkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/opplugin/DailyLoanBillSubmitOrgAmountAvailableCheckPlugin.java,8\a\8ad0ccb2472fa5e2a84df1c5b90fdcb71836e0d4
ƒ
Sshkd-cosmic-debug/src/main/java/shkd/fi/fa/plugin/SaveFaAssetCardApiSavePlugin.java,9\6\96f34f4073b5179be3fdd14511bb570d2b5b909b

2
cosmic.properties
View File

@ -1,4 +1,4 @@
#\u8BE5\u8D44\u6E90\u5730\u5740\u63D0\u4F9B\u4E86\u82CD\u7A79\u73AF\u5883\u6240\u9700\u7684\u5F00\u53D1\u8D44\u6E90\u5305\uFF0C\u7528\u4E8E\u4E0B\u8F7D\u6216\u66F4\u65B0\u82CD\u7A79\u5F00\u53D1\u8D44\u6E90\u5305\u5230\u82CD\u7A79\u8D44\u6E90\u76EE\u5F55\u4E2D\u3002\u8BE5\u5730\u5740\u4E00\u822C\u7531\u82CD\u7A79MC\u670D\u52A1\u6216\u82CD\u7A79\u5F00\u53D1\u8005\u5DE5\u5177\u5BF9\u5916\u5F00\u653E\uFF0C\u5177\u4F53\u8D44\u6E90\u5305\u4E3A\uFF1Acosmic.zip\u3001webapp.zip\uFF0C\u5171\u7EA62G\u3002\u5730\u5740\u683C\u5F0F\u4E3A\uFF1Ahttp://\u82CD\u7A79MC\u670D\u52A1IP:\u7AEF\u53E3/appstore/dev_env\u6216http://\u82CD\u7A79\u5F00\u53D1\u8005\u5DE5\u5177\u670D\u52A1IP:268/studio/environment/download/{\u73AF\u5883\u5E8F\u53F7}\u3002
#Mon May 06 10:17:01 CST 2024
#Thu May 16 15:42:59 CST 2024
COSMIC_HOME=D\:/comic/cxkg
MCServerURL=http\://10.157.226.17\:8090/appstore/dev_env/

21
shkd-cosmic-debug/src/main/java/kd/fi/er/business/datacheck/validator/CommonAmountCheckCondition.java
View File

@ -24,13 +24,12 @@ import org.apache.commons.lang3.StringUtils;
public class CommonAmountCheckCondition {
private static Log logger = LogFactory.getLog(CommonAmountCheckCondition.class);
// public static final Function<DynamicObject, String> encashedAmtValidator = encashedAmtValidator();
// public static final Function<DynamicObject, String> reCalcEncashedAmtValidator = reCalcEncashedAmtValidator();
// public static final Function<DynamicObject, String> accountEntryAmtValidator = accountEntryAmtValidator();
// public static final Function<DynamicObject, String> sumOfEntryAndHeadAmtValidator = sumOfEntryAndHeadAmtValidator();
// public static final Function<DynamicObject, String> payOrNotAmtValidator = payOrNotAmtValidator();
// public static final Function<DynamicObject, String> reCalcEntryCurApproveAmtValidator = reCalcEntryCurApproveAmtValidator();
public static final Function<DynamicObject, String> encashedAmtValidator = encashedAmtValidator();
public static final Function<DynamicObject, String> reCalcEncashedAmtValidator = reCalcEncashedAmtValidator();
public static final Function<DynamicObject, String> accountEntryAmtValidator = accountEntryAmtValidator();
public static final Function<DynamicObject, String> sumOfEntryAndHeadAmtValidator = sumOfEntryAndHeadAmtValidator();
public static final Function<DynamicObject, String> payOrNotAmtValidator = payOrNotAmtValidator();
public static final Function<DynamicObject, String> reCalcEntryCurApproveAmtValidator = reCalcEntryCurApproveAmtValidator();
public CommonAmountCheckCondition() {
@ -118,7 +117,7 @@ public class CommonAmountCheckCondition {
}
public static Function<DynamicObject, String> payOrNotAmtValidator() {
return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> {
return (dataEntity) -> {
String entityName = dataEntity.getDataEntityType().getName();
BillHeadFields billHeadInstance = FieldNameHelper.getBillHeadInstance(entityName);
if (ErEntityTypeUtils.isApplyPayBill(entityName)) {
@ -152,11 +151,11 @@ public class CommonAmountCheckCondition {
return null;
}
} : null;
};
}
public static Function<DynamicObject, String> sumOfEntryAndHeadAmtValidator() {
return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> {
return (dataEntity) -> {
IBillAmountService service = BillAmountServiceFacade.getService(dataEntity.getDataEntityType().getName());
if (service != null) {
DataEntityPropertyCollection properties = dataEntity.getDataEntityType().getProperties();
@ -178,7 +177,7 @@ public class CommonAmountCheckCondition {
}
return null;
} : null;
};
}
public static Function<DynamicObject, String> reCalcEntryCurApproveAmtValidator() {

2
shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java
View File

@ -326,7 +326,7 @@ public class MessageListen extends AbstractMessageServiceHandler {
requestBody.put("requestname", "主题:"+title);
requestBody.put("workflowname", entityName + "审批流程");
requestBody.put("nodename", taskName);
requestBody.put("pcurl", url);
requestBody.put("pcurl", url+"&closeType=closeWin");
requestBody.put("appurl", url != null ? getAppurl(url) : null);
requestBody.put("isremark", String.valueOf(tasktype));
requestBody.put("viewtype", "1");

7
shkd-cosmic-debug/src/main/java/shkd/cosmic/debug/DebugApplication.java
View File

@ -13,7 +13,7 @@ import kd.bos.config.client.util.ConfigUtils;
/**
* 启动本地应用程序(微服务节点)
*/
public class DebugApplication {
public class DebugApplication {
@ -48,6 +48,11 @@ public class DebugApplication {
// System.setProperty("ISC_TEST_PASSWORD", "Cosmic@2023");
// System.setProperty("login.type", "STANDALONE");
// cosmic.set("attachmentServer.url", "https://fin-uat.elmleaf.com.cn/fileserver/");
// cosmic.set("imageServer.url", "https://fin-uat.elmleaf.com.cn/fileserver/");
// cosmic.set("fileserver", "https://fin-uat.elmleaf.com.cn/ierp/image/downloadImage.do?path=/");
// cosmic.set("tempfile.cachetype", "disk");
// cosmic.set("diskcache.path", "D:/tempfiles");
System.setProperty("appstarter.config","aqap=kd.ebg.aqap.mservice.boot.appstarter.EBGAppStarter,receipt=kd.ebg.receipt.mservice.boot.appstarter.EBGReceiptAppStarter,note=kd.ebg.note.mservice.boot.appstarter.EBGAppStarter");
cosmic.start();