Compare commits

..

No commits in common. "db37e17d50e2840ac35f0cb17b49fee542cb7872" and "0af8d62b71fd7675ba2bf9d7bfa2e98223c0daa0" have entirely different histories.

13 changed files with 14 additions and 27 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,9 +0,0 @@

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

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
#Thu May 16 15:42:59 CST 2024
#Mon May 06 10:17:01 CST 2024
COSMIC_HOME=D\:/comic/cxkg
MCServerURL=http\://10.157.226.17\:8090/appstore/dev_env/

View File

@ -24,12 +24,13 @@ 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() {
@ -117,7 +118,7 @@ public class CommonAmountCheckCondition {
}
public static Function<DynamicObject, String> payOrNotAmtValidator() {
return (dataEntity) -> {
return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> {
String entityName = dataEntity.getDataEntityType().getName();
BillHeadFields billHeadInstance = FieldNameHelper.getBillHeadInstance(entityName);
if (ErEntityTypeUtils.isApplyPayBill(entityName)) {
@ -151,11 +152,11 @@ public class CommonAmountCheckCondition {
return null;
}
};
} : null;
}
public static Function<DynamicObject, String> sumOfEntryAndHeadAmtValidator() {
return (dataEntity) -> {
return !IscHelper.isIntegratedWithEAS() && !IscHelper.isIntegratedWithXK() ? (dataEntity) -> {
IBillAmountService service = BillAmountServiceFacade.getService(dataEntity.getDataEntityType().getName());
if (service != null) {
DataEntityPropertyCollection properties = dataEntity.getDataEntityType().getProperties();
@ -177,7 +178,7 @@ public class CommonAmountCheckCondition {
}
return null;
};
} : null;
}
public static Function<DynamicObject, String> reCalcEntryCurApproveAmtValidator() {

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+"&closeType=closeWin");
requestBody.put("pcurl", url);
requestBody.put("appurl", url != null ? getAppurl(url) : null);
requestBody.put("isremark", String.valueOf(tasktype));
requestBody.put("viewtype", "1");

View File

@ -48,11 +48,6 @@ 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();