Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/schedule/YdScheduleTask.java

@@ -26,8 +26,8 @@ import java.util.Map;
 
 @Slf4j
 @Configuration
-//@EnableScheduling
-//@ConditionalOnProperty(name = {"enable.scheduling"})
+@EnableScheduling
+@ConditionalOnProperty(name = {"enable.scheduling"})
 public class YdScheduleTask {
 @Autowired
 private YdHuaGaoService ydHuaGaoService;
@@ -36,7 +36,7 @@ private YdHuaGaoService ydHuaGaoService;
     @Autowired
     private YDClient ydClient;
 
-    @Scheduled(cron = "0 0/5 * * * ?")
+    /*@Scheduled(cron = "0 0/5 * * * ?")
     public void sync() {
         log.info("定时同步-客户");
         try {
@@ -100,6 +100,7 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【发货通知单同步任务】执行过程中发生严重错误", e);
         }
     }
+
     @Scheduled(cron = "0 0/5 * * * ?")
     public void syncKdYdDeliveryDetail() {
         log.info("定时同步-发货通知单详情");
@@ -109,6 +110,20 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【发货通知单详情同步任务】执行过程中发生严重错误", e);
         }
     }
+
+    @Scheduled(cron = "0 0/5 * * * ?")
+    public void synckdYdZp() {
+        log.info("定时同步-发票单");
+        try {
+            ydHuaGaoService.synckdYdZp();
+        } catch (Exception e) {
+            log.error("【发票单同步任务】执行过程中发生严重错误", e);
+        }
+    }*/
+
+
+
+
     @Scheduled(cron = "0 0/5 * * * ?")
     public void synckdYdOutbound() {
         log.info("定时同步-出库单");
@@ -118,6 +133,7 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【出库单同步任务】执行过程中发生严重错误", e);
         }
     }
+
     @Scheduled(cron = "0 0/5 * * * ?")
     public void syncKdYdReceivable() {
         log.info("定时同步-应收单");
@@ -127,15 +143,7 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【应收单同步任务】执行过程中发生严重错误", e);
         }
     }
-    @Scheduled(cron = "0 0/5 * * * ?")
-    public void synckdYdZp() {
-        log.info("定时同步-发票单");
-        try {
-            ydHuaGaoService.synckdYdZp();
-        } catch (Exception e) {
-            log.error("【发票单同步任务】执行过程中发生严重错误", e);
-        }
-    }
+
     @Scheduled(cron = "0 0/5 * * * ?")
     public void synckdYdMaterial() {
         log.info("定时同步-物料信息");
@@ -145,6 +153,7 @@ private YdHuaGaoService ydHuaGaoService;
             log.error("【物料信息同步任务】执行过程中发生严重错误", e);
         }
     }
+
     @Scheduled(cron = "0 0/5 * * * ?")
     public void synckdYdPayment() {
         log.info("定时同步-synckdYdPayment");

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -567,7 +567,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
     public void syncReport(String type,String userId) {
         try {
             switch (type){
-                case "成品库存天数看看板": syncBDSerialMainFile();break;
+                case "成品库存天数看板": syncBDSerialMainFile();break;
                 case "成品/组件库存看板": syncSTKInventory();break;
                 case "不良物料退库统计看板": syncPRDReturnMtrl();break;
                 case "成品/样机出库看板": syncDLVNotice();break;
@@ -708,7 +708,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
 
         billQuery.setLimit(limit);
         billQuery.setFormId("SAL_DELIVERYNOTICE");
-        billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FSOEntryId,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
+        billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FEntity_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
         List<Map> filterString = new ArrayList<>();
         //审核日期为昨日到现在且单据状态等于已审核且明细收件人电话不为空
         filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前XX天之后
@@ -771,8 +771,8 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             }
             formData.put("textField_mfqhmwpu", F_QUXZ_Assistant);//销售类型
 
-            String fsoEntryId = UtilMap.getString(map, "FSOEntryId");
-            formData.put("textField_mfqf1fjm", fsoEntryId);//销售订单EntryId
+            String fEntityFEntryID = UtilMap.getString(map, "FEntity_FEntryID");
+            formData.put("textField_mfqf1fjm", fEntityFEntryID);//销售订单分录id
             formData.put("textField_mfqf1fj7", UtilMap.getString(map,"FMaterialId.FNumber"));//物料编码
             formData.put("textField_mfqf1fj8", UtilMap.getString(map,"FMaterialId.FName"));//物料名称
             formData.put("textField_mfqf1fj9", UtilMap.getString(map,"FMaterialId.FSpecification"));//物料规格
@@ -800,7 +800,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
 
             ydClient.operateData(YDParam.builder()
                     .formUuid("FORM-F7DB6FC6E47949A98BDD3DC344B3CBC1V7HY")
-                    .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_mfqf1fj5, textField_mfqf1fjm",fBillNo,fsoEntryId)))
+                    .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_mfqf1fj5, textField_mfqf1fjm",fBillNo,fEntityFEntryID)))
                     .formDataJson(JSONObject.toJSONString(formData))
                     .build(), YDConf.FORM_OPERATION.upsert);
         }

mjava-huagao/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB