与master分支代码保持一致

src/main/java/com/uas/erp/schedular/b2b/task/PurchaseNotifyTask.java

@@ -126,7 +126,7 @@ public class PurchaseNotifyTask extends AbstractTask {
 
     @TaskMapping(title = "上传结案送货提醒", fixedDelay = 60000)
     public void uploadPurchaseNotifyEnd() {
-        List<PurchaseNotify> notifies = jdbcTemplate.queryForBeanList("select * from (select purchasenotify.pn_id,ve_uu from purchasenotify left join purchase on pn_ordercode=pu_code left join vendor on pu_vendcode=ve_code where PN_SENDSTATUS='待上传' and pn_statuscode='CANCELED' and pu_sendstatus='已上传' and nvl(pu_ordertype,' ')<>'B2C' and pn_b2bid is not null and ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum<=400",
+        List<PurchaseNotify> notifies = jdbcTemplate.queryForBeanList("select * from (select purchasenotify.pn_id,ve_uu from purchasenotify left join purchase on pn_ordercode=pu_code left join vendor on pu_vendcode=ve_code where PN_SENDSTATUS='待上传' and pn_statuscode='CANCELED' and pu_sendstatus='已上传' and nvl(pu_ordertype,' ')<>'B2C' and pn_b2bid is not null and ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum<=50",
                 PurchaseNotify.class);
         if (!CollectionUtils.isEmpty(notifies)) {
             ContextHolder.setDataSize(notifies.size());

src/main/java/com/uas/erp/schedular/b2b/task/PurchaseTask.java

@@ -172,7 +172,7 @@ public class PurchaseTask extends AbstractTask {
         post("/erp/purchase/reply/back", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "上传主动回复的记录到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传主动回复的记录到平台", fixedDelay = 60000, enabled = false)
     public void uploadPurchaseReply() {
         List<PurchaseReply> replies = jdbcTemplate.queryForBeanList("select * from (select pr_id,pr_qty,pr_delivery,pr_remark,pr_pucode,pr_pddetno,pr_date,pr_recorder,b2b_pr_id,pr_type from PurchaseReply left join PurchaseDetail on pr_pucode=pd_code and pr_pddetno=pd_detno left join purchase on pd_puid=pu_id left join vendor on pu_vendcode=ve_code where PR_SENDSTATUS='待上传' and ve_uu is not null and nvl(ve_b2benable,0)=1 and nvl(b2b_pr_id,0)=0 order by pr_date) where rownum <= 500",
                 PurchaseReply.class);

src/main/java/com/uas/erp/schedular/b2b/task/SaleAPCheckTask.java

@@ -63,7 +63,7 @@ public class SaleAPCheckTask extends AbstractTask {
         }
         if (idStr.length() > 0) {
             // 完善明细
-            sqls.add("update ApcheckDetail set (ad_pdid,ad_taxrate) = (select pd_id,pd_taxrate from prodinout left join prodiodetail on pi_id=pd_piid  "
+            sqls.add("update ApcheckDetail set (ad_pdid,ad_taxrate,ad_prodcode,ad_prodcode) = (select pd_id,pd_taxrate,pd_prodcode from prodinout left join prodiodetail on pi_id=pd_piid  "
                     + " where pi_inoutno=ad_sourcecode and pd_pdno = ad_sourcedetno) where nvl(ad_sourcetype, ' ') = 'PRODINOUT' and ad_acid in ("
                     + idStr.toString() + ")");
             // 完善主记录

src/main/java/com/uas/erp/schedular/init/ReplyInitializer.java

@@ -0,0 +1,43 @@
+package com.uas.erp.schedular.init;
+
+import com.uas.erp.schedular.entity.MasterTaskConfigEntity;
+import com.uas.erp.schedular.repository.MasterTaskConfigRepository;
+import com.uas.erp.schedular.service.ScheduledTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by Pro1 on 2017/7/26.
+ */
+@Component
+public class ReplyInitializer implements CommandLineRunner {
+
+
+    @Autowired
+    private ScheduledTaskService scheduledTaskService;
+
+    @Autowired
+    private MasterTaskConfigRepository masterTaskConfigRepository;
+
+    @Override
+    public void run(String... strings) throws Exception {
+        List<MasterTaskConfigEntity> entity = masterTaskConfigRepository
+                .findByBeanNameAndMethodName("purchaseTask", "uploadPurchaseReply");
+        List<MasterTaskConfigEntity> entities = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(entity)) {
+            for (MasterTaskConfigEntity configEntity : entity) {
+                configEntity.setEnabled(false);
+                entities.add(configEntity);
+            }
+        }
+        if (!CollectionUtils.isEmpty(entities)) {
+            masterTaskConfigRepository.save(entities);
+        }
+    }
+}

src/main/java/com/uas/erp/schedular/repository/MasterTaskConfigRepository.java

@@ -34,4 +34,6 @@ public interface MasterTaskConfigRepository extends JpaRepository<MasterTaskConf
 
     List<MasterTaskConfigEntity> findByMasterNameAndModule(String masterName, String module);
 
+    List<MasterTaskConfigEntity> findByBeanNameAndMethodName(String beanName, String methodName);
+
 }