diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssetsLiabilitiesbalanceAutoData.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssetsLiabilitiesbalanceAutoData.java index c2d48bb..be43c5e 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssetsLiabilitiesbalanceAutoData.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/AssetsLiabilitiesbalanceAutoData.java @@ -21,11 +21,11 @@ import java.lang.reflect.Type; import java.util.*; /** - * 科目余额取数表 - 资产负债，客户0001、供应商0005、银行账户0003 + * 科目余额取数表 - 资产负债，客户0001、供应商0005、银行账户0003、收入类项目 0010 */ public class AssetsLiabilitiesbalanceAutoData { - private static final String[] asseestypeArrays = new String[]{"0001","0005","0003"}; + private static final String[] asseestypeArrays = new String[]{"0001","0005","0003","0010",""}; public static void getData(Long periodId,boolean isAuto) { String[] selectorsArray = new String[]{"beginlocal", "endlocal", "yeardebitfor", "yearcreditfor", "debitlocal", "creditlocal"}; @@ -33,34 +33,6 @@ public class AssetsLiabilitiesbalanceAutoData { QFilter filteraccountTable = new QFilter("number", QCP.equals, "0003"); DynamicObject accountTableLoad = BusinessDataServiceHelper.loadSingle("bd_accounttable", "id", new QFilter[]{filteraccountTable}); - // 查询核算组织 - /*QFilter number = new QFilter("fisaccounting", "=", "1"); - QFilter structure = new QFilter("structure.longnumber", QCP.like, "10000000!10006431%"); - QFilter isleaf = new QFilter("structure.isleaf", QCP.equals, true); - DynamicObject[] load = BusinessDataServiceHelper.load("bos_org", "id,structure.longnumber,structure.view", new QFilter[]{number, structure, isleaf}); - List orgIds = new ArrayList<>(); - Map orgNumberMap = new HashMap<>(); - for (DynamicObject dynamicObject : load) { - orgNumberMap.put(dynamicObject.getString("number"), dynamicObject); - orgIds.add(dynamicObject.getLong("id")); - } - - DynamicObject[] costcompany = BusinessDataServiceHelper.load("zcgj_minecompany", "zcgj_costcompany", new QFilter[]{}); - if (costcompany != null) { - List ids = new ArrayList<>(); - for (DynamicObject dynamicObject : costcompany) { - DynamicObject minecompany = dynamicObject.getDynamicObject("zcgj_costcompany"); - long id = minecompany.getLong("id"); - ids.add(id); - } - QFilter idFilter = new QFilter("id", QCP.in, ids); - DynamicObject[] org = BusinessDataServiceHelper.load("bos_org", "id,structure.longnumber,structure.view", new QFilter[]{idFilter}); - for (DynamicObject dynamicObject : org) { - orgNumberMap.put(dynamicObject.getString("number"), dynamicObject); - orgIds.add(dynamicObject.getLong("id")); - } - }*/ - //通过配置表取公司 Map orgNumberMap = new HashMap<>(); List orgIds = new ArrayList<>(); diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/task/AssistbalanceTask.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/task/AssistbalanceTask.java index a20ad0b..c3c971c 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/task/AssistbalanceTask.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/task/AssistbalanceTask.java @@ -9,6 +9,7 @@ import kd.bos.schedule.executor.AbstractTask; import kd.bos.servicehelper.operation.OperationServiceHelper; import zcgj.zcdev.zcdev.fs.plugin.common.AssistbalanceAutoData; import zcgj.zcdev.zcdev.fs.plugin.common.SubjectbalanceAutoData; +import zcgj.zcdev.zcdev.fs.plugin.common.SuppliertbalanceAutoData; import java.util.Map; @@ -26,7 +27,15 @@ public class AssistbalanceTask extends AbstractTask { log.info("AssistbalanceTask,进入到后台任务中-结束"); log.info("SubjectbalanceTask,进入到后台任务中-开始"); - // SubjectbalanceAutoData.getData(); + //SubjectbalanceAutoData.getData();//工序 log.info("SubjectbalanceTask,进入到后台任务中-结束"); + + log.info("SuppliertbalanceAutoData,预付账款,进入到后台任务中-开始"); + //SuppliertbalanceAutoData.getData("YUFZK"); + log.info("SuppliertbalanceAutoData,预付账款,进入到后台任务中-结束"); + + log.info("SuppliertbalanceAutoData,应收账款,进入到后台任务中-开始"); + //SuppliertbalanceAutoData.getData("YIFZK"); + log.info("SuppliertbalanceAutoData,应收账款,进入到后台任务中-结束"); } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyListPlugin.java new file mode 100644 index 0000000..4abc391 --- /dev/null +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyListPlugin.java @@ -0,0 +1,28 @@ +package zcgj.zcdev.zcdev.pr.plugin.form; + +import kd.bos.bill.BillShowParameter; +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.form.ShowType; +import kd.bos.form.control.events.ItemClickEvent; +import kd.bos.form.events.SetFilterEvent; +import kd.bos.form.plugin.AbstractFormPlugin; +import kd.bos.list.plugin.AbstractListPlugin; +import kd.bos.orm.query.QCP; +import kd.bos.orm.query.QFilter; +import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.sdk.plugin.Plugin; + +import java.math.BigDecimal; +import java.util.EventObject; + +/** + *资金计划申请列表插件 + */ +public class FundingplanapplyListPlugin extends AbstractListPlugin implements Plugin { + + + @Override + public void setFilter(SetFilterEvent e) { + e.addCustomQFilter(new QFilter("zcgj_fin_approved_amount.zcgj_amountfield", ">", BigDecimal.ZERO)); + } +} diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java index a524577..fdc4cdd 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeInvoicePlugin.java @@ -8,6 +8,8 @@ import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.metadata.dynamicobject.DynamicObjectType; import kd.bos.dataentity.resource.ResManager; +import kd.bos.db.tx.TX; +import kd.bos.db.tx.TXHandle; import kd.bos.entity.datamodel.ListSelectedRow; import kd.bos.entity.datamodel.ListSelectedRowCollection; import kd.bos.entity.datamodel.events.ChangeData; @@ -378,6 +380,16 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i + "\"invoiceData\": " + invoiceDataBuilder + "}" + "}"; + if("1".equals(status)){ //删除发票绑定关系 + par = "{" + + " \"messageType\": \"billDel\"," + + " \"messageId\": \""+System.currentTimeMillis()+"\"," + + " \"data\": {" + + " \"billId\": \"" + pkValue + "\"," + + " \"resource\": \"4\"" + + " }" + + "}"; + } Gson gson = new Gson(); //String json = gson.toJson(balanceQueryParamApi); Map params = gson.fromJson(par, @@ -387,5 +399,29 @@ public class OutContractFinaceConfirmeInvoicePlugin extends AbstractBillPlugIn i log.info("OutContractFinaceConfirmeInvoicePlugin:发票绑定-"+balanceData.getMessage()); System.out.println(); + + /*try (TXHandle tx = TX.requiresNew("clearInvoice")) { + try{ + log.info("OutContractFinaceConfirmeInvoicePlugin:单据删除-"+pkValue); + String par ="{" + + " \"messageType\": \"billDel\"," + + " \"messageId\": \""+System.currentTimeMillis()+"\"," + + " \"data\": {" + + " \"billId\": \"" + pkValue + "\"," + + " \"resource\": \"4\"" + + " }" + + "}"; + Gson gson = new Gson(); + //String json = gson.toJson(balanceQueryParamApi); + Map params = gson.fromJson(par, + new TypeToken>() { + }.getType()); + OpenApiResult balanceData = OpenApiSdkUtil.invoke("/v2/rim/message/service", params); + log.info("OutContractFinaceConfirmeInvoicePlugin:单据删除-"+balanceData.getMessage()); + System.out.println(); + }catch (Exception ee){ + tx.markRollback(); + } + }*/ } } diff --git a/code/zcgj-cosmic-debug/src/main/java/kd/cosmic/debug/tools/CosmicLauncher.java b/code/zcgj-cosmic-debug/src/main/java/kd/cosmic/debug/tools/CosmicLauncher.java index 2b8d59d..32dd50b 100644 --- a/code/zcgj-cosmic-debug/src/main/java/kd/cosmic/debug/tools/CosmicLauncher.java +++ b/code/zcgj-cosmic-debug/src/main/java/kd/cosmic/debug/tools/CosmicLauncher.java @@ -43,7 +43,7 @@ public final class CosmicLauncher { */ private static final String DEFAULT_COSMIT_HOME_PATH = System.getProperty("user.home").replaceAll("\\\\", "/") + "/cosmic/home"; - private static final String PROJECT_HOME = "E:/code/zhongcai_dev"; + private static final String PROJECT_HOME = "E:/code/zcksdev"; private static final String LOCAL_IP = "127.0.0.1"; diff --git a/gradle.properties b/gradle.properties index e629a8c..fc84e38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,13 @@ ### If there are any issues during the use process, you can provide feedback to the kingdee developer community website. ### Website: https://developer.kingdee.com/developer?productLineId=29 ### Author: liebin.zheng -### Generate Date: 2025-02-21 09:31:59 +### Generate Date: 2025-08-12 18:26:20 ### ---------------------------- systemProp.kddt_version=2.2.0-Beta systemProp.template_type=app systemProp.groupId=zcgj.cosmic systemProp.artifactId=zcgj-cosmic -##systemProp.version=1.0.0 +# systemProp.version=1.0.0 systemProp.ci_version=2.0 systemProp.jdk.version=1.8 systemProp.new_cosmic_project=true @@ -18,7 +18,7 @@ systemProp.developer_flag=zcgj #--This is the project flag systemProp.project_flag=zcdev #--This is the project dir -systemProp.project_dir=E:/code/zhongcai_dev +systemProp.project_dir=E:/code/zcksdev #--This is the dir for cosmic project libs and static resouces systemProp.cosmic_home=D:/comsic/home #--Performance configuration for gradle build