From 15ce2d2b04d324aa2f2c25e211b2ac4a8e2e69d5 Mon Sep 17 00:00:00 2001
From: zengweihai <zengweihai@x-ri.com>
Date: Fri, 30 Aug 2024 11:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=85=AC=E6=8A=A5=E9=94=80=E5=86=B2?=
 =?UTF-8?q?=E9=94=80=E8=AE=A1=E7=AE=97=E6=9B=B4=E6=96=B0=E5=8F=8A=E5=AF=B9?=
 =?UTF-8?q?=E5=85=AC=E6=8A=A5=E9=94=80=E6=8E=A8=E4=BB=98=E6=AC=BE=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E4=BB=98=E6=AC=BE=E6=98=8E=E7=BB=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/kd/fi/er/botp/ConvertBillPlugln.java | 58 ++++---------------
 .../formplugin/GenerateSKClickPlugln.java     | 14 +++++
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/shkd-cosmic-debug/src/main/java/kd/fi/er/botp/ConvertBillPlugln.java b/shkd-cosmic-debug/src/main/java/kd/fi/er/botp/ConvertBillPlugln.java
index 7d16c6c..be0f3f3 100644
--- a/shkd-cosmic-debug/src/main/java/kd/fi/er/botp/ConvertBillPlugln.java
+++ b/shkd-cosmic-debug/src/main/java/kd/fi/er/botp/ConvertBillPlugln.java
@@ -35,59 +35,23 @@ public class ConvertBillPlugln extends AbstractConvertPlugIn implements Plugin {
             DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle(sourceBillPK, getSrcMainType().getName());
             DynamicObjectCollection accountentry = dynamicObject.getDynamicObjectCollection("accountentry");
             BigDecimal orireceiveamount = accountentry.get(0).getBigDecimal("orireceiveamount"); //实付金额
-
-            DynamicObjectCollection writeoffmoney = dynamicObject.getDynamicObjectCollection("writeoffmoney"); //预付
-            DynamicObjectCollection expenseentryentity = dynamicObject.getDynamicObjectCollection("expenseentryentity"); //预付
-
-            BigDecimal yuf = BigDecimal.ZERO; //预付金额
-            for(int i=0;i<writeoffmoney.size();i++){
-                DynamicObject enry = writeoffmoney.get(i);
-                BigDecimal loanamount = enry.getBigDecimal("loanamount");
-                yuf = yuf.add(loanamount);
-            }
-            if(yuf.compareTo(BigDecimal.ZERO) ==0){
-                return;
-            }
-
-            BigDecimal feiy = BigDecimal.ZERO; //报销金额的合计
-
-
-            for(int i=0;i<expenseentryentity.size();i++){
-                DynamicObject enry = expenseentryentity.get(i);
-                BigDecimal loanamount = enry.getBigDecimal("expenseamount");
-                feiy = feiy.add(loanamount);
-            }
-
-//            BigDecimal proportion = yuf.divide(feiy, 4, 4); // 预付/报销金额 = 已付比例
-//            BigDecimal supro = one.subtract(proportion); // 1-已付比例 = 未付比例
-
+            DynamicObjectCollection expenseentryentity = dynamicObject.getDynamicObjectCollection("expenseentryentity"); //费用明细
             BigDecimal sfTatalo = BigDecimal.ZERO;
-            BigDecimal zft = BigDecimal.ZERO;
+
             for(int i=0;i<expenseentryentity.size();i++){
-
                 DynamicObject enry = expenseentryentity.get(i);
-                BigDecimal loanamount = enry.getBigDecimal("expenseamount"); //报销金额
-                BigDecimal supro = loanamount.divide(feiy,4,4);
-                BigDecimal multiply = orireceiveamount.multiply(supro);
-
-                if(i==expenseentryentity.size()-1){
-                    multiply =  orireceiveamount.subtract(zft);
-                }
-
-                zft =zft.add(multiply);
+                BigDecimal loanamount = enry.getBigDecimal("shkd_verification"); //冲销后金额
                 DynamicObjectCollection entry = contract.getDynamicObjectCollection("entry");
-                entry.get(i).set("e_actamt",multiply); //付款单实付
-                entry.get(i).set("e_payableamt",multiply); //应付
-                entry.get(i).set("e_payablelocamt", multiply);
-
-                entry.get(i).set("e_unsettledlocalamt", multiply);
-                entry.get(i).set("e_unlockamt", multiply);
-                entry.get(i).set("e_unsettledamt", multiply);
+                entry.get(i).set("e_actamt",loanamount); //付款单实付
+                entry.get(i).set("e_payableamt",loanamount); //应付
+                entry.get(i).set("e_payablelocamt", loanamount);
+                entry.get(i).set("e_unsettledlocalamt", loanamount);
+                entry.get(i).set("e_unlockamt", loanamount);
+                entry.get(i).set("e_unsettledamt", loanamount);
 //                entry.get(i).set("e_payableamt", multiply);
 //                entry.get(i).set("e_payablelocamt", multiply);
-                entry.get(i).set("e_localamt", multiply);
-
-                sfTatalo =  sfTatalo.add(multiply);
+                entry.get(i).set("e_localamt", loanamount);
+                sfTatalo =  sfTatalo.add(loanamount);
             }
 
             DynamicObjectCollection entry = contract.getDynamicObjectCollection("entry");
diff --git a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/GenerateSKClickPlugln.java b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/GenerateSKClickPlugln.java
index 56979cb..b0cd9c6 100644
--- a/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/GenerateSKClickPlugln.java
+++ b/shkd-cosmic-debug/src/main/java/shkd/fi/er/plugin/formplugin/GenerateSKClickPlugln.java
@@ -138,6 +138,20 @@ public class GenerateSKClickPlugln extends AbstractBillPlugIn implements Plugin
                     }
                 }
                 this.getView().updateView("expenseentryentity");
+            }else {// 若单据类型为薪酬付款时，当存在预付时，为全预付；报销金额被全冲销，冲销后金额为0；反之冲销后金额为报销金额本身
+                DynamicObjectCollection writeoffmoney = this.getModel().getEntryEntity("writeoffmoney");//获取冲借款分录
+                DynamicObjectCollection expenseentryentity = this.getModel().getEntryEntity("expenseentryentity");//获取费用明细分录
+                if (writeoffmoney.size() > 0){
+                    for (DynamicObject dynamicObject : expenseentryentity) {
+                        dynamicObject.set("shkd_verification",BigDecimal.ZERO);
+                    }
+                }else {
+                    for (DynamicObject dynamicObject : expenseentryentity) {
+                        BigDecimal expenseamount = dynamicObject.getBigDecimal("expenseamount");
+                        dynamicObject.set("shkd_verification",expenseamount);
+                    }
+                }
+                this.getView().updateView("expenseentryentity");
             }
         }
     }