金蝶问题修复

zhangmeiyang
1 parent 6b00acaa
Showing 4 changed files with 12 additions and 11 deletions
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/component/TransferComponent.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/co/business/BaseBillCo.java
etrade-thirdparty/src/main/java/com/diligrp/etrade/thirdparty/domain/model/FEntityDetail.java
etrade-thirdparty/src/main/resources/com/diligrp/etrade/thirdparty/mapper/TransMapper.xml
@@ -63,7 +63,7 @@ public class TransferComponent {
             if (!ObjectUtils.isEmpty(fNumber)){
                 FCOSTDEPARTMENTID fCOSTDEPARTMENTID = new FCOSTDEPARTMENTID();
                 fCOSTDEPARTMENTID.setFNUMBER(fNumber);
-                co.setFCOSTDEPARTMENTID(fCOSTDEPARTMENTID);
+                co.getFEntityDetail().forEach(e->e.setFCOSTDEPARTMENTID(fCOSTDEPARTMENTID));
             }
         }
         this.transPayOrgId(co.getFPAYORGID(), marketId, systemCode);
@@ -24,7 +24,6 @@ public class BaseBillCo implements Serializable {
     private FCUSTOMERID FCUSTOMERID;
     private FSALEORGID FSALEORGID;
     private FSALEDEPTID FSALEDEPTID;
-    private FCOSTDEPARTMENTID FCOSTDEPARTMENTID;
     private FPAYORGID FPAYORGID;
     private FTRANSFERID FTRANSFERID;
     private FORDERID FORDERID;
@@ -162,15 +161,6 @@ public class BaseBillCo implements Serializable {
         this.FSALEDEPTID = FSALEDEPTID;
     }
  
-    @JsonProperty("FCOSTDEPARTMENTID")
-    public FCOSTDEPARTMENTID getFCOSTDEPARTMENTID() {
-        return FCOSTDEPARTMENTID;
-    }
-
-    public void setFCOSTDEPARTMENTID(FCOSTDEPARTMENTID FCOSTDEPARTMENTID) {
-        this.FCOSTDEPARTMENTID = FCOSTDEPARTMENTID;
-    }
-
     @JsonProperty("FPAYORGID")
     public FPAYORGID getFPAYORGID() {
         return FPAYORGID;
@@ -16,6 +16,7 @@ public class FEntityDetail {
     private BigDecimal FTaxPrice;
     private BigDecimal FPrice;
     private BigDecimal FNoTaxAmountFor_D;
+    private FCOSTDEPARTMENTID FCOSTDEPARTMENTID;
  
     @JsonProperty("FCOSTID")
     public FCOSTID getFCOSTID() {
@@ -70,4 +71,13 @@ public class FEntityDetail {
     public void setFNoTaxAmountFor_D(BigDecimal FNoTaxAmountFor_D) {
         this.FNoTaxAmountFor_D = FNoTaxAmountFor_D;
     }
+
+    @JsonProperty("FCOSTDEPARTMENTID")
+    public FCOSTDEPARTMENTID getFCOSTDEPARTMENTID() {
+        return FCOSTDEPARTMENTID;
+    }
+
+    public void setFCOSTDEPARTMENTID(FCOSTDEPARTMENTID FCOSTDEPARTMENTID) {
+        this.FCOSTDEPARTMENTID = FCOSTDEPARTMENTID;
+    }
 }
@@ -54,6 +54,7 @@
         SELECT
             currency  AS currency
           , sync_item AS syncItem
+          , customer_group AS customerGroup
         FROM
             `dili-basic-data`.`financial_base_config` fbc
         WHERE