Преглед изворни кода

feat:本地运行轮询程序

liusw пре 6 година
родитељ
комит
87ff6f294e

+ 10 - 10
src/main/java/com/uas/erp/schedular/b2b/task/InquiryTask.java

@@ -19,10 +19,10 @@ import java.util.Map;
  * Created by Pro1 on 2017/7/28.
  */
 @Component
-@TaskMapping(title = "询价", role = Role.BUYER)
+@TaskMapping(title = "询价", role = Role.BUYER, enabled = true)
 public class InquiryTask extends AbstractTask {
 
-    @TaskMapping(title = "上传询价单", fixedDelay = 30000)
+    @TaskMapping(title = "上传询价单", fixedDelay = 30000, enabled = true)
     public void uploadInquiry() {
         Integer size = uploadProduct();
         if (size == 0) {
@@ -45,7 +45,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "从平台下载供应商的询价单报价", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载供应商的询价单报价", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadReply() throws Exception{
         List<InquiryDetail> details = getForList("/erp/purchase/inquiry/reply", InquiryDetail.class);
         if (!CollectionUtils.isEmpty(details)) {
@@ -179,7 +179,7 @@ public class InquiryTask extends AbstractTask {
         jdbcTemplate.batchExecute(sqls);
     }
 
-    @TaskMapping(title = "询价单提交后,上传平台", fixedDelay = 60000)
+    @TaskMapping(title = "询价单提交后,上传平台", fixedDelay = 60000, enabled = true)
     public void uploadCheckInquiry() {
         String idStr = jdbcTemplate.getString("select wm_concat(in_id) from (select in_id from inquiry where in_checkstatus = '已提交' and in_checksendstatus='待上传' and nvl(in_class,' ')<>'主动报价' and in_sendstatus='已上传' order by in_id) where rownum < 100");
         if (null != idStr) {
@@ -189,7 +189,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "询价单反提交后,上传平台", fixedDelay = 60000)
+    @TaskMapping(title = "询价单反提交后,上传平台", fixedDelay = 60000, enabled = true)
     public void uploadReCheckInquiry() {
         String idStr = jdbcTemplate.getString("select wm_concat(in_id) from (select in_id from inquiry where in_checkstatus = '在录入' and in_checksendstatus='已上传' and nvl(in_class,' ')<>'主动报价' and in_sendstatus='已上传' order by in_id) where rownum < 100");
         if (null != idStr) {
@@ -199,7 +199,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "上传买家对报价信息是否采纳的决策到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传买家对报价信息是否采纳的决策到平台", fixedDelay = 60000, enabled = true)
     public void uploadInquiryDecide() {
         List<InquiryDecide> replies = jdbcTemplate.queryForBeanList("select id_id,in_code,id_detno,id_isagreed id_agreed from InquiryDetail left join Inquiry on id_inid=in_id left join vendor on id_vendcode=ve_code where IN_SENDSTATUS='已上传' and nvl(in_class,' ')<>'主动报价' and ID_SENDSTATUS='待上传' and id_isagreed is not null and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and rownum < 100 order by in_code,id_detno",
                 InquiryDecide.class);
@@ -211,7 +211,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "上传买家对报价信息作废的决策到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传买家对报价信息作废的决策到平台", fixedDelay = 60000, enabled = true)
     public void uploadInquiryInvalid() {
         List<Inquiry> inquiries = jdbcTemplate.queryForBeanList("select * from Inquiry left join InquiryDetail on id_inid=in_id left join vendor on id_vendcode=ve_code where in_status = '已作废' and in_sendstatus <> '作废已上传' and nvl(in_class,' ')<>'主动报价'  and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and rownum <= 100 order by in_code",
                 Inquiry.class);
@@ -223,7 +223,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "从平台下载供应商下达到UAS的主动报价", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载供应商下达到UAS的主动报价", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadInquiries() {
         List<Inquiry> inquiries = getForList("/erp/purchase/quotation", Inquiry.class);
         if (!CollectionUtils.isEmpty(inquiries)) {
@@ -295,7 +295,7 @@ public class InquiryTask extends AbstractTask {
         post("/erp/purchase/quotation/back", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "上传买家对主动报价询价单的报价信息作废的决策到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传买家对主动报价询价单的报价信息作废的决策到平台", fixedDelay = 60000, enabled = true)
     public void uploadQuotationInvalid() {
         List<Inquiry> inquiries = jdbcTemplate.queryForBeanList("select * from Inquiry left join InquiryDetail on id_inid=in_id left join vendor on id_vendcode=ve_code where in_status = '已作废' and in_sendstatus <> '作废已上传' and nvl(in_class,' ')='主动报价'  and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and rownum <= 100 order by in_code",
                 Inquiry.class);
@@ -307,7 +307,7 @@ public class InquiryTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "上传买家对主动报价信息是否采纳的决策到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传买家对主动报价信息是否采纳的决策到平台", fixedDelay = 60000, enabled = true)
     public void uploadQuotationDecide() {
         List<InquiryDecide> decides = jdbcTemplate.queryForBeanList("select id_id,id_detno,b2b_qu_id,id_isagreed id_agreed from InquiryDetail left join Inquiry on id_inid=in_id left join vendor on id_vendcode=ve_code where IN_SENDSTATUS='已上传' and in_class='主动报价' and ID_SENDSTATUS='待上传' and id_isagreed is not null and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and b2b_qu_id is not null order by in_code,id_detno",
                 InquiryDecide.class);

+ 3 - 32
src/main/java/com/uas/erp/schedular/b2b/task/OrderCheckTask.java

@@ -21,13 +21,13 @@ import java.util.List;
  * Created by hejq on 2018-06-19.
  */
 @Component
-@TaskMapping(title = "订单检测", role = Role.PLAIN)
+@TaskMapping(title = "订单检测", role = Role.PLAIN, enabled = true)
 public class OrderCheckTask extends AbstractTask {
 
     /**
      * B2B采购验收单发现明细不存在记录下来,并通过轮询去获取相关数据,更新上传的数据
      */
-    @TaskMapping(title = "获取未上传采购单明细", fixedDelay = 60000)
+    @TaskMapping(title = "获取未上传采购单明细", fixedDelay = 60000, enabled = true)
     public void checkSaleItem() {
         List<NotExistOrders> orders = getForList("/erp/notExistOrders/saleItem", NotExistOrders.class);
         if (!CollectionUtils.isEmpty(orders)) {
@@ -59,7 +59,7 @@ public class OrderCheckTask extends AbstractTask {
     /**
      * B2B采购验等检测发现订单不存在时记录下来,通过轮询获取去更新采购单的上传状态
      */
-    @TaskMapping(title = "获取未上传采购单", fixedDelay = 60000)
+    @TaskMapping(title = "获取未上传采购单", fixedDelay = 60000, enabled = true)
     public void checkSaleMain() {
         List<NotExistOrders> orders = getForList("/erp/notExistOrders/saleMain", NotExistOrders.class);
         if (!CollectionUtils.isEmpty(orders)) {
@@ -116,33 +116,4 @@ public class OrderCheckTask extends AbstractTask {
     }
 
 
-    /**
-     * B2B采购验等检测发现订单不存在时记录下来,通过轮询获取去更新采购单的上传状态
-     */
-    @TaskMapping(title = "获取未上传委外单", fixedDelay = 60000)
-    public void checkMakeMain() {
-        List<NotExistOrders> orders = getForList("/erp/notExistOrders/makeMain", NotExistOrders.class);
-        if (!CollectionUtils.isEmpty(orders)) {
-            ContextHolder.setDataSize(orders.size());
-            List<Make> makes = new ArrayList<>();
-            for (NotExistOrders order : orders) {
-                Make make = jdbcTemplate.queryForBean("select make.*, ve_uu from make left join vendor on ma_vendcode=ve_code where ma_code ='" + order.getCode() + "'",
-                        Make.class);
-                if (null != make) {
-                    makes.add(make);
-                }
-                if (!CollectionUtils.isEmpty(makes)) {
-                    ContextHolder.setDataSize(makes.size());
-                    post("/erp/make", dataWrap(makes));
-                }
-            }
-            String idStr = CollectionUtil.getKeyString(orders, new CollectionUtil.KeyIterator<NotExistOrders>() {
-                @Override
-                public Object getKey(NotExistOrders order) {
-                    return order.getId();
-                }
-            });
-            post("/erp/notExistOrders/back", dataWrap(idStr));
-        }
-    }
 }

+ 2 - 2
src/main/java/com/uas/erp/schedular/b2b/task/ProdCheckTask.java

@@ -18,13 +18,13 @@ import java.util.List;
  * Created by hejq on 2018-06-19.
  */
 @Component
-@TaskMapping(title = "物料检测", role = Role.PLAIN)
+@TaskMapping(title = "物料检测", role = Role.PLAIN, enabled = true)
 public class ProdCheckTask extends AbstractTask {
 
     /**
      * B2B订单发现物料不存在会记录下来,现在上传数据方法已经更新,新增任务去获取未存在的物料数据
      */
-    @TaskMapping(title = "获取未下载物料", fixedDelay = 60000)
+    @TaskMapping(title = "获取未下载物料", fixedDelay = 60000, enabled = true)
     public void checkProduct() {
         List<Prod> prods = getForList("/erp/product/notExistProds", Prod.class);
         if (!CollectionUtils.isEmpty(prods)) {

+ 5 - 5
src/main/java/com/uas/erp/schedular/b2b/task/PurchaseAPBillTask.java

@@ -16,10 +16,10 @@ import java.util.List;
  * Created by Pro1 on 2017/8/2.
  */
 @Component
-@TaskMapping(title = "应付发票", role = Role.BUYER)
+@TaskMapping(title = "应付发票", role = Role.BUYER, enabled = true)
 public class PurchaseAPBillTask extends AbstractTask {
 
-    @TaskMapping(title = "上传应付发票", fixedDelay = 120000)
+    @TaskMapping(title = "上传应付发票", fixedDelay = 120000, enabled = true)
     public void uploadAPBill() {
         List<PurchaseAPBill> purchaseAPBills = getAPBillUpload();
         if (!CollectionUtils.isEmpty(purchaseAPBills)) {
@@ -57,7 +57,7 @@ public class PurchaseAPBillTask extends AbstractTask {
         return purchaseAPBills;
     }
 
-    @TaskMapping(title = "上传已反过账的应付发票", fixedDelay = 120000)
+    @TaskMapping(title = "上传已反过账的应付发票", fixedDelay = 120000, enabled = true)
     public void uploadNonpostAPBill() {
         List<PurchaseAPBill> apBills = jdbcTemplate.queryForBeanList("select ab_id, ab_code from apbill where ab_class = '应付发票' and ab_status = '未过账' and ab_sendstatus = '上传中'",
                 PurchaseAPBill.class);
@@ -70,7 +70,7 @@ public class PurchaseAPBillTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "上传货款调账", fixedDelay = 120000)
+    @TaskMapping(title = "上传货款调账", fixedDelay = 120000, enabled = true)
     public void uploadApbillAdjustment() {
         List<PurchaseAPBill> apBills = getApbillAdjustmentUpload();
         if (!CollectionUtils.isEmpty(apBills)) {
@@ -99,7 +99,7 @@ public class PurchaseAPBillTask extends AbstractTask {
         return purchaseAPBills;
     }
 
-    @TaskMapping(title = "上传货款调账反过账的单据", fixedDelay = 120000)
+    @TaskMapping(title = "上传货款调账反过账的单据", fixedDelay = 120000, enabled = true)
     public void uploadNonpostAdjustment() {
         List<PurchaseAPBill> apBills = jdbcTemplate.queryForBeanList("select ab_id, ab_code from apbill where ab_class = '其它应付单' and ab_status = '未过账' and ab_sendstatus = '上传中'",
                 PurchaseAPBill.class);

+ 8 - 8
src/main/java/com/uas/erp/schedular/b2b/task/PurchaseProdInOutTask.java

@@ -18,10 +18,10 @@ import java.util.List;
  * Created by Pro1 on 2017/8/3.
  */
 @Component
-@TaskMapping(title = "采购验收/退", role = Role.BUYER)
+@TaskMapping(title = "采购验收/退", role = Role.BUYER, enabled = true)
 public class PurchaseProdInOutTask extends AbstractTask {
 
-    @TaskMapping(title = "上传采购验收单(已过账)", fixedDelay = 60000)
+    @TaskMapping(title = "上传采购验收单(已过账)", fixedDelay = 60000, enabled = true)
     public void uploadProdInOut() {
         List<PurchaseProdInOut> prodInOuts = getProInOutUpload();
         if (!CollectionUtils.isEmpty(prodInOuts)) {
@@ -50,7 +50,7 @@ public class PurchaseProdInOutTask extends AbstractTask {
         return prodInOuts;
     }
 
-    @TaskMapping(title = "上传已反过账的采购验收单", fixedDelay = 60000)
+    @TaskMapping(title = "上传已反过账的采购验收单", fixedDelay = 60000, enabled = true)
     public void uploadNonpostAccept() {
         uploadNonpost("采购验收单", "/erp/purchase/prodInOut/nonPosting");
     }
@@ -82,7 +82,7 @@ public class PurchaseProdInOutTask extends AbstractTask {
         return prodInOuts;
     }
 
-    @TaskMapping(title = "上传已反过账的采购验退单", fixedDelay = 60000)
+    @TaskMapping(title = "上传已反过账的采购验退单", fixedDelay = 60000, enabled = true)
     public void uploadNonpostReturn() {
         uploadNonpost("采购验退单", "/erp/purchase/prodReturn/nonPosting");
     }
@@ -114,12 +114,12 @@ public class PurchaseProdInOutTask extends AbstractTask {
         return prodInOuts;
     }
 
-    @TaskMapping(title = "上传已反过账的不良品入库单", fixedDelay = 60000)
+    @TaskMapping(title = "上传已反过账的不良品入库单", fixedDelay = 60000, enabled = true)
     public void uploadNonpostBadIn() {
         uploadNonpost("不良品入库单", "/erp/purchase/prodBadIn/nonPosting");
     }
 
-    @TaskMapping(title = "上传不良品出库单", fixedDelay = 60000)
+    @TaskMapping(title = "上传不良品出库单", fixedDelay = 60000, enabled = true)
     public void uploadProdBadOut() {
         List<PurchaseProdInOut> prodBadOuts = getProdBadOutUpload();
         if (!CollectionUtils.isEmpty(prodBadOuts)) {
@@ -146,7 +146,7 @@ public class PurchaseProdInOutTask extends AbstractTask {
         return prodInOuts;
     }
 
-    @TaskMapping(title = "上传已反过账的不良品出库单", fixedDelay = 60000)
+    @TaskMapping(title = "上传已反过账的不良品出库单", fixedDelay = 60000, enabled = true)
     public void uploadNonpostBadOut() {
         uploadNonpost("不良品出库单", "/erp/purchase/prodBadOut/nonPosting");
     }
@@ -253,7 +253,7 @@ public class PurchaseProdInOutTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "更新出入单付款金额", fixedDelay = 60000)
+    @TaskMapping(title = "更新出入单付款金额", fixedDelay = 60000, enabled = true)
     public void uploadUpdateProdIoPayment() {
         String sql = "select * from (select piCode,piClass,piDetNo,amount,inDate,status,pdId from prodIoPay where status = '待上传' " +
                 "and piClass in ('采购验收单', '采购验退单', '不良品入库单', '不良品出库单', '委外验收单', '委外验退单', '其它应付单')" +

+ 5 - 29
src/main/java/com/uas/erp/schedular/b2b/task/PurchaseTask.java

@@ -21,10 +21,10 @@ import java.util.List;
  * Created by Pro1 on 2017/8/3.
  */
 @Component
-@TaskMapping(title = "采购", role = Role.BUYER)
+@TaskMapping(title = "采购", role = Role.BUYER, enabled = true)
 public class PurchaseTask extends AbstractTask {
 
-    @TaskMapping(title = "上传采购订单", fixedDelay = 30000)
+    @TaskMapping(title = "上传采购订单", fixedDelay = 30000, enabled = true)
     public void uploadPurchase() {
         List<Purchase> purchases = getPurchasesUpload();
         if (!CollectionUtils.isEmpty(purchases)) {
@@ -85,7 +85,7 @@ public class PurchaseTask extends AbstractTask {
         return thisPost;
     }
 
-    @TaskMapping(title = "从平台下载供应商的回复记录", fixedDelay = 30000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载供应商的回复记录", fixedDelay = 30000, method = Method.DOWNLOAD, enabled = true)
     public void downloadReply() {
         List<PurchaseReply> replies = getForList("/erp/purchase/reply", PurchaseReply.class);
         if (!CollectionUtils.isEmpty(replies)) {
@@ -97,18 +97,6 @@ public class PurchaseTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "从平台下载更新代采订单可发货状态", fixedDelay = 30000, method = Method.DOWNLOAD)
-    public void downloadhasIssued() {
-        List<PurchaseDetail> issued = getForList("/erp/purchase/issued", PurchaseDetail.class);
-        if (!CollectionUtils.isEmpty(issued)) {
-            ContextHolder.setDataSize(issued.size());
-            savePurchaseIssued(issued);
-            // 回执
-            onIssuedSuccess(issued);
-            // TODO notice++
-        }
-    }
-
     /**
      * 更新可发货状态
      * @param issued
@@ -172,20 +160,8 @@ public class PurchaseTask extends AbstractTask {
         post("/erp/purchase/reply/back", dataWrap(idStr));
     }
 
-    @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 coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 and nvl(b2b_pr_id,0)=0 order by pr_date) where rownum <= 10",
-                PurchaseReply.class);
-        if (!CollectionUtils.isEmpty(replies)) {
-            ContextHolder.setDataSize(replies.size());
-            post("/erp/purchase/reply", dataWrap(replies));
-            // 更新状态
-            String idStr = CollectionUtil.getKeyString(replies);
-            jdbcTemplate.execute("update PurchaseReply set pr_sendstatus='已下载' where pr_id in (" + idStr + ")");
-        }
-    }
 
-    @TaskMapping(title = "上传结案、反结案采购订单", fixedDelay = 60000)
+    @TaskMapping(title = "上传结案、反结案采购订单", fixedDelay = 60000, enabled = true)
     public void uploadPurchaseEnd() {
         List<PurchaseDetailEnd> details = jdbcTemplate.queryForBeanList("select * from (select pd_id,pd_code,pd_detno,case when pd_mrpstatuscode='FINISH' then 1 else 0 end pd_ended from PurchaseDetail left join purchase on pd_puid=pu_id left join vendor on pu_vendcode=ve_code where PU_SENDSTATUS='已上传' and nvl(pu_ordertype,' ')<>'B2C' and pd_endstatus='待上传' and coalesce(ve_uu, '0') <> '0' and nvl(ve_b2benable,0)<>0 order by pd_code,pd_detno) where rownum <= 200",
                 PurchaseDetailEnd.class);
@@ -198,7 +174,7 @@ public class PurchaseTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "从平台下载打印日志", fixedDelay = 120000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载打印日志", fixedDelay = 120000, method = Method.DOWNLOAD, enabled = true)
     public void downloadPrintLog() {
         List<MessageLog> logs = getForList("/erp/purchase/print", MessageLog.class);
         if (!CollectionUtils.isEmpty(logs)) {

+ 6 - 6
src/main/java/com/uas/erp/schedular/b2b/task/SaleDownChangeTask.java

@@ -24,13 +24,13 @@ import java.util.List;
  * Created by Pro1 on 2017/8/4.
  */
 @Component
-@TaskMapping(title = "采购变更", role = Role.SELLER)
+@TaskMapping(title = "采购变更", role = Role.SELLER, enabled = true)
 public class SaleDownChangeTask extends AbstractTask {
 
     @Autowired
     private SaleChangeAgent saleChangeAgent;
 
-    @TaskMapping(title = "从平台下载客户下达到平台的采购变更单", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载客户下达到平台的采购变更单", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadSaleDownChange() {
         List<SaleDownChange> changes = getForList("/erp/sale/change", SaleDownChange.class);
         if (!CollectionUtils.isEmpty(changes)) {
@@ -46,7 +46,7 @@ public class SaleDownChangeTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title = "从平台下载平台新增的采购变更单(买方b2b)", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载平台新增的采购变更单(买方b2b)", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadSaleDownChangeB2b() {
         List<SaleDownChange> changes = getForList("/erp/sale/change/b2b", SaleDownChange.class);
         if (!CollectionUtils.isEmpty(changes)) {
@@ -115,7 +115,7 @@ public class SaleDownChangeTask extends AbstractTask {
         post("/erp/sale/change", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "下载直接在b2b平台回复的信息,修改到客户采购变更单、客户采购单", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "下载直接在b2b平台回复的信息,修改到客户采购变更单、客户采购单", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadChangeReply() {
         List<SaleDownChangeReply> replies = getForList("/erp/sale/change/reply", SaleDownChangeReply.class);
         if (!CollectionUtils.isEmpty(replies)) {
@@ -240,7 +240,7 @@ public class SaleDownChangeTask extends AbstractTask {
         post("/erp/sale/change/reply/back", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "下载直接在平台回复的信息,修改平台客户采购变更单、客户采购单", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "下载直接在平台回复的信息,修改平台客户采购变更单、客户采购单", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void uploadSaleChangeReply() {
         List<SaleDownChangeReply> replies = jdbcTemplate.queryForBeanList("select b2b_pc_id,sc_id,sc_code,sc_agreed,sc_replyremark from SaleDownChange where SC_SENDSTATUS='待上传' and sc_agreed is not null and sc_custuu is not null",
                 SaleDownChangeReply.class);
@@ -253,7 +253,7 @@ public class SaleDownChangeTask extends AbstractTask {
         }
     }
 
-    @TaskMapping(title ="上传ERP供应商回复信息,修改采购变更单、客户采购单",fixedDelay = 60000,method = Method.UPLOAD)
+    @TaskMapping(title ="上传ERP供应商回复信息,修改采购变更单、客户采购单",fixedDelay = 60000,method = Method.UPLOAD, enabled = true)
     public void downSaleChangeReplyB2b() {
         List<SaleDownChangeReply> replies = jdbcTemplate.queryForBeanList("select b2b_pc_id,sc_id,sc_code,sc_agreed,sc_replyremark from SaleDownChange where sc_agreed is not null and sc_custuu is not null and SC_SENDSTATUS = '待上传'",
                 SaleDownChangeReply.class);

+ 5 - 5
src/main/java/com/uas/erp/schedular/b2b/task/SaleNotifyDownTask.java

@@ -21,10 +21,10 @@ import java.util.List;
  * Created by Pro1 on 2017/8/4.
  */
 @Component
-@TaskMapping(title = "送货提醒", role = Role.SELLER)
+@TaskMapping(title = "送货提醒", role = Role.SELLER, enabled = true)
 public class SaleNotifyDownTask extends AbstractTask {
 
-    @TaskMapping(title = "从平台下载客户下达到平台的送货提醒", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载客户下达到平台的送货提醒", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadSaleNotifyDown() {
         List<SaleNotifyDown> downs = getForList("/erp/sale/notice", SaleNotifyDown.class);
         if (!CollectionUtils.isEmpty(downs)) {
@@ -85,7 +85,7 @@ public class SaleNotifyDownTask extends AbstractTask {
         post("/erp/sale/notice", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "下载直接在平台做的发货单", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "下载直接在平台做的发货单", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadSaleOut() {
         List<SaleOut> outs = getForList("/erp/sale/notice/send", SaleOut.class);
         if (!CollectionUtils.isEmpty(outs)) {
@@ -128,7 +128,7 @@ public class SaleNotifyDownTask extends AbstractTask {
         post("/erp/sale/notice/send/back", dataWrap(idStr));
     }
 
-    @TaskMapping(title = "上传发货单到平台", fixedDelay = 60000)
+    @TaskMapping(title = "上传发货单到平台", fixedDelay = 60000, enabled = true)
     public void uploadSaleOut() {
         final List<SaleOut> outs = getSaleOut();
         if (!CollectionUtils.isEmpty(outs)) {
@@ -190,7 +190,7 @@ public class SaleNotifyDownTask extends AbstractTask {
         return validOuts;
     }
 
-    @TaskMapping(title = "从平台下载客户下达到平台的结案、反结案送货提醒", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从平台下载客户下达到平台的结案、反结案送货提醒", fixedDelay = 60000, method = Method.DOWNLOAD, enabled = true)
     public void downloadNotifyDownEnd() {
         List<SaleNotifyDownEnd> ends = getForList("/erp/sale/notice/end", SaleNotifyDownEnd.class);
         if (!CollectionUtils.isEmpty(ends)) {

+ 3 - 3
src/main/java/com/uas/erp/schedular/publicproduct/task/ProdTask.java

@@ -19,13 +19,13 @@ import java.util.List;
  * @date 2018-01-19 10:53
  */
 @Component
-@TaskMapping(title = "公共物料")
+@TaskMapping(title = "公共物料", enabled = true)
 public class ProdTask extends AbstractTask {
 
     /**
      * 默认8到21点间每小时执行一次
      */
-    @TaskMapping(title = "上传物料到公共服务", fixedDelay = 60000)
+    @TaskMapping(title = "上传物料到公共服务", fixedDelay = 60000, enabled = true)
     public void uploadProduct() {
         List<Prod> prods = jdbcTemplate.queryForBeanList("select * from (select pr_id,pr_code,pr_detail,pr_spec,pr_unit,pr_zxbzs,pr_zxdhl,pr_leadtime,pr_ltinstock,pr_brand,pr_issale,pr_ispurchase,pr_isshow,pr_ispubsale,pr_uuid,pr_orispeccode from product where  pr_sendstatus='待上传' and  pr_status = '已审核' order by pr_id) where rownum <= 500",
                 Prod.class);
@@ -44,7 +44,7 @@ public class ProdTask extends AbstractTask {
     /**
      * 默认8到21点间每小时第15分钟执行一次
      */
-    @TaskMapping(title = "从公共服务下载更新物料信息", cron = "0 15 8-21 * * *", method = Method.DOWNLOAD)
+    @TaskMapping(title = "从公共服务下载更新物料信息", cron = "0 15 8-21 * * *", method = Method.DOWNLOAD, enabled = true)
     public void downloadProduct() {
         List<Prod> prods = getForList("/product/backtouas", Prod.class);
         if (!CollectionUtils.isEmpty(prods)) {