Browse Source

更新物料上传获取UU号为MASTER信息中的UU号

hejq 7 years ago
parent
commit
a4b8834d35
1 changed files with 17 additions and 31 deletions
  1. 17 31
      src/main/java/com/uas/erp/schedular/publicproduct/task/ProdTask.java

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

@@ -1,7 +1,7 @@
 package com.uas.erp.schedular.publicproduct.task;
 
+import com.uas.erp.schedular.entity.Master;
 import com.uas.erp.schedular.publicproduct.domain.Prod;
-import com.uas.erp.schedular.publicinquiry.domain.Enterprise;
 import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.task.support.TaskMapping;
 import com.uas.erp.schedular.util.CollectionUtil;
@@ -27,18 +27,16 @@ public class ProdTask extends AbstractTask {
      */
     @TaskMapping(title = "上传物料到公共服务", fixedDelay = 60000)
     public void uploadProduct() {
-        Enterprise enterprise = getEnterprise();
-        if (null != enterprise) {
-            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);
-            logger.info("上传物料: " + prods.size());
-            if (!CollectionUtils.isEmpty(prods)) {
-                ContextHolder.increaseDataSize(prods.size());
-                new StatusBasedHandler<Prod>("product", "pr_id", "PR_SENDSTATUS", "/product/cycleupdate?enUU=" + enterprise.getEn_uu(), prods).run();
-                if (prods.size() == DATA_SIZE_LIMIT) {
-                    // 递归,直到没有需要上传的数据
-                    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);
+        logger.info("上传物料: " + prods.size());
+        if (!CollectionUtils.isEmpty(prods)) {
+            ContextHolder.increaseDataSize(prods.size());
+            Master master = ContextHolder.getMaster();
+            new StatusBasedHandler<Prod>("product", "pr_id", "PR_SENDSTATUS", "/product/cycleupdate?enUU=" + master.getMa_uu(), prods).run();
+            if (prods.size() == DATA_SIZE_LIMIT) {
+                // 递归,直到没有需要上传的数据
+                uploadProduct();
             }
         }
     }
@@ -48,15 +46,12 @@ public class ProdTask extends AbstractTask {
      */
     @TaskMapping(title = "从公共服务下载更新物料信息", cron = "0 15 8-21 * * *", method = Method.DOWNLOAD)
     public void downloadProduct() {
-        Enterprise enterprise = getEnterprise();
-        if (null != enterprise) {
-            List<Prod> prods = getForList("/product/backtouas", Prod.class);
-            if (!CollectionUtils.isEmpty(prods)) {
-                ContextHolder.setDataSize(prods.size());
-                saveProdDown(prods);
-                // 回执
-                downloadSuccess(prods);
-            }
+        List<Prod> prods = getForList("/product/backtouas", Prod.class);
+        if (!CollectionUtils.isEmpty(prods)) {
+            ContextHolder.setDataSize(prods.size());
+            saveProdDown(prods);
+            // 回执
+            downloadSuccess(prods);
         }
     }
 
@@ -88,13 +83,4 @@ public class ProdTask extends AbstractTask {
         post("/product/refreshDownloadstatus", dataWrap(idStr));
     }
 
-    /**
-     * 获取企业信息
-     *
-     * @return
-     */
-    public Enterprise getEnterprise() {
-        Enterprise enterprise = jdbcTemplate.queryForBean("select en_address, en_uu, en_name from enterprise where en_uu is not null", Enterprise.class);
-        return enterprise;
-    }
 }