From 3850da8158964c22b0f6b10feb1c0815299e9579 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Fri, 23 Sep 2022 15:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/api/kingdee/appaybill/ApPayBill.java  | 50 +++++++++----------
 .../FinPaymentrecordService.java              | 14 ------
 .../fin/biz/kingdee/appaybill/data_model.json |  6 +--
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
index e890e6f7d6..29bc2b4536 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java
@@ -26,10 +26,10 @@ public class ApPayBill {
       @NotBlank
       //往来单位类型:FCONTACTUNITTYPE  (必填项)
       public String FCONTACTUNITTYPE="BD_Supplier";*/
-    @JsonProperty("FCONTACTUNIT")
-      @NotBlank
+   /* @JsonProperty("FCONTACTUNIT")
+      @NotBlank*/
       //往来单位:FCONTACTUNIT  (必填项)
-      public String FCONTACTUNIT="010001";
+     /* public String FCONTACTUNIT="010001";*/
    /* @JsonProperty("FRECTUNITTYPE")
       @NotBlank
       //收款单位类型:FRECTUNITTYPE  (必填项)
@@ -37,23 +37,23 @@ public class ApPayBill {
     @JsonProperty("FRECTUNIT")
       @NotBlank
       //收款单位:FRECTUNIT  (必填项)
-      public String FRECTUNIT="010001";
-    @JsonProperty("FSETTLEORGID")
-      @NotBlank
+      public String FRECTUNIT ;
+   /* @JsonProperty("FSETTLEORGID")
+      @NotBlank*/
       //结算组织:FSETTLEORGID (必填项)
-      public String FSETTLEORGID="101";
-    @JsonProperty("FPURCHASEORGID")
+      /*public String FSETTLEORGID ;
+    @JsonProperty("FPURCHASEORGID")*/
       @NotBlank
       //采购组织:FPURCHASEORGID
-      public String FPURCHASEORGID="101";
+      public String FPURCHASEORGID ;
     @JsonProperty("FPURCHASEDEPTID")
       @NotBlank
       //采购部门:FPURCHASEDEPTID(必填项)
-      public String FPURCHASEDEPTID="05.04";
-    @JsonProperty("FPAYORGID")
-    @NotBlank
+      public String FPURCHASEDEPTID ;
+   /* @JsonProperty("FPAYORGID")
+    @NotBlank*/
     //付款组织:FPAYORGID  (必填项)
-    public String FPAYORGID="101";
+   /* public String FPAYORGID ;*/
     @JsonProperty("F_PAEZ_Assistant")
     @NotBlank
     //应付类别:F_PAEZ_Assistant  (必填项) 默认：005 定金
@@ -77,22 +77,22 @@ public class ApPayBill {
             @NotBlank
             //表体-应付金额:FPAYTOTALAMOUNTFOR
             public double FPAYTOTALAMOUNTFOR;
-         @JsonProperty("FPAYAMOUNTFOR_E")
-            @NotBlank
+        /* @JsonProperty("FPAYAMOUNTFOR_E")
+            @NotBlank*/
             //付款金额:FPAYAMOUNTFOR_E
-            public double FPAYAMOUNTFOR_E;
-         @JsonProperty("FSETTLEPAYAMOUNTFOR")
-            @NotBlank
+           /* public double FPAYAMOUNTFOR_E;*/
+       /*  @JsonProperty("FSETTLEPAYAMOUNTFOR")
+            @NotBlank*/
             //折后金额:FSETTLEPAYAMOUNTFOR
-            public double FSETTLEPAYAMOUNTFOR;
-         @JsonProperty("FREALPAYAMOUNTFOR_D")
-            @NotBlank
+           /* public double FSETTLEPAYAMOUNTFOR;*/
+        /* @JsonProperty("FREALPAYAMOUNTFOR_D")
+            @NotBlank*/
             //表体-实付金额:FREALPAYAMOUNTFOR_D
-            public double FREALPAYAMOUNTFOR_D;
-         @JsonProperty("FPAYAMOUNT_E")
-            @NotBlank
+           /* public double FREALPAYAMOUNTFOR_D;*/
+        /* @JsonProperty("FPAYAMOUNT_E")
+            @NotBlank*/
             //付款金额本位币:FPAYAMOUNT_E
-            public double FPAYAMOUNT_E;
+           /* public double FPAYAMOUNT_E;*/
          @JsonProperty("FACCOUNTID")
              @NotBlank
              //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index dcf276dd4f..93527320ff 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -185,18 +185,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         apPayBill.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
         //业务日期
         apPayBill.setFDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
-        //往来单位
-        apPayBill.setFCONTACTUNIT("010001");
         //收款单位
         apPayBill.setFRECTUNIT("010001");
-        //结算组织
-        apPayBill.setFSETTLEORGID("101");
         //采购组织
         apPayBill.setFPURCHASEORGID("101");
         //采购部门
         apPayBill.setFPURCHASEDEPTID("05.04");
-        //付款组织
-        apPayBill.setFPAYORGID("101");
         //应付类别默认005定金
         apPayBill.setF_PAEZ_Assistant("005");
 
@@ -207,14 +201,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
             //应付金额
             fpaybillentry.setFPAYTOTALAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
-            //付款金额
-            fpaybillentry.setFPAYAMOUNTFOR_E(Double.valueOf(finPaymentrecord.getCost()));
-            //折后金额
-            fpaybillentry.setFSETTLEPAYAMOUNTFOR(Double.valueOf(finPaymentrecord.getCost()));
-            //实付金额
-            fpaybillentry.setFREALPAYAMOUNTFOR_D(Double.valueOf(finPaymentrecord.getCost()));
-            //付款金额本位币
-            fpaybillentry.setFPAYAMOUNT_E(Double.valueOf(finPaymentrecord.getCost()));
             //登账日期
             fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
             //入账类型
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json
index d0cc7dade5..1687f1c0bb 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_model.json
@@ -6,7 +6,7 @@
   "FDATE": "@KD_FDATE",
   "FCONTACTUNITTYPE": "BD_Supplier",
   "FCONTACTUNIT": {
-     "FNumber": "@KD_FCONTACTUNIT"
+     "FNumber": "@KD_FRECTUNIT"
   },
   "FRECTUNITTYPE": "BD_Supplier",
   "FRECTUNIT": {
@@ -19,7 +19,7 @@
   "FEXCHANGERATE": 1.0,
   "FSETTLERATE": 1.0,
   "FSETTLEORGID": {
-      "FNumber": "@KD_FSETTLEORGID"
+      "FNumber": "@KD_FPURCHASEORGID"
   },
   "FPURCHASEORGID": {
       "FNumber": "@KD_FPURCHASEORGID"
@@ -30,7 +30,7 @@
   "FDOCUMENTSTATUS": "Z",
   "FCancelStatus": "A",
   "FPAYORGID": {
-      "FNumber": "@KD_FPAYORGID"
+      "FNumber": "@KD_FPURCHASEORGID"
   },
   "FISSAMEORG": true,
   "FIsCredit": false,