Merge remote-tracking branch 'origin/master'

src/main/java/fi/cas/formplugin/ApBillEditPlugin.java

@@ -2446,8 +2446,8 @@ public class ApBillEditPlugin extends CasBillEdit implements ClickListener, RowC
         if (billId == 0L) {
             this.getView().showTipNotification(ResManager.loadKDString("暂无结算记录。", "PaymentBillList_5", "fi-cas-formplugin", new Object[0]));
         } else {
-            List<Long> mainSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByMain("ap_settlerecord", "nckd_cas_apbill_xz", new Object[]{billId});
-            List<Long> asstSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByAsst("ap_settlerecord", "nckd_cas_apbill_xz", new Object[]{billId});
+            Set<Long> mainSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByMain("ap_settlerecord", "nckd_cas_apbill_xz", new Object[]{billId});
+            Set<Long> asstSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByAsst("ap_settlerecord", "nckd_cas_apbill_xz", new Object[]{billId});
             Set<Long> settleRecordIds = new HashSet();
             settleRecordIds.addAll(mainSettleIds);
             settleRecordIds.addAll(asstSettleIds);

src/main/java/fi/cas/formplugin/ArBillEditPlugin.java

@@ -83,7 +83,7 @@ import java.util.stream.Collectors;
  * 2024-07-24 wangj
  * 主要功能：应收挂账单标准表单插件改
  */
-public class ArBillEditPlugin extends PaymentBillEdit implements ClickListener, RowClickEventListener, SignCallbackLisenter {
+public class ArBillEditPlugin extends CasBillEdit implements ClickListener, RowClickEventListener, SignCallbackLisenter {
     private String labCurrencySign;
     private int currencyAmtprecision;
     private Format currencyFormat;
@@ -2445,8 +2445,8 @@ public class ArBillEditPlugin extends PaymentBillEdit implements ClickListener,
         if (billId == 0L) {
             this.getView().showTipNotification(ResManager.loadKDString("暂无结算记录。", "PaymentBillList_5", "fi-cas-formplugin", new Object[0]));
         } else {
-            List<Long> mainSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByMain("ap_settlerecord", "nckd_cas_arbill", new Object[]{billId});
-            List<Long> asstSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByAsst("ap_settlerecord", "nckd_cas_arbill", new Object[]{billId});
+            Set<Long> mainSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByMain("ap_settlerecord", "nckd_cas_arbill", new Object[]{billId});
+            Set<Long> asstSettleIds = SettleRecordQueryHelperForCas.getSettleIdsByAsst("ap_settlerecord", "nckd_cas_arbill", new Object[]{billId});
             Set<Long> settleRecordIds = new HashSet();
             settleRecordIds.addAll(mainSettleIds);
             settleRecordIds.addAll(asstSettleIds);

src/main/java/fi/cas/opplugin/PaymentProcessOpPlugin.java

@@ -193,16 +193,16 @@ public class PaymentProcessOpPlugin extends AbstractOperationServicePlugIn {
 
                             if (nckd_settleamount.compareTo(BigDecimal.ZERO) > 0 && nckd_unsettleamount.compareTo(BigDecimal.ZERO) == 0) {
                                 htInfo.set("nckd_settlestatus", SettlementStatusEnum.已结算.getValue());
-                                info.set("nckd_settleamount", nckd_settleamount);
-                                info.set("nckd_unsettleamount", BigDecimal.ZERO);
+                                htInfo.set("nckd_settleamount", nckd_settleamount);
+                                htInfo.set("nckd_unsettleamount", BigDecimal.ZERO);
                             } else if (nckd_unsettleamount.compareTo(BigDecimal.ZERO) > 0 && nckd_settleamount.compareTo(BigDecimal.ZERO) == 0) {
                                 htInfo.set("nckd_settlestatus", SettlementStatusEnum.未结算.getValue());
-                                info.set("nckd_settleamount", BigDecimal.ZERO);
-                                info.set("nckd_unsettleamount", nckd_unsettleamount);
+                                htInfo.set("nckd_settleamount", BigDecimal.ZERO);
+                                htInfo.set("nckd_unsettleamount", nckd_unsettleamount);
                             } else if (nckd_settleamount.compareTo(BigDecimal.ZERO) > 0 && nckd_settleamount.compareTo(BigDecimal.ZERO) > 0) {
                                 htInfo.set("nckd_settlestatus", SettlementStatusEnum.部分结算.getValue());
-                                info.set("nckd_settleamount", nckd_settleamount);
-                                info.set("nckd_unsettleamount", nckd_unsettleamount);
+                                htInfo.set("nckd_settleamount", nckd_settleamount);
+                                htInfo.set("nckd_unsettleamount", nckd_unsettleamount);
                             }
                             SaveServiceHelper.save(new DynamicObject[]{htInfo});
                         }

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

@@ -7,7 +7,12 @@ 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.exception.KDBizException;
 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.bos.servicehelper.operation.SaveServiceHelper;
 import kd.fi.er.business.daily.reimburse.AmountObject;
 import kd.fi.er.mservice.ext.IErService4Ext;
 import kd.sdk.plugin.Plugin;
@@ -26,54 +31,39 @@ public class AmountEditPlugin extends AbstractListPlugin implements Plugin,IErSe
     public static String nckd_unexporiusedamount="nckd_unexporiusedamount";//冲销金额标识
     public static String nckd_er_tripreimburse_ext="nckd_er_tripreimburse_ext";//差旅报销单标识
     public static String orientryamount="orientryamount";//报销金额字段标识
+    private static String er_prepaybill = "er_prepaybill";//预付借款单标识
 
     @Override
     public void propertyChanged(PropertyChangedArgs e)
     {
         super.beforePropertyChanged(e);
         String name = e.getProperty().getName();
-        if(nckd_unexporiusedamount.equals(name))
-        {
-            DynamicObject data=this.getModel().getDataEntity();//获取单据模型
-            DynamicObjectCollection tripentry = data.getDynamicObjectCollection("tripentry");//获取形成信息分录
-            //付现金额触发
-            for (DynamicObject item:tripentry) {
-                DynamicObjectCollection entryentity_cl=item.getDynamicObjectCollection("entryentity");//差旅明细分录
-                for (int i=0;i< entryentity_cl.size();i++) {
-                    //判断报销金额是否有值
-                    if (entryentity_cl.get(i).getBigDecimal("orientryamount").compareTo(BigDecimal.ZERO)>0) {
-                        BigDecimal amount=entryentity_cl.get(i).getBigDecimal("orientryamount");
-                        this.getModel().setValue("orientryamount",0,i);
-                        this.getModel().setValue("orientryamount",amount,i);
-                        break;
-                    }
-                }
-            }
-        }
+
 
         if (nckd_unexporiusedamount.equals(name)||orientryamount.equals(name))
         {
-            DynamicObject data=this.getModel().getDataEntity();//获取单据模型
+
             //冲销金额总数
             BigDecimal orgiexpebalanceamount_sum = new BigDecimal("0");
             //费用合计
             BigDecimal amountfy=new BigDecimal("0");
             //行程信息
-            DynamicObjectCollection tripentry = data.getDynamicObjectCollection("tripentry");//获取形成信息分录
+            DynamicObjectCollection tripentry = this.getModel().getEntryEntity("tripentry");//获取形成信息分录
             for (DynamicObject item:tripentry) {
                 DynamicObjectCollection entryentity_cl=item.getDynamicObjectCollection("entryentity");//差旅明细分录
                 for (int i=0;i< entryentity_cl.size();i++) {
                     //报销金额总和
                     amountfy=amountfy.add(entryentity_cl.get(i).getBigDecimal("orientryamount"));
                 }
-
             }
             //amountfy报销金额总和
-            DynamicObjectCollection nckd_clearloanentry = data.getDynamicObjectCollection("nckd_clearloanentry");//获取冲预付借款分录
+            //获取冲预付借款分录
+            DynamicObjectCollection nckd_clearloanentry=this.getModel().getEntryEntity("nckd_clearloanentry");
             for (DynamicObject entryentity:nckd_clearloanentry)
             {
                 //冲销金额
                 BigDecimal orgiexpebalanceamount=entryentity.getBigDecimal("nckd_unexporiusedamount");
+
                 //冲销金额累加计算
                 orgiexpebalanceamount_sum=orgiexpebalanceamount_sum.add(orgiexpebalanceamount);
             }
@@ -81,6 +71,25 @@ public class AmountEditPlugin extends AbstractListPlugin implements Plugin,IErSe
             this.getModel().setValue("orireceiveamount",amountfy.subtract(orgiexpebalanceamount_sum),0);
         }
 
+        //重新触发付现金额计算
+        if(nckd_unexporiusedamount.equals(name))
+        {
+            DynamicObjectCollection tripentry = this.getModel().getEntryEntity("tripentry");//获取形成信息分录
+            //付现金额触发
+            for (DynamicObject item:tripentry) {
+                DynamicObjectCollection entryentity_cl=item.getDynamicObjectCollection("entryentity");//差旅明细分录
+                for (int i=0;i< entryentity_cl.size();i++) {
+                    //判断报销金额是否有值
+                    if (entryentity_cl.get(i).getBigDecimal("orientryamount").compareTo(BigDecimal.ZERO)>0) {
+                        BigDecimal amount=entryentity_cl.get(i).getBigDecimal("orientryamount");
+                        this.getModel().setValue("orientryamount",0,i);
+                        this.getModel().setValue("orientryamount",amount,i);
+                        break;
+                    }
+                }
+            }
+
+        }
     }
 
 }

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

@@ -2,6 +2,7 @@ package fi.em.formPlugin;
 import com.aliyun.odps.security.User;
 import kd.bos.exception.KDBizException;
 import kd.bos.form.plugin.AbstractFormPlugin;
+import kd.fi.er.mservice.ext.IErService4Ext;
 import kd.sdk.plugin.Plugin;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -22,15 +23,15 @@ import java.util.*;
 /**
  * @author cjz
  * @date 2024/7/25 15:13
- * @description:报销单初始化表单
+ * @description:报预付借款单单初始化表单
  */
 
 public class ReimbursementFormPlugin extends AbstractFormPlugin implements Plugin {
     private final static String KEY_OK = "btnok";//确定按钮标识
     private final static String KEY_CANCEL = "btncancel";//页面取消按钮标识
-    private final static String KEY_SEARCH = "search";//动态表单查询按钮操作
     private final static String FORMID_ENTRY = "nckd_entryentity";//动态表单单据体标识
     private static String er_prepaybill = "er_prepaybill";//预付单标识
+    private static String nckd_er_prepaybill_ext="nckd_er_prepaybill_ext";//预付借款单标识
 
     /**
      * 页面点击事件
@@ -72,7 +73,7 @@ public class ReimbursementFormPlugin extends AbstractFormPlugin implements Plugi
             }
             this.getView().close();
         } else if (StringUtils.equals(source.getKey(), KEY_CANCEL)) {
-            //被点击控件为取消则设置返回值为空并关闭页面（在页面关闭回调方法中必须验证返回值不为空，否则会报空指针）
+            //被点击控件为取消则设置返回值为空并关闭页面（在页面关闭回调方yu法中必须验证返回值不为空，否则会报空指针）
             this.getView().returnDataToParent(null);
             this.getView().close();
         } else {
@@ -108,57 +109,58 @@ public class ReimbursementFormPlugin extends AbstractFormPlugin implements Plugi
         QFilter nckd_orgamountFilter = new QFilter("costdept.number", QCP.equals, costdeptNumber);
         nckd_orgamountFilter.and("billstatus", QCP.equals, "E");
         nckd_orgamountFilter.and("creator.number",QCP.equals,creatorNumber);
-
         DynamicObject[] nckd_orgamountaccount = BusinessDataServiceHelper.
-                load(er_prepaybill, "id,number", new QFilter[]{nckd_orgamountFilter});
+                load(er_prepaybill, "id", new QFilter[]{nckd_orgamountFilter});
 
         for (int c=0;c<nckd_orgamountaccount.length;c++){
             //当前循环动因基础资料单头
             DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(nckd_orgamountaccount[c].getPkValue(), nckd_orgamountaccount[c].getDynamicObjectType().getName());
-
+            //单据编号
             String billno= dynamicObject.getString("billno");
             //循环分录
             for (DynamicObject entryentity : dynamicObject.getDynamicObjectCollection("expenseentryentity")) {
-
                 //获取费用承担部门
                 DynamicObject entrycostdept = entryentity.getDynamicObject("entrycostdept");
-
                 //获取费用项目
                 DynamicObject expenseitem=entryentity.getDynamicObject("expenseitem");
-
                 //申请金额
                 BigDecimal expenseamount=entryentity.getBigDecimal("expenseamount");
-
                 //结算金额
-                BigDecimal exporiusedamount=entryentity.getBigDecimal("exporiusedamount");
-
-                //未结算金额
-                BigDecimal orgiexpebalanceamount=entryentity.getBigDecimal("orgiexpebalanceamount");
-
+                BigDecimal exporiusedamount=entryentity.getBigDecimal("nckd_unsettleamount_et");
+                //未结算金额(借款余额)
+                BigDecimal orgiexpebalanceamount=entryentity.getBigDecimal("nckd_unsettleamount_et");
                 //备注
                 String remark=entryentity.getString("remark");
 
-                //新增动态单据分录
-                int rowIndex = this.getModel().createNewEntryRow(FORMID_ENTRY);
-                //赋值给新增分录
-                this.getModel().setValue("nckd_billno",billno,rowIndex);
-                this.getModel().setValue("nckd_entrycostdept",entrycostdept,rowIndex);
-                this.getModel().setValue("nckd_expenseitem",expenseitem,rowIndex);
-                this.getModel().setValue("nckd_expenseamount",expenseamount,rowIndex);
-                this.getModel().setValue("nckd_exporiusedamount",exporiusedamount,rowIndex);
-                this.getModel().setValue("nckd_unexporiusedamount",orgiexpebalanceamount,rowIndex);
-                this.getModel().setValue("nckd_remarke",remark,rowIndex);
-                //将选中的数据放到缓存中
-                JSONObject obj = new JSONObject();
-                //放入缓存
-                obj.put("nckd_billno",billno);
-                obj.put("nckd_entrycostdept",entrycostdept.getString("number"));
-                obj.put("nckd_expenseitem",expenseitem.getString("number"));
-                obj.put("nckd_expenseamount",expenseamount);
-                obj.put("nckd_exporiusedamount",exporiusedamount);
-                obj.put("nckd_unexporiusedamount",orgiexpebalanceamount);
-                obj.put("nckd_remark",remark);
-                resdate.add(obj);
+                Long id=entryentity.getLong("id");
+                //未结算金额大于0
+                if (orgiexpebalanceamount.compareTo(BigDecimal.ZERO)>0)
+                {
+                    //新增动态单据分录
+                    int rowIndex = this.getModel().createNewEntryRow(FORMID_ENTRY);
+                    //赋值给新增分录
+                    this.getModel().setValue("nckd_bigintfield",id,rowIndex);
+                    this.getModel().setValue("nckd_billno",billno,rowIndex);
+                    this.getModel().setValue("nckd_entrycostdept",entrycostdept,rowIndex);
+                    this.getModel().setValue("nckd_expenseitem",expenseitem,rowIndex);
+                    this.getModel().setValue("nckd_expenseamount",expenseamount,rowIndex);
+                    this.getModel().setValue("nckd_exporiusedamount",exporiusedamount,rowIndex);
+                    this.getModel().setValue("nckd_unexporiusedamount",orgiexpebalanceamount,rowIndex);
+                    this.getModel().setValue("nckd_remarke",remark,rowIndex);
+                    //将选中的数据放到缓存中
+                    JSONObject obj = new JSONObject();
+                    //放入缓存
+                    obj.put("nckd_billno",billno);
+                    obj.put("nckd_entrycostdept",entrycostdept.getString("number"));
+                    obj.put("nckd_expenseitem",expenseitem.getString("number"));
+                    obj.put("nckd_expenseamount",expenseamount);
+                    obj.put("nckd_exporiusedamount",exporiusedamount);
+                    obj.put("nckd_unexporiusedamount",orgiexpebalanceamount);
+                    obj.put("nckd_remark",remark);
+                    obj.put("nckd_bigintfield",id);
+                    resdate.add(obj);
+                }
+
             }
         }
         String pageId = this.getView().getPageId();
@@ -167,5 +169,4 @@ public class ReimbursementFormPlugin extends AbstractFormPlugin implements Plugi
     }
 
 
-
 }

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

@@ -1,6 +1,7 @@
 package fi.em.formPlugin;
 
 
+import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.exception.KDBizException;
 import kd.bos.form.CloseCallBack;
 import kd.bos.form.FormShowParameter;
@@ -8,7 +9,9 @@ import kd.bos.form.ShowType;
 import kd.bos.form.events.AfterDoOperationEventArgs;
 import kd.bos.form.events.ClosedCallBackEvent;
 import kd.bos.list.plugin.AbstractListPlugin;
+import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
 import kd.sdk.plugin.Plugin;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -25,6 +28,7 @@ public class TripreimBurseEditPlugin extends AbstractListPlugin implements Plugi
     public static String nckd_agentparameterf1 = "nckd_agentparameterf1";//弹窗界面标识
     private static String bos_org = "bos_org"; //组织标识
     private static String er_expenseitemedit="er_expenseitemedit";//费用项目基础资料标识
+    private static String er_prepaybill = "er_prepaybill";//预付借款单标识
 
 
 
@@ -84,6 +88,8 @@ public class TripreimBurseEditPlugin extends AbstractListPlugin implements Plugi
                     String remark=reJo.getString("nckd_remark");
                     //借款单编号
                     String loanbillno=reJo.getString("nckd_billno");
+                    //id
+                    Long id=reJo.getLong("nckd_bigintfield");
                     //新增分录行
                     int rowIndex = this.getModel().createNewEntryRow("nckd_clearloanentry");
                     this.getModel().setValue("nckd_entrycostdept",nckd_entrycostdept,rowIndex);//费用承担部门
@@ -92,6 +98,7 @@ public class TripreimBurseEditPlugin extends AbstractListPlugin implements Plugi
                     this.getModel().setValue("nckd_exporiusedamount",exporiusedamount,rowIndex);//结算金额
                     this.getModel().setValue("nckd_unexporiusedamount",orgiexpebalanceamount,rowIndex);//未结算金额
                     this.getModel().setValue("nckd_remark",remark,rowIndex);//备注
+                    this.getModel().setValue("nckd_bigintfield",id,rowIndex);//id
                     this.getModel().setValue("nckd_billno",loanbillno,rowIndex);
                 }
                 //刷新分录

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

@@ -24,7 +24,7 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
     private final static String nckd_payeraccbanknum="nckd_payeraccbanknum";//调拨付款账户
     private final static String nckd_payeeaccbanknum="nckd_payeeaccbanknum";//调拨收款账户
     private final static String nckd_payeebanknumlb="nckd_payeebanknumlb";//收款信息修改付款账号
-    private final static String nckd_payeebanknumlbs="nckd_payeebanknumlbs";//付款信息修改收款账号111
+    private final static String nckd_payeebanknumlbs="nckd_payeebanknumlbs";//付款信息修改收款账号
     private final static String nckd_basedatafield="nckd_basedatafield";//付款信息修改收款账号111
 
     @Override
@@ -46,6 +46,7 @@ public class YwclF7ListtenerFromPlugin extends AbstractBillPlugIn implements Plu
         BasedataEdit fieldEdit7 = this.getView().getControl(nckd_basedatafield);
         fieldEdit7.addBeforeF7SelectListener(this);
     }
+
     @Override
     public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) {
         String fieldKey = beforeF7SelectEvent.getProperty().getName();

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

@@ -0,0 +1,87 @@
+package fi.em.opplugin;
+
+import kd.bos.dataentity.entity.DynamicObject;
+import kd.bos.dataentity.entity.DynamicObjectCollection;
+import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
+import kd.bos.entity.plugin.args.BeginOperationTransactionArgs;
+import kd.bos.exception.KDBizException;
+import kd.bos.orm.query.QCP;
+import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.operation.SaveServiceHelper;
+
+import java.math.BigDecimal;
+
+/**
+ * @author cjz
+ * @date 2024/8/19 16:07
+ * @description:提交前校验，冲销金额不能大于借款余额，反写预付借款单
+ */
+public class AmountOpPlugin extends AbstractOperationServicePlugIn {
+
+    private static String er_prepaybill="er_prepaybill";//预付报销单标识
+
+
+
+    @Override
+    public void beginOperationTransaction(BeginOperationTransactionArgs e){
+        //获取当前操作单据数组
+        DynamicObject[] dynamicObjects = e.getDataEntities();
+        for (int i=0;i< dynamicObjects.length;i++)
+        {
+            DynamicObject info = BusinessDataServiceHelper.
+                    loadSingle(dynamicObjects[i].getPkValue(), dynamicObjects[i].getDynamicObjectType().getName());
+            DynamicObjectCollection nckd_clearloanentry=info.getDynamicObjectCollection("nckd_clearloanentry");//获取冲预付借款分录
+
+            //获取冲销金额
+            for (int j=0;j< nckd_clearloanentry.size();j++)
+            {
+                //获取借款余额
+                BigDecimal nckd_exporiusedamount=nckd_clearloanentry.get(i).getBigDecimal("nckd_exporiusedamount");
+                //获取冲销金额
+                BigDecimal orgiexpebalanceamount=nckd_clearloanentry.get(i).getBigDecimal("nckd_unexporiusedamount");
+                //冲销金额大于借款余额
+                if (orgiexpebalanceamount.compareTo(nckd_exporiusedamount)==1) {
+                    throw new KDBizException("第"+(j+1)+"行存在错误，冲销金额不能大于借款余额！");
+                }else {
+                    //反写字段到预付借款单
+                    //数据id
+                     Long id=nckd_clearloanentry.get(j).getLong("nckd_bigintfield");
+                    //获取行预付单借款编号
+                    String nckd_billno=nckd_clearloanentry.get(j).getString("nckd_billno");
+                    //根据行号查询预付借款单预付信息数据
+                    QFilter nckd_orgamountFilter = new QFilter("billno", QCP.equals, nckd_billno);
+                    //获取预付单信息分录
+                    DynamicObject[] nckd_orgamountaccount = BusinessDataServiceHelper.
+                         load(er_prepaybill, "id,number", new QFilter[]{nckd_orgamountFilter});
+                    for (int c=0;c<nckd_orgamountaccount.length;c++)
+                    {
+                        DynamicObject dynamicObject=BusinessDataServiceHelper
+                                .loadSingle(nckd_orgamountaccount[c].getPkValue(),nckd_orgamountaccount[c].getDynamicObjectType().getName());
+                        //获取预付借款单预付信息分录
+                        DynamicObjectCollection expenseentryentity=dynamicObject.getDynamicObjectCollection("expenseentryentity");
+                        for (DynamicObject list:expenseentryentity) {
+                            //id
+                            Long listid=list.getLong("id");
+                            //未核销金额
+                            BigDecimal orgamount=list.getBigDecimal("orgiexpebalanceamount");
+                            //未结算金额
+                            BigDecimal nckd_unsettleamount_et=list.getBigDecimal("nckd_unsettleamount_et");
+                            //结算金额
+                            BigDecimal nckd_settleamount_et=list.getBigDecimal("nckd_settleamount_et");
+                            if (listid.equals(id)) {
+                                //未核销金额-冲销金额
+                                list.set("orgiexpebalanceamount",orgamount.subtract(orgiexpebalanceamount));
+                                //未结算金额-冲销金额
+                                list.set("nckd_unsettleamount_et",nckd_unsettleamount_et.subtract(orgiexpebalanceamount));
+                                //已结算金额+冲销金额
+                                list.set("nckd_settleamount_et",nckd_settleamount_et.add(orgiexpebalanceamount));
+                                SaveServiceHelper.save(new DynamicObject[]{dynamicObject});
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/fi/fa/opplugin/RealCardBillOpPlugin.java

@@ -67,17 +67,19 @@ public class RealCardBillOpPlugin extends AbstractOperationServicePlugIn {
                         //从拆分分录第二行开始回写
                         //获取拆分后卡片分录e管家实物卡片
                         DynamicObject card_list = collection.get(i+1).getDynamicObject("nckd_real_card_list");
-                        Long id = card_list.getLong("id");
-                        //查询实物卡片清单
-                        QFilter filter = new QFilter("id", QCP.equals,id);
-                        DynamicObject[] cardObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter});
-                        DynamicObject cardInfo = BusinessDataServiceHelper.loadSingle(cardObjects[0].getPkValue(), cardObjects[0].getDynamicObjectType().getName());
-                        //回写实物卡片字段到e管家实物卡片清单
-                        //回写e卡片实物清单字段
-                        cardInfo.set("nckd_card_real_org", orgName);
-                        cardInfo.set("nckd_card_real_code", number);
-                        cardInfo.set("nckd_card_real_name", name);
-                        SaveServiceHelper.save(new DynamicObject[]{cardInfo});
+                        if (card_list != null) {
+                            Long id = card_list.getLong("id");
+                            //查询实物卡片清单
+                            QFilter filter = new QFilter("id", QCP.equals,id);
+                            DynamicObject[] cardObjects = BusinessDataServiceHelper.load("nckd_fa_card_real_list","id",new QFilter[] {filter});
+                            DynamicObject cardInfo = BusinessDataServiceHelper.loadSingle(cardObjects[0].getPkValue(), cardObjects[0].getDynamicObjectType().getName());
+                            //回写实物卡片字段到e管家实物卡片清单
+                            //回写e卡片实物清单字段
+                            cardInfo.set("nckd_card_real_org", orgName);
+                            cardInfo.set("nckd_card_real_code", number);
+                            cardInfo.set("nckd_card_real_name", name);
+                            SaveServiceHelper.save(new DynamicObject[]{cardInfo});
+                        }
                     }
                 }else if(StringUtils.equals(e.getOperationKey(),"unaudit")) {
                 //反审核，e管家实物卡片清单三个字段置为空

src/main/java/fi/fa/webService/DispatchMidController.java

@@ -17,7 +17,7 @@ import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
 import kd.bos.servicehelper.operation.SaveServiceHelper;
-import nckd.sys.web.common.utils.OperateHelper;
+import kd.bos.dataentity.OperateOption;
 import org.apache.commons.lang3.ObjectUtils;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -231,12 +231,12 @@ public class DispatchMidController implements Serializable {
                 entry1.set("inusedept", map.get("inDeptId"));//调入使用部门
             }
             //执行保存-提交-审核
-            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_dispatch", new DynamicObject[]{dispatch}, OperateHelper.createOperate());
+            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_dispatch", new DynamicObject[]{dispatch}, OperateOption.create());
             if (saveResult.isSuccess()){
                 //生单后反写中间表，防止反复生单
                 OncePush(jsonObject.getString("billno"));
-                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
-                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
+                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_dispatch",saveResult.getSuccessPkIds().toArray(),OperateOption.create());
+                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_dispatch",submitResult.getSuccessPkIds().toArray(),OperateOption.create());
             }
 
 
@@ -319,12 +319,12 @@ public class DispatchMidController implements Serializable {
 
             }
             //执行保存-提交-审核
-            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_change_dept", new DynamicObject[]{changeDept}, OperateHelper.createOperate());
+            OperationResult saveResult = SaveServiceHelper.saveOperate("fa_change_dept", new DynamicObject[]{changeDept}, OperateOption.create());
             if (saveResult.isSuccess()) {
                 //生单后反写中间表，防止反复生单
                 OncePush(jsonObject.getString("billno"));
-                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
-                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateHelper.createOperate());
+                OperationResult submitResult = OperationServiceHelper.executeOperate("submit", "fa_change_dept",saveResult.getSuccessPkIds().toArray(),OperateOption.create());
+                OperationResult auditResult = OperationServiceHelper.executeOperate("audit", "fa_change_dept",submitResult.getSuccessPkIds().toArray(),OperateOption.create());
             }
         }