Merge remote-tracking branch 'origin/master'

src/main/java/fi/ar/formplugin/AcctagerptPlugin.java

@@ -3,7 +3,11 @@ package fi.ar.formplugin;
 
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
+import kd.bos.entity.datamodel.events.ChangeData;
+import kd.bos.entity.datamodel.events.PropertyChangedArgs;
+import kd.bos.entity.report.ReportQueryParam;
 import kd.bos.form.FormShowParameter;
+import kd.bos.form.cardentry.CardEntry;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
@@ -32,9 +36,26 @@ public class AcctagerptPlugin extends AbstractReportFormPlugin implements Plugin
             Object qAsstacttype = formShowParameter.getCustomParam("q_asstacttype");
             if (!("").equals(qAsstacttype)) {
                 this.getModel().setValue("q_asstacttype",qAsstacttype);
+                this.getModel().setValue("standard","bizdate");
+
             }
         }
+    }
+
 
+
+    @Override
+    public void propertyChanged(PropertyChangedArgs e){
+        super.beforePropertyChanged(e);
+        String name=e.getProperty().getName();
+        if (name.equals("standard"))
+        {
+            ChangeData[] changeData = e.getChangeSet();
+            Object newValue = changeData[0].getNewValue();
+            Object oldValue = changeData[0].getOldValue();
+            String str= (String) this.getModel().getValue("standard");
+            System.out.println(str);
+        }
     }
 
     @Override

src/main/java/fi/ar/formplugin/EarlyWarnHandlerCusPlugin.java

@@ -0,0 +1,51 @@
+package fi.ar.formplugin;
+
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+import kd.bos.context.RequestContext;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.earlywarn.EarlyWarnContext;
+import kd.bos.entity.earlywarn.warn.EarlyWarnMessageInfo;
+import kd.bos.entity.earlywarn.warn.YzjPublicNumberInfo;
+import kd.bos.entity.earlywarn.warn.plugin.IEarlyWarnMessageHandler;
+import kd.bos.service.earlywarn.impl.DefaultWarnMessageHandler;
+import kd.bos.url.UrlService;
+
+import java.util.List;
+
+/**
+ * @author cjz
+ * @date 2024/10/28 16:57
+ * @description:预警自定义消息插件,设置跳转的报表url,往来类型为客户
+ */
+public class EarlyWarnHandlerCusPlugin implements IEarlyWarnMessageHandler{
+
+    private final Log logger= LogFactory.getLog(DefaultWarnMessageHandler.class);
+    private String clientPath="";//客户端地址
+    private String formId = "";//pc端表单标识
+
+
+    //单条消息跳转链接
+    @Override
+    public EarlyWarnMessageInfo singleMessageBuilder(DynamicObject dynamicObject, EarlyWarnContext earlyWarnContext) {
+       return null;
+    }
+
+
+    //合并消息跳转链接
+    @Override
+    public EarlyWarnMessageInfo mergeMessageBuilder(EarlyWarnContext earlyWarnContext) {
+        RequestContext ctx = RequestContext.get();
+        this.clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+        this.formId = earlyWarnContext.getEarlyWarn().getDataSourceId();//表单标识
+        EarlyWarnMessageInfo info = new EarlyWarnMessageInfo();
+        String contentUrl = clientPath+"?formId="+formId+"&flag=1"+"&asstacttype=bd_customer";//pc端跳转单据路径
+        info.setContentUrl(contentUrl);
+        return info;
+    }
+
+    @Override
+    public YzjPublicNumberInfo getYZJMessagePublicNumber(List<YzjPublicNumberInfo> publicNumberInfos) {
+        return IEarlyWarnMessageHandler.super.getYZJMessagePublicNumber(publicNumberInfos);
+    }
+}

src/main/java/fi/ar/formplugin/EarlyWarnHandlerPlugin.java

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * @author cjz
  * @date 2024/10/10 17:42
- * @description:预警自定义消息插件,设置跳转的报表url
+ * @description:预警自定义消息插件,设置跳转的报表url,往来类型为供应商
  */
 public class EarlyWarnHandlerPlugin implements IEarlyWarnMessageHandler {
     private final Log logger= LogFactory.getLog(DefaultWarnMessageHandler.class);
@@ -24,6 +24,7 @@ public class EarlyWarnHandlerPlugin implements IEarlyWarnMessageHandler {
     private String formId = "";//pc端表单标识
 
 
+    //单条消息跳转链接
     @Override
     public EarlyWarnMessageInfo singleMessageBuilder(DynamicObject dynamicObject, EarlyWarnContext earlyWarnContext) {
         RequestContext ctx = RequestContext.get();
@@ -37,9 +38,16 @@ public class EarlyWarnHandlerPlugin implements IEarlyWarnMessageHandler {
     }
 
 
+    //合并消息跳转链接
     @Override
     public EarlyWarnMessageInfo mergeMessageBuilder(EarlyWarnContext earlyWarnContext) {
-        return null;
+        RequestContext ctx = RequestContext.get();
+        this.clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+        this.formId = earlyWarnContext.getEarlyWarn().getDataSourceId();//表单标识
+        EarlyWarnMessageInfo info = new EarlyWarnMessageInfo();
+        String contentUrl = clientPath+"?formId="+formId+"&flag=1"+"&asstacttype=bd_supplier";//pc端跳转单据路径
+        info.setContentUrl(contentUrl);
+        return info;
     }
 
     @Override

src/main/java/fi/ar/formplugin/EarlyWarnHandlerUserPlugin.java

@@ -0,0 +1,50 @@
+package fi.ar.formplugin;
+
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+import kd.bos.context.RequestContext;
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.entity.earlywarn.EarlyWarnContext;
+import kd.bos.entity.earlywarn.warn.EarlyWarnMessageInfo;
+import kd.bos.entity.earlywarn.warn.YzjPublicNumberInfo;
+import kd.bos.entity.earlywarn.warn.plugin.IEarlyWarnMessageHandler;
+import kd.bos.service.earlywarn.impl.DefaultWarnMessageHandler;
+import kd.bos.url.UrlService;
+
+import java.util.List;
+
+/**
+ * @author cjz
+ * @date 2024/10/28 17:08
+ * @description:预警自定义消息插件,设置跳转的报表url,往来类型为人员
+ */
+public class EarlyWarnHandlerUserPlugin implements IEarlyWarnMessageHandler{
+    private final Log logger= LogFactory.getLog(DefaultWarnMessageHandler.class);
+    private String clientPath="";//客户端地址
+    private String formId = "";//pc端表单标识
+
+
+    //单条消息跳转链接
+    @Override
+    public EarlyWarnMessageInfo singleMessageBuilder(DynamicObject dynamicObject, EarlyWarnContext earlyWarnContext) {
+        return null;
+    }
+
+
+    //合并消息跳转链接
+    @Override
+    public EarlyWarnMessageInfo mergeMessageBuilder(EarlyWarnContext earlyWarnContext) {
+        RequestContext ctx = RequestContext.get();
+        this.clientPath = UrlService.getDomainContextUrlByTenantCode(ctx.getTenantCode());//拿到完整的客户端网址
+        this.formId = earlyWarnContext.getEarlyWarn().getDataSourceId();//表单标识
+        EarlyWarnMessageInfo info = new EarlyWarnMessageInfo();
+        String contentUrl = clientPath+"?formId="+formId+"&flag=1"+"&asstacttype=bos_user";//pc端跳转单据路径
+        info.setContentUrl(contentUrl);
+        return info;
+    }
+
+    @Override
+    public YzjPublicNumberInfo getYZJMessagePublicNumber(List<YzjPublicNumberInfo> publicNumberInfos) {
+        return IEarlyWarnMessageHandler.super.getYZJMessagePublicNumber(publicNumberInfos);
+    }
+}

src/main/java/fi/ar/formplugin/FinarbillFormPlugin.java

@@ -29,18 +29,18 @@ public class FinarbillFormPlugin extends AbstractFormPlugin implements Plugin {
     public void afterBindData(EventObject e) {
         super.afterBindData(e);
         Object flag = this.getView().getFormShowParameter().getCustomParam("flag");
+        Object asstacttype=this.getView().getFormShowParameter().getCustomParam("asstacttype").toString();
         //如果为预警跳转的页面则自动点击跳转按钮到报表
         if (("1").equals(flag)) {
             //获取当前单据
             DynamicObject dynamicObject=this.getModel().getDataEntity(true);
             Long id=dynamicObject.getLong("id");
-            //往来类型
-            String asstacttype=dynamicObject.getString("asstacttype");
             ReportShowParameter showParameter = new ReportShowParameter();
             //设置参数传给子界面
             showParameter.setCustomParam("parentid",id);
-            showParameter.setCustomParam("flag","1");
-            showParameter.setCustomParam("q_asstacttype","bd_supplier");
+            showParameter.setCustomParam("flag",flag);
+            //设置初始化往来类型
+            showParameter.setCustomParam("q_asstacttype",asstacttype);
             showParameter.setFormId("ar_acctagerpt_n");
             showParameter.setCaption("账龄分析表");
             showParameter.getOpenStyle().setShowType(ShowType.Modal);

src/main/java/fi/cas/task/AgentPayCloseTast.java

@@ -5,6 +5,7 @@ import com.alibaba.druid.support.logging.LogFactory;
 import fi.cas.opplugin.PayBillToolUtil;
 import kd.bos.context.RequestContext;
 import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.exception.KDException;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
@@ -20,6 +21,8 @@ import java.util.Map;
  */
 public class AgentPayCloseTast extends AbstractTask {
     private static final Log log = LogFactory.getLog(AgentPayCloseTast.class);
+    private static String nckd_salarydistribute="nckd_salarydistribute";//薪酬计提发放单标识
+
     @Override
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
         //获取要查询的数据。状态为已审批，支付状态为支付中。核心状态为支付处理全部成功
@@ -53,6 +56,65 @@ public class AgentPayCloseTast extends AbstractTask {
                     }
                 }
             }
+
+            log.info("反写核心返回信息到上游薪酬计提单");
+            //获取代发分录
+            DynamicObjectCollection entryCollection=dataEntity.getDynamicObjectCollection("entry");
+            //获取源单id
+            Long sourcebillid=entryCollection.get(0).getLong("sourcebillid");
+            QFilter qfilter=new QFilter("id",QCP.equals,sourcebillid);
+            DynamicObject agentpaybill=BusinessDataServiceHelper
+                    .loadSingle(nckd_salarydistribute,
+                            "id,nckd_entrytype,nckd_staffentry,nckd_earlyretiredentry,nckd_retireentry,nckd_salaryentry" +
+                                    ",nckd_salaryentryre,nckd_se_success,nckd_se_sysfeedback,nckd_ee_success,nckd_ee_sysfeedback,nckd_re_success" +
+                                    ",nckd_re_sysfeedback,nckd_sae_success,nckd_sae_sysfeedback,nckd_see_success,nckd_see_sysfeedback"
+                            ,new QFilter[]{qfilter});
+            //薪酬计提单分录类型
+            String nckd_entrytype=agentpaybill.getString("nckd_entrytype");
+            //薪酬计提单分录
+            if ("A".equals(nckd_entrytype)) {
+                //一般员工分录
+                DynamicObjectCollection nckd_staffentry=agentpaybill.getDynamicObjectCollection("nckd_staffentry");
+                for (int a=0;a<nckd_staffentry.size();a++) {
+                    nckd_staffentry.get(a).set("nckd_se_success",entryCollection.get(a).getBoolean("e_issuccess"));
+                    nckd_staffentry.get(a).set("nckd_se_sysfeedback",entryCollection.get(a).getString("bankreturnmsg"));
+                }
+            }
+            if ("B".equals(nckd_entrytype)) {
+                //内退分录
+                DynamicObjectCollection nckd_earlyretiredentry=agentpaybill.getDynamicObjectCollection("nckd_earlyretiredentry");
+                for (int b=0;b<nckd_earlyretiredentry.size();b++)
+                {
+                    nckd_earlyretiredentry.get(b).set("nckd_ee_success",entryCollection.get(b).getBoolean("e_issuccess"));
+                    nckd_earlyretiredentry.get(b).set("nckd_ee_sysfeedback",entryCollection.get(b).getString("bankreturnmsg"));
+                }
+            }
+            if ("C".equals(nckd_entrytype)) {
+                //退休分录
+                DynamicObjectCollection nckd_retireentry=agentpaybill.getDynamicObjectCollection("nckd_retireentry");
+                for (int c=0;c<nckd_retireentry.size();c++) {
+                    nckd_retireentry.get(c).set("nckd_re_success",entryCollection.get(c).getBoolean("e_issuccess"));
+                    nckd_retireentry.get(c).set("nckd_re_sysfeedback",entryCollection.get(c).getString("bankreturnmsg"));
+                }
+            }
+            if ("D".equals(nckd_entrytype)) {
+                //人力薪酬分录
+                DynamicObjectCollection nckd_salaryentry=agentpaybill.getDynamicObjectCollection("nckd_salaryentry");
+                for (int d=0;d<nckd_salaryentry.size();d++) {
+                    nckd_salaryentry.get(d).set("nckd_sae_success",entryCollection.get(d).getBoolean("e_issuccess"));
+                    nckd_salaryentry.get(d).set("nckd_sae_sysfeedback",entryCollection.get(d).getString("bankreturnmsg"));
+                }
+            }
+            if ("E".equals(nckd_entrytype)) {
+                //人力薪酬内退分录
+                DynamicObjectCollection nckd_salaryentry=agentpaybill.getDynamicObjectCollection("nckd_salaryentryre");
+                for (int d=0;d<nckd_salaryentry.size();d++) {
+                    nckd_salaryentry.get(d).set("nckd_see_success",entryCollection.get(d).getBoolean("e_issuccess"));
+                    nckd_salaryentry.get(d).set("nckd_see_sysfeedback",entryCollection.get(d).getString("bankreturnmsg"));
+                }
+            }
+            //反写后保存
+            SaveServiceHelper.save(new DynamicObject[] {agentpaybill});
         }
     }
 }

src/main/java/fi/em/formPlugin/BusinessProcessingConvertPlugIn.java

@@ -62,7 +62,9 @@ public class BusinessProcessingConvertPlugIn extends AbstractConvertPlugIn imple
             }
             e.getCustQFilters().add(numberQFilter);
         }else if("draw-ssysd".equals(type)){
+            String bdsupplier = this.getOption().getVariableValue("bdsupplier");
             QFilter numberQFilter = new QFilter("ar_finarbill.org.number", QCP.equals, orgnumber);
+            numberQFilter.and("ar_finarbill.asstact.id", QCP.equals, Long.valueOf(bdsupplier));
             for(int i=0;i<objects.size();i++){
                 JSONObject jsonObject = objects.getJSONObject(i);
                 String id = jsonObject.getString("id");

src/main/java/fi/em/formPlugin/BusinessProcessingUnAuditEditPlugin.java

@@ -23,10 +23,10 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 DynamicObject dynamicObject = (DynamicObject) value;
                 Object nckd_orgv = this.getModel().getValue("nckd_orgfield");//获取当前单据付款人
                 DynamicObject orgv = (DynamicObject) nckd_orgv;
-                if (dynamicObject == null) {
+                if ( orgv== null) {
                     throw new KDBizException("核算组织为空！");
                 }
-                if (orgv == null) {
+                if (dynamicObject == null) {
                     throw new KDBizException("收款信息收款人为空！");
                 }
                 String nckdItemclasstypefield1 = this.getModel().getValue("nckd_itemclasstypefield1").toString();//基础资料类型
@@ -104,11 +104,16 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                 draw.getOption().setVariableValue("type", "drawzlht");
             }else if (draw.getOperateKey().equals("draw-ssysd")) {
                 //诉讼核销
+                Object values = this.getModel().getValue("nckd_payeenamev");//获取当前单据付款人
+                DynamicObject dynamicObjects = (DynamicObject) values;
                 Object value = this.getModel().getValue("nckd_orgfield");//获取当前单据付款人
                 DynamicObject dynamicObject = (DynamicObject) value;
                 if (dynamicObject == null) {
                     throw new KDBizException("核算组织为空！");
                 }
+                if (dynamicObjects == null) {
+                    throw new KDBizException("收款信息收款人为空！");
+                }
                 DynamicObjectCollection nckdEntryentity1 = this.getModel().getEntryEntity("nckd_entryentity11");
                 JSONArray jSONArray = new JSONArray();
                 for(int i=0;i<nckdEntryentity1.size();i++){
@@ -118,6 +123,8 @@ public class BusinessProcessingUnAuditEditPlugin  extends AbstractListPlugin imp
                     jsonObject.put("id",nckdTextfield7);
                     jSONArray.add(jsonObject);
                 }
+                String bdsupplier = dynamicObjects.getString("id");//当前单据付款供应商 11
+                draw.getOption().setVariableValue("bdsupplier", bdsupplier);
                 String number = dynamicObject.getString("number");
                 draw.getOption().setVariableValue("orgnumber", number);
                 draw.getOption().setVariableValue("JSONArray", jSONArray.toString());

src/main/java/fi/em/formPlugin/YwclF7ListtenerFromPlugin.java

@@ -27,8 +27,8 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
     private final static String nckd_payeeaccbanknum="nckd_payeeaccbanknum";//调拨收款账户
     private final static String nckd_payeebanknumlb="nckd_payeebanknumlb";//收款信息修改付款账号
     private final static String nckd_payeebanknumlbs="nckd_payeebanknumlbs";//付款信息修改收款账号
-    private final static String nckd_basedatafield="nckd_basedatafield";//资产报废编号
-    private final static String nckd_basedatafield5="nckd_basedatafield5";//资产编号
+    private final static String nckd_basedatafield22="nckd_basedatafield22";//资产报废编号
+    private final static String nckd_basedatafield23="nckd_basedatafield23";//资产编号
     private final static String nckd_orgfield4="nckd_orgfield4";//付款信息修改收款账号111
     private final static String nckd_basedatafield16="nckd_basedatafield16";//财务事物卡片
     private final static String nckd_basedatafield19="nckd_basedatafield19";//被拆分资产
@@ -60,9 +60,9 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         fieldEdit5.addBeforeF7SelectListener(this);
         BasedataEdit fieldEdit6 = this.getView().getControl(nckd_payeebanknumlbs);
         fieldEdit6.addBeforeF7SelectListener(this);
-        BasedataEdit fieldEdit7 = this.getView().getControl(nckd_basedatafield);
+        BasedataEdit fieldEdit7 = this.getView().getControl(nckd_basedatafield22);
         fieldEdit7.addBeforeF7SelectListener(this);
-        BasedataEdit fieldEdit8 = this.getView().getControl(nckd_basedatafield5);
+        BasedataEdit fieldEdit8 = this.getView().getControl(nckd_basedatafield23);
         fieldEdit8.addBeforeF7SelectListener(this);
         BasedataEdit fieldEdit9 = this.getView().getControl(nckd_orgfield4);
         fieldEdit9.addBeforeF7SelectListener(this);
@@ -106,11 +106,11 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         if (StringUtils.equals(fieldKey, nckd_payeeaccbanknum)){
             this.getQFilters(beforeF7SelectEvent,nckd_payeeaccbanknum);
         }
-        if (StringUtils.equals(fieldKey, nckd_basedatafield)){
-            this.getQFiltersbf(beforeF7SelectEvent,nckd_basedatafield);
+        if (StringUtils.equals(fieldKey, nckd_basedatafield22)){
+            this.getQFiltersbf(beforeF7SelectEvent,nckd_basedatafield22);
         }
-        if (StringUtils.equals(fieldKey, nckd_basedatafield5)){
-            this.getQFilterdczc(beforeF7SelectEvent,nckd_basedatafield5);
+        if (StringUtils.equals(fieldKey, nckd_basedatafield23)){
+            this.getQFilterdczc(beforeF7SelectEvent,nckd_basedatafield23);
         }
         if (StringUtils.equals(fieldKey, nckd_orgfield4)){
             this.getQFilterdrzc(beforeF7SelectEvent,nckd_orgfield4);
@@ -283,7 +283,7 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         String number = data.getString("number");
         QFilter filter;
         //给基础资料添加过滤
-        filter = new QFilter("assetunit.number", QCP.equals, number);
+        filter = new QFilter("org.number", QCP.equals, number);
         ListShowParameter showParameter = (ListShowParameter)arg0.getFormShowParameter();
         showParameter.getListFilterParameter().setFilter(filter);
     }
@@ -297,7 +297,7 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
             String number = data.getString("number");
             QFilter filter;
             //给基础资料添加过滤
-            filter = new QFilter("assetunit.number", QCP.equals, number);
+            filter = new QFilter("org.number", QCP.equals, number);
             ListShowParameter showParameter = (ListShowParameter)arg0.getFormShowParameter();
             showParameter.getListFilterParameter().setFilter(filter);
         }else if ("N".equals(nckdDetailtype)) {

src/main/java/fi/em/opplugin/AgentpaybillOpPlugin.java

@@ -27,11 +27,7 @@ public class AgentpaybillOpPlugin extends AbstractOperationServicePlugIn {
         String operationKey = e.getOperationKey();
         //关闭付款则将支付状态更改为支付关闭状态
         if (closepay.equals(operationKey)){
-
-
-
-            for (int i=0;i< dynamicObjects.length;i++)
-            {
+            for (int i=0;i< dynamicObjects.length;i++) {
                 //设置支付状态为
                 dynamicObjects[i].set("nckd_paystatus","D");
             }

src/main/java/fi/er/opplugin/PublicreimburOpPlugin.java

@@ -65,6 +65,24 @@ public class PublicreimburOpPlugin extends AbstractOperationServicePlugIn {
                     }
                 }
 
+                //给资产信息协商最新的资产卡片id
+                String assettype = info.getString("assettype");
+                if (StringUtils.equals(assettype,"existasset")) {
+                    DynamicObjectCollection assetentrys = info.getDynamicObjectCollection("assetentry");
+                    for (DynamicObject assetentry : assetentrys) {
+                        DynamicObject assetbillno = assetentry.getDynamicObject("asset_billno");
+                        if (assetbillno != null) {
+                            Long cardId = assetbillno.getLong("id");
+                            QFilter filter = new QFilter("realcard.id", QCP.equals, cardId);
+                            DynamicObject[] finCards = BusinessDataServiceHelper.load("fa_card_fin","id",new QFilter[] {filter}, "endperiod.id DESC");
+                            if (finCards.length > 0) {
+                                DynamicObject finCard = BusinessDataServiceHelper.loadSingle(finCards[0].getPkValue(), finCards[0].getDynamicObjectType().getName());
+                                assetentry.set("nckd_bigintfield", finCard.getLong("id"));
+                            }
+                        }
+                    }
+                }
+
                 //反写预付借款单
                 DynamicObjectCollection writeoffmoneys = info.getDynamicObjectCollection("writeoffmoney");
                 Boolean exist = QueryServiceHelper.exists(info.getDynamicObjectType().getName(),  info.getPkValue());