需求

src/main/java/com/zfire/mall/manager/logic/k3/K3CustomerLogic.java

@@ -31,7 +31,7 @@ public class K3CustomerLogic {
 
         // 登录成功调客户接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.CUSTOMER_INFO, startTime, endTime);
-        String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s " + k3Logic.supplySql(request.getStartTime(), request.getEndTime());
+        String filterStr = "FGroup.FNumber in ('DD','DFDS','FSQD','FSSH','FSZK','GZQD','GZSH','GZZK','LSFX','SHFX','SY','ZYDS') AND FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s " + k3Logic.supplySql(request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FCUSTID,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
                 "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL");
 //        request.setFieldKeys("FNUMBER,FNUMBER,FNAME,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName,FTEL,FSALDEPTID.FNumber,FSALDEPTID.FName," +
@@ -44,7 +44,7 @@ public class K3CustomerLogic {
         "invoiceTitle","taxNo","bank","bankAccount","invoicePhone","invoiceAddress","email","province","city","region"};
         List<KingDeeCustomer> objects = k3Logic.allSync(request, fields, KingDeeCustomer.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
-            kingDeeCustomerService.saveBatch(objects);
+            kingDeeCustomerService.saveOrUpdateBatch(objects);
 
 //            //初始化钱包
 //            for(KingDeeCustomer kingDeeCustomer :objects){

src/main/java/com/zfire/mall/manager/logic/k3/K3Logic.java

@@ -54,18 +54,20 @@ public class K3Logic {
 
         //多拿1个审核时间作为结束时间,此字段会比实际反射的实体类要多，所以最后一个字段在反射的时候不处理
         //即时库存没审核时间
-        if(!requestApiBean.getFormId().equals(KingDeeCons.STOCK_AMOUNT)) {
-            if (requestApiBean.getFormId().equals(KingDeeCons.DEPT_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.ORG_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.SUPPLIER_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.STOCK_INFO)) {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAuditDate");
-            } else if (requestApiBean.getFormId().equals(KingDeeCons.CUSTOMER_INFO)
-                    || requestApiBean.getFormId().equals(KingDeeCons.OTHER_IN_STOCK)
-                    || requestApiBean.getFormId().equals(KingDeeCons.WALLET_FKD)) {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAPPROVEDATE");
-            } else {
-                requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FApproveDate");
+        if (!requestApiBean.getFieldKeys().contains(",FApproveDate")) {
+            if (!requestApiBean.getFormId().equals(KingDeeCons.STOCK_AMOUNT)) {
+                if (requestApiBean.getFormId().equals(KingDeeCons.DEPT_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.ORG_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.SUPPLIER_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.STOCK_INFO)) {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAuditDate");
+                } else if (requestApiBean.getFormId().equals(KingDeeCons.CUSTOMER_INFO)
+                        || requestApiBean.getFormId().equals(KingDeeCons.OTHER_IN_STOCK)
+                        || requestApiBean.getFormId().equals(KingDeeCons.WALLET_FKD)) {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FAPPROVEDATE");
+                } else {
+                    requestApiBean.setFieldKeys(requestApiBean.getFieldKeys() + ",FApproveDate");
+                }
             }
         }
 

src/main/java/com/zfire/mall/manager/logic/k3/K3MaterialLogic.java

@@ -41,13 +41,13 @@ public class K3MaterialLogic {
         String filterStr = "FDocumentStatus = 'C' AND FUseOrgId.FNUMBER = %s "+ k3Logic.supplySql(request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FMATERIALID,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
                 + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
-                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,"
+                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,F_abcd_Text,"
                 + "FMaterialGroup.FName");
 //        request.setFieldKeys("FNumber,FNumber,FName,FUseOrgId,FUseOrgId.FNUMBER,FUseOrgId.FName, FCategoryID, FCategoryID.FNUMBER,FCategoryID.FName, FSpecification,"
 //                + "FBaseUnitId.FNumber,FBaseUnitId.FName,FStoreUnitID.FNumber,FStoreUnitID.FName,FSalePriceUnitId.FNumber,FSalePriceUnitId.FName,FPurchasePriceUnitId.FNumber,FPurchasePriceUnitId.FName,FTaxRateId.FTaxRate,"
 //                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
 //                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text");
-        request.setFilterString(String.format(filterStr, orgNumber));
+        request.setFilterString("FMaterialGroup.FNumber LIKE '01.0%' AND"+String.format(filterStr, orgNumber));
         request.setOrderString("FMATERIALID ASC");
 
         String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","categoryId","categoryNumber","categoryName","specification"

src/main/java/com/zfire/mall/manager/logic/k3/K3ReceiptLogic.java

@@ -77,7 +77,7 @@ public class K3ReceiptLogic {
 
         //付款单位 ： FPAYUNIT
         // 同步钱包接口
-        request.setFieldKeys("FRECEIVEBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FRECAMOUNTFOR_E,F_kls_Assistant1,FCONTACTUNIT,FREALRECAMOUNTFOR_D,FDATE," +
+        request.setFieldKeys("FRECEIVEBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FRECAMOUNTFOR_E,F_qwer_QB,FCONTACTUNIT,FREALRECAMOUNTFOR_D,FDATE," +
                 "FPAYUNIT,FSETTLEDISTAMOUNTFOR,FSALEDEPTID,FSALEERID,FREMARK,FACCOUNTID," +
                 "FSALEGROUPID,FSETTLETYPEID,FSETTLEORGID,FPAYORGID,FCURRENCYID,FPAYUNITTYPE,FApproveDate");
         request.setFilterString(String.format(filterStr));
@@ -128,7 +128,7 @@ public class K3ReceiptLogic {
     private void allSyncTkd(RequestApiBean request,String filterStr) throws Exception {
         //收款单位：FRECTUNIT
         // 同步钱包接口
-        request.setFieldKeys("FREFUNDBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALREFUNDAMOUNTFOR_D,F_kls_Assistant1, " +
+        request.setFieldKeys("FREFUNDBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALREFUNDAMOUNTFOR_D,F_qwer_QB," +
                 "FCONTACTUNIT,FREFUNDAMOUNTFOR_E,FDATE,FRECTUNIT, " +
                 "FSALEDEPTID,FSALEERID,FREMARK,FACCOUNTID,FSALEGROUPID, " +
                 "FSETTLETYPEID,FSETTLEORGID,FPAYORGID,FCURRENCYID,FRECTUNITTYPE,FApproveDate");
@@ -179,14 +179,14 @@ public class K3ReceiptLogic {
 
     private void allSyncFkd(RequestApiBean request,String filterStr) throws Exception {
         // 同步钱包接口
-        request.setFieldKeys("FPAYBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALPAYAMOUNTFOR_D,F_kls_Assistant1," +
-                " FCONTACTUNIT,FREALPAYAMOUNTFOR_D,FDATE,FSETTLEDISTAMOUNTFOR," +
+        request.setFieldKeys("FPAYBILLENTRY_FEntryID,FBillNo,FDOCUMENTSTATUS,FREALPAYAMOUNTFOR_D,F_qwer_QB," +
+                " FCONTACTUNIT,FDATE,FSETTLEDISTAMOUNTFOR," +
                 " FSETTLETYPEID,FREMARK,FACCOUNTID, " +
                 "FSETTLEORGID,FPAYORGID,FCURRENCYID,FOUTCONTACTTYPE,FApproveDate");
         request.setFilterString(String.format(filterStr));
         request.setOrderString("FID ASC");
         String[] fields = new String[]{"id","billNo","status","amount","walletId",
-                "customerId","hAmount","theTime","discount",
+                "customerId","theTime","discount",
                 "settleType","remark","bankAccount",
                 "settleOrg","skzz","bibie","customerType","examineTime"};
 

src/main/java/com/zfire/mall/manager/logic/k3/K3WalletLogic.java

@@ -41,7 +41,7 @@ public class K3WalletLogic {
     public void allSync(String orgId, String orgNumber, String startTime, String endTime) throws Exception {
         // 同步钱包接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.WALLET, startTime, endTime);
-        String filterStr = "FId='62a150496fabe3'"+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
+        String filterStr = "FId='64f93972aa7b46'"+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
         request.setFieldKeys("FEntryID,FNumber,FDataValue,FUseOrgId,FForbidStatus");
         //request.setFieldKeys("FNumber,FNumber,FDataValue,FUseOrgId,FForbidStatus");
         request.setFilterString(String.format(filterStr, orgNumber));