Browse Source

feat(SettlebillFormPlugin):优化日志记录并修复字段赋值错误

新增日志记录功能,替换原有的 System.out.println 日志输出,提升代码可维护性。
同时修正了字段 `nckd_supp` 的赋值逻辑,确保数据正确写入对应字段。此外,移除了冗余的字段初始化操作,使代码更加简洁清晰。
turborao 1 week ago
parent
commit
a0a1242fbf

+ 14 - 3
code/fi/nckd-xtpoc-fi/src/main/java/nckd/xtpoc/fi/app/plugin/form/SettlebillFormPlugin.java

@@ -10,10 +10,13 @@ import kd.bos.form.control.events.ItemClickEvent;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.events.BeforeDoOperationEventArgs;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.form.operate.FormOperate;
 import kd.bos.form.plugin.AbstractFormPlugin;
 import kd.bos.form.plugin.AbstractFormPlugin;
+import kd.bos.logging.Log;
+import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.bos.servicehelper.QueryServiceHelper;
 import kd.sdk.plugin.Plugin;
 import kd.sdk.plugin.Plugin;
+import nckd.xtpoc.fi.app.plugin.operate.PublicReimburseCusOpPlugin;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -25,7 +28,7 @@ import java.util.List;
  */
  */
 public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
 public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
 
 
-
+    private static final Log logger = LogFactory.getLog(SettlebillFormPlugin.class);
     /**
     /**
      * 结算规则  费用预提单
      * 结算规则  费用预提单
      */
      */
@@ -189,7 +192,6 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
             newEntry.set("nckd_billtype", "费用预提单");
             newEntry.set("nckd_billtype", "费用预提单");
             newEntry.set("nckd_billno", maintDyn.getString("billno"));
             newEntry.set("nckd_billno", maintDyn.getString("billno"));
             newEntry.set("nckd_date", maintDyn.getDate("fiperiod"));
             newEntry.set("nckd_date", maintDyn.getDate("fiperiod"));
-            newEntry.set("nckd_supp", "");
             newEntry.set("nckd_amount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_amount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_writeamount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_writeamount", maintDyn.getBigDecimal("expenseentryentity.expenseamount"));
             descEntries.add(newEntry);
             descEntries.add(newEntry);
@@ -221,7 +223,8 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
             newEntry.set("nckd_billtype1", "对公报销");
             newEntry.set("nckd_billtype1", "对公报销");
             newEntry.set("nckd_billno1", assistDyn.getString("billno"));
             newEntry.set("nckd_billno1", assistDyn.getString("billno"));
             newEntry.set("nckd_date1", assistDyn.getDate("bizdate"));
             newEntry.set("nckd_date1", assistDyn.getDate("bizdate"));
-            newEntry.set("nckd_supp1", assistDyn.getString("billpayerid.name"));
+            logger.info("SettlebillFormPlugin: "+assistDyn.getString("billpayerid.name"));
+            newEntry.set("nckd_supp", assistDyn.getString("billpayerid.name"));
             newEntry.set("nckd_amount1", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_amount1", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_writeoffamount", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
             newEntry.set("nckd_writeoffamount", assistDyn.getBigDecimal("expenseentryentity.expenseamount"));
             descEntries1.add(newEntry);
             descEntries1.add(newEntry);
@@ -259,10 +262,12 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
             BigDecimal mainUnwrittenAmount = mainBill.getBigDecimal("nckd_writeamount");
             BigDecimal mainUnwrittenAmount = mainBill.getBigDecimal("nckd_writeamount");
             if (mainUnwrittenAmount == null || mainUnwrittenAmount.compareTo(BigDecimal.ZERO) <= 0) {
             if (mainUnwrittenAmount == null || mainUnwrittenAmount.compareTo(BigDecimal.ZERO) <= 0) {
                 System.out.println("第" + (i+1) + "行主体金额已无未核销金额,跳过");
                 System.out.println("第" + (i+1) + "行主体金额已无未核销金额,跳过");
+                logger.info("SettlebillFormPlugin: "+"第" + (i+1) + "行主体金额已无未核销金额,跳过");
                 continue;
                 continue;
             }
             }
 
 
             System.out.println("处理第" + (i+1) + "行主体金额,未核销金额:" + mainUnwrittenAmount);
             System.out.println("处理第" + (i+1) + "行主体金额,未核销金额:" + mainUnwrittenAmount);
+            logger.info("SettlebillFormPlugin: "+ "处理第" + (i+1) + "行主体金额,未核销金额:" + mainUnwrittenAmount);
 
 
             // 对当前主体行与辅助集进行逐行核销
             // 对当前主体行与辅助集进行逐行核销
             BigDecimal remainingMainAmount = mainUnwrittenAmount;
             BigDecimal remainingMainAmount = mainUnwrittenAmount;
@@ -293,12 +298,17 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
                 System.out.println("主体行" + (i+1) + "与辅助行" + (j+1) + "核销金额:" + writeOffAmount +
                 System.out.println("主体行" + (i+1) + "与辅助行" + (j+1) + "核销金额:" + writeOffAmount +
                         ",主体剩余未核销:" + remainingMainAmount +
                         ",主体剩余未核销:" + remainingMainAmount +
                         ",辅助剩余未核销:" + newAssistUnwrittenAmount);
                         ",辅助剩余未核销:" + newAssistUnwrittenAmount);
+                logger.info("SettlebillFormPlugin: "+ (i+1) + "与辅助行" + (j+1) + "核销金额:" + writeOffAmount +
+                        ",主体剩余未核销:" + remainingMainAmount +
+                        ",辅助剩余未核销:" + newAssistUnwrittenAmount);
             }
             }
 
 
             if (remainingMainAmount.compareTo(BigDecimal.ZERO) <= 0) {
             if (remainingMainAmount.compareTo(BigDecimal.ZERO) <= 0) {
                 System.out.println("第" + (i+1) + "行主体金额已全部核销完成");
                 System.out.println("第" + (i+1) + "行主体金额已全部核销完成");
+                logger.info("SettlebillFormPlugin: "+ (i+1) + "行主体金额已全部核销完成");
             } else {
             } else {
                 System.out.println("第" + (i+1) + "行主体金额部分核销,剩余未核销金额:" + remainingMainAmount);
                 System.out.println("第" + (i+1) + "行主体金额部分核销,剩余未核销金额:" + remainingMainAmount);
+                logger.info("SettlebillFormPlugin: 第" + (i+1) + "行主体金额部分核销,剩余未核销金额:" + remainingMainAmount);
             }
             }
         }
         }
 
 
@@ -306,6 +316,7 @@ public class SettlebillFormPlugin extends AbstractFormPlugin implements Plugin {
         checkRemainingAssistAmounts();
         checkRemainingAssistAmounts();
 
 
         System.out.println("主体与辅助金额集逐行核销处理完成");
         System.out.println("主体与辅助金额集逐行核销处理完成");
+        logger.info("SettlebillFormPlugin: 主体与辅助金额集逐行核销处理完成");
     }
     }
 
 
     /**
     /**