金蝶

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

@@ -33,7 +33,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());
         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,F_kls_Text");
+                "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," +
 //                "FINVOICETITLE,FTAXREGISTERCODE,FINVOICEBANKNAME,FINVOICEBANKACCOUNT,FINVOICETEL,FINVOICEADDRESS,FEMail,FPROVINCE,FCITY,FPROVINCIAL,F_kls_Text");
         request.setFilterString(String.format(filterStr, orgNumber));
@@ -41,10 +41,10 @@ public class K3CustomerLogic {
 
 
         String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","mobile","saleDeptNumber","saleDeptName",
-        "invoiceTitle","taxNo","bank","bankAccount","invoicePhone","invoiceAddress","email","province","city","region","secondCustomerNumber"};
+        "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.saveOrUpdateBatch(objects);
+            kingDeeCustomerService.saveBatch(objects);
 
 //            //初始化钱包
 //            for(KingDeeCustomer kingDeeCustomer :objects){

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

@@ -41,11 +41,11 @@ 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,F_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
-                + "F_pjdm_Text,F_pjxh1_Text,F_pjcspdm_Text,F_pjxh2_Text,FMaterialGroup.FName");
+                + "FMaterialGroup.FNumber,FIsInventory,FIsSale,FIsPurchase,FLENGTH,FVOLUME,FWIDTH,FHEIGHT,FOldNumber,"
+                + "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_tmt_Text,F_njdm_Text,F_njxh_Text,F_wjdm_Text,F_wjxh_Text,"
+//                + "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.setOrderString("FMATERIALID ASC");
@@ -53,8 +53,8 @@ public class K3MaterialLogic {
         String[] fields = new String[]{"id","number","name","useOrgId","useOrgNumber","useOrgName","categoryId","categoryNumber","categoryName","specification"
                 ,"baseUnitCode","baseUnitId","storeUnitCode","storeUnitId","salePriceUnitCode","salePriceUnitId","purchasePriceUnitCode","purchasePriceUnitId",
                 "taxRateId","materialGroupNumber","isInventory","isSale","isPurchase"
-                ,"length","volume","width","height","oldNumber","tmtText","njdmText","njxhText","wjdmText","wjxhText","pjdmText","pjxh1Text"
-                ,"pjcspdmText","pjxh2Text","materialGroupName"};
+                ,"length","volume","width","height","oldNumber",
+                "materialGroupName"};
         List<KingDeeMaterial> objects = k3Logic.allSync(request, fields, KingDeeMaterial.class);
         if(CollectionUtils.isEmpty(objects)){
             return;

src/main/java/com/zfire/mall/manager/schedule/JiaXianSyncSchedule.java

@@ -23,11 +23,11 @@ import java.util.List;
 
 
 /**
- * 更新库存
+ *  嘉贤，格匠无用
  *
  * @author change
  */
-@Component
+//@Component
 @Slf4j
 public class JiaXianSyncSchedule {
 

src/main/java/com/zfire/mall/manager/schedule/SalesOrderSchedule.java

@@ -157,19 +157,19 @@ public class SalesOrderSchedule{
 
 
     /**
-     * 同步采购入库单
+     * 同步采购入库单 格匠的取消同步
      */
-    @Scheduled(fixedDelay = 30 * 1000)
+/*    @Scheduled(fixedDelay = 30 * 1000)
     public void automatic() throws Exception {
 
         HttpUtil.get(automaticPuUrl);
-    }
+    }*/
 
 
     /**
-     * 同步物流消息到发货单
+     * 同步物流消息到发货单    嘉贤取消同步
      */
-    @Scheduled(fixedDelay = 60 * 1000)
+    //@Scheduled(fixedDelay = 60 * 1000)
     public void automaticOrderTrack() throws Exception {
         KingDeeInterface kingDeeInterface = kingDeeInterfaceService.lambdaQuery().eq(KingDeeInterface::getFormId, "ORDER_TRACK").last("limit 1").one();
 
@@ -202,9 +202,9 @@ public class SalesOrderSchedule{
 
 
     /**
-     * 60秒同步工单
+     * 60秒同步工单  嘉贤取消同步
      */
-    @Scheduled(fixedDelay = 200 * 1000)
+   // @Scheduled(fixedDelay = 200 * 1000)
     public void automaticGetSyncCostTicket() throws Exception {
         List<CustomerOrder> list = customerOrderService.lambdaQuery()
                 .isNotNull(CustomerOrder::getGongDanId)

src/main/java/com/zfire/mall/manager/schedule/StockCostSyncSchedule.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 
 
 /**
- * 更新库存
+ * 生成仓储费用
  *
  * @author change
  */

src/main/java/com/zfire/mall/manager/schedule/StockInSchedule.java

@@ -431,11 +431,11 @@ public class StockInSchedule {
 
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.STOCK_TRANSFER, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FStockOrgId.FName,FStockOutOrgId.FName,FTransferBizType,FNote,FApproverId.FName,FCancellerId.FName,FBillTypeID.FName,FDocumentStatus,FDate,FApproveDate,FCancelDate");
+        request.setFieldKeys("FID,FBillNo,FStockOrgId.FName,FStockOutOrgId.FName,FTransferBizType,FNote,FApproverId.FName,FCancellerId.FName,FBillTypeID.FName,FDocumentStatus,FDate,FCancelDate");
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
-        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","fDate","approveDate","cancelDate"};
+        String[] fields = new String[]{"id","billNo","stockOrgId","stockOutOrgId","transferBizType","note","approverId","cancellerId","billType","documentStatus","fDate","cancelDate","approveDate"};
         List<KingDeeTransfer> objects = k3Logic.allSync(request, fields, KingDeeTransfer.class);
 
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
@@ -668,13 +668,13 @@ public class StockInSchedule {
         // 调用入库单接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.OTHER_OUT_STOCK, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FApproverId.FName,FApproveDate,FCancelDate," +
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FApproverId.FName,FCancelDate," +
                 "FNote,FDocumentStatus,FStockDirect");
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
 
         String[] fields = new String[]{"id","billNo","fDate","stockOrgId","approverId","approveDate","cancelDate",
-                "note","fdDocumentStatus","stockDirect"};
+                "note","fdDocumentStatus","stockDirect","approveDate"};
         request.setNotTime(true);
         List<KingDeeOtherStockOut> objects = k3Logic.allSync(request, fields, KingDeeOtherStockOut.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
@@ -927,14 +927,14 @@ public class StockInSchedule {
         // 调用入库单接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.OTHER_IN_STOCK, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FSupplierId,FApproverId.FName,FApproveDate,FCancellerId,FCancelDate," +
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FSupplierId,FApproverId.FName,FCancellerId,FCancelDate," +
                 "FNOTE,FDocumentStatus,FStockDirect");
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
 
-        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","supplierId","approverId","approveDate","cancellerId","cancelDate",
-                "note","fdDocumentStatus","stockDirect"};
+        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","supplierId","approverId","cancellerId","cancelDate",
+                "note","fdDocumentStatus","stockDirect","approveDate"};
         List<KingDeeOtherStockIn> objects = k3Logic.allSync(request, fields, KingDeeOtherStockIn.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
             kingDeeOtherStockInService.saveOrUpdateBatch(objects);
@@ -1059,14 +1059,14 @@ public class StockInSchedule {
         // 调用入库单接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_RET_BILL, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FPurchaseOrgId,FSupplierId,FApproverId.FName,FApproveDate,FCancelDate," +
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FPurchaseOrgId,FSupplierId,FApproverId.FName,FCancelDate," +
                 "FDESCRIPTION,FDocumentStatus");
         request.setFilterString(String.format(filterStr, orgNum));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
 
-        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","purchaseOrgId","supplierId","approverId","approveDate","cancelDate",
-                "abcdRemarks","fdDocumentStatus"};
+        String[] fields = new String[]{"id","billNo","fDate","stockOrgId","purchaseOrgId","supplierId","approverId","cancelDate",
+                "abcdRemarks","fdDocumentStatus","approveDate"};
         List<KingDeePurchaseStockOut> objects = k3Logic.allSync(request, fields, KingDeePurchaseStockOut.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
             kingDeePurchaseStockOutService.saveOrUpdateBatch(objects);
@@ -1320,14 +1320,14 @@ public class StockInSchedule {
         // 调用入库单接口
         RequestApiBean request = k3Logic.getInstance(orgId, orgNumber, KingDeeCons.PURCHASE_IN_STOCK, startTime, endTime);
         String filterStr = "FDocumentStatus = 'C' "+ k3Logic.supplySql("FApproveDate", request.getStartTime(), request.getEndTime());
-        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FDemandOrgId,FPurchaseOrgId,FSupplierId,FStockDeptId,FApproverId.FName,FApproveDate,FCancellerId,FCancelDate," +
+        request.setFieldKeys("FID,FBillNo,FDate,FStockOrgId,FDemandOrgId,FPurchaseOrgId,FSupplierId,FStockDeptId,FApproverId.FName,FCancellerId,FCancelDate," +
                 "FSupplyId.FName,FDocumentStatus");
         request.setFilterString(String.format(filterStr, orgNumber));
         request.setOrderString("FID ASC");
         request.setNotTime(true);
 
         String[] fields = new String[]{"id","billNo","fDate","stockOrgId","demandOrgId","purchaseOrgId","supplierId","stockDeptId","approverId","approveDate","cancellerId","cancelDate",
-                "supplyName","fdDocumentStatus"};
+                "supplyName","fdDocumentStatus","approveDate"};
         List<KingDeePurchaseStockIn> objects = k3Logic.allSync(request, fields, KingDeePurchaseStockIn.class);
         if (!org.springframework.util.CollectionUtils.isEmpty(objects)) {
             kingDeePurchaseStockInService.saveOrUpdateBatch(objects);