Merge remote-tracking branch 'origin/master'

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

@@ -280,16 +280,6 @@ public class AbstractTask {
         }
     }
 
-    /**
-     * 处理物料上传的工具
-     */
-    protected final class ProductHandler extends StatusBasedHandler<Prod>{
-
-        public ProductHandler(List<Prod> data) {
-            super("product", "pr_id", "PR_SENDSTATUS", "/erp/product", data);
-        }
-    }
-
     /**
      * 查找附件
      * @param attachIds 附件ID

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

@@ -22,7 +22,6 @@ public class InquiryMouldTask extends AbstractTask {
 
     @TaskMapping(title = "上传模具询价单", fixedDelay = 60000)
     public void uploadInquiryMould() {
-        uploadProduct();
         List<InquiryMould> inquiries = getInquiryMouldUpload();
         if (!CollectionUtils.isEmpty(inquiries)) {
             ContextHolder.setDataSize(inquiries.size());
@@ -30,21 +29,6 @@ public class InquiryMouldTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final 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 from product where exists(select 1 from inquirymoulddetail left join inquirymoulddet on ind_iddid=idd_id left join inquirymould on idd_inid=in_id left join vendor on in_vendcode=ve_code  where (IN_SENDSTATUS='待上传' or IN_SENDSTATUS='上传中') and nvl(in_sourcetype,' ')<>'模具报价单'and ve_uu is not null and pr_code=ind_prodcode and pr_sendstatus<>'已上传')) where rownum <= 500",
-                Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的模具询价单
      *

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

@@ -1,6 +1,5 @@
 package com.uas.erp.schedular.b2b.task;
 
-import com.uas.erp.schedular.b2b.domain.Prod;
 import com.uas.erp.schedular.b2b.domain.PurchaseAPBill;
 import com.uas.erp.schedular.b2b.domain.PurchaseAPBillDetail;
 import com.uas.erp.schedular.task.support.Role;
@@ -22,7 +21,6 @@ public class PurchaseAPBillTask extends AbstractTask {
 
     @TaskMapping(title = "上传应付发票", fixedDelay = 120000)
     public void uploadAPBill() {
-        uploadProduct();
         List<PurchaseAPBill> purchaseAPBills = getAPBillUpload();
         if (!CollectionUtils.isEmpty(purchaseAPBills)) {
             ContextHolder.setDataSize(purchaseAPBills.size());
@@ -40,21 +38,6 @@ public class PurchaseAPBillTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final 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 from product where exists (select 1 from apbill left join vendor on ab_vendcode=ve_code left join apbilldetail on abd_abid=ab_id where (ab_SENDSTATUS='待上传' or ab_SENDSTATUS='上传中') and ab_statuscode='POSTED' and ve_uu is not null and nvl(ve_b2benable,0)=1 and abd_prodcode=pr_code) and nvl(pr_sendstatus,' ')<>'已上传' order by pr_id) where rownum <= 500",
-                Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的应付发票
      *

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

@@ -10,11 +10,9 @@ import com.uas.erp.schedular.util.CollectionUtil;
 import com.uas.erp.schedular.util.ContextHolder;
 import com.uas.erp.schedular.util.NumberUtil;
 import com.uas.erp.schedular.util.StringUtil;
-import org.omg.CORBA.SystemException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +29,6 @@ public class PurchaseChangeTask extends AbstractTask {
 
     @TaskMapping(title = "上传采购变更单", fixedDelay = 60000)
     public void uploadPurchaseChange() {
-        uploadProduct();
         List<PurchaseChange> changes = getPurchaseChangeUpload();
         if (!CollectionUtils.isEmpty(changes)) {
             ContextHolder.setDataSize(changes.size());
@@ -39,21 +36,6 @@ public class PurchaseChangeTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final List<Prod> prods = jdbcTemplate.queryForBeanList("select * from (select distinct product.* from product where exists (select 1 from purchasechange left join purchase on pc_purccode=pu_code left join vendor on pu_vendcode=ve_code left join purchasechangedetail on pcd_pcid=pc_id where PC_SENDSTATUS='待上传' and nvl(pu_ordertype,' ')<>'B2C' and nvl(pc_agreed,1)<>0 and pc_statuscode in ('AUDITED','TO_CONFIRM') and ve_uu is not null and nvl(ve_b2benable,0)=1 and pcd_newprodcode=pr_code) and pr_statuscode='AUDITED' and nvl(pr_sendstatus,' ')<>'已上传') where rownum <= 500",
-                Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的采购变更单
      *

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

@@ -21,7 +21,6 @@ public class PurchaseForecastTask extends AbstractTask {
 
     @TaskMapping(title = "上传采购预测单", fixedDelay = 60000)
     public void uploadPurchaseForecasts() {
-        uploadProduct();
         List<PurchaseForecast> purchaseForecasts = getPurchaseForecastsUpload();
         if (!CollectionUtils.isEmpty(purchaseForecasts)) {
             ContextHolder.setDataSize(purchaseForecasts.size());
@@ -29,24 +28,6 @@ public class PurchaseForecastTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final List<Prod> prods = jdbcTemplate.queryForBeanList("select * from (select distinct product.* from product where exists " +
-                " (select 1 from purchaseforecastdetail left join vendor on pfd_vendcode=ve_code " +
-                " left join purchaseForecast on pfd_pfid=pf_id " +
-                " where PF_SENDSTATUS='待上传' and ve_uu is not null and nvl(ve_b2benable,0)=1 and pfd_prodcode=pr_code) " +
-                " and pr_statuscode='AUDITED' and nvl(pr_sendstatus,' ')<>'已上传') where rownum <= 500", Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的采购预测
      *
@@ -61,7 +42,8 @@ public class PurchaseForecastTask extends AbstractTask {
             List<PurchaseForecastDetail> purchaseForecastDetails = jdbcTemplate.queryForBeanList("select purchaseforecastdetail.*, ve_uu, ve_contact, ve_contactuu from purchaseforecastDetail "
                                     + "left join vendor on pfd_vendcode=ve_code where pfd_pfid=? and ve_uu is not null and nvl(ve_b2benable,0)=1 ",
                     PurchaseForecastDetail.class, purchaseForecast.getPf_id());
-            if (purchaseForecastDetails.size() > 0) {// 存在有效的明细的单上传，明细都无效的不上传
+            // 存在有效的明细的单上传，明细都无效的不上传
+            if (purchaseForecastDetails.size() > 0) {
                 purchaseForecast.setPurchaseForecastDetails(purchaseForecastDetails);
                 forecasts.add(purchaseForecast);
             }

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

@@ -22,7 +22,7 @@ public class PurchaseNotifyTask extends AbstractTask {
 
     @TaskMapping(title = "上传送货提醒", fixedDelay = 30000)
     public void uploadPurchaseNotify() {
-        List<PurchaseNotify> notifies = jdbcTemplate.queryForBeanList("select * from (select purchasenotify.*,ve_uu,pr_zxbzs from purchasenotify left join purchase on pn_ordercode=pu_code left join vendor on pu_vendcode=ve_code left join product on pr_code=pn_prodcode where (nvl(PN_SENDSTATUS,' ')='待上传' or nvl(pn_sendstatus,' ')='上传中') and pn_status<>'已取消' and pu_sendstatus='已上传' and nvl(pu_ordertype,' ')<>'B2C' and ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum <= 100",
+        List<PurchaseNotify> notifies = jdbcTemplate.queryForBeanList("select * from (select purchasenotify.*,ve_uu,pr_zxbzs from purchasenotify left join purchase on pn_ordercode=pu_code left join vendor on pu_vendcode=ve_code left join product on pr_code=pn_prodcode where (nvl(PN_SENDSTATUS,' ')='待上传' or nvl(pn_sendstatus,' ')='上传中') and pn_status<>'已取消' and nvl(pu_b2bid, 0) <> 0 and nvl(pu_ordertype,' ')<>'B2C' and ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum <= 100",
                 PurchaseNotify.class);
         if (!CollectionUtils.isEmpty(notifies)) {
             ContextHolder.setDataSize(notifies.size());
@@ -116,7 +116,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 ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum<=100",
+        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 ve_uu is not null and nvl(ve_b2benable,0)=1 order by pn_indate) where rownum<=400",
                 PurchaseNotify.class);
         if (!CollectionUtils.isEmpty(notifies)) {
             ContextHolder.setDataSize(notifies.size());

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

@@ -1,6 +1,5 @@
 package com.uas.erp.schedular.b2b.task;
 
-import com.uas.erp.schedular.b2b.domain.Prod;
 import com.uas.erp.schedular.b2b.domain.ProdInOutRefreshPrice;
 import com.uas.erp.schedular.b2b.domain.PurchaseProdInOut;
 import com.uas.erp.schedular.b2b.domain.PurchaseProdInOutDetail;
@@ -56,7 +55,6 @@ public class PurchaseProdInOutTask extends AbstractTask {
 
     @TaskMapping(title = "上传采购验退单", fixedDelay = 60000)
     public void uploadProdReturn() {
-        uploadProduct();
         List<PurchaseProdInOut> prodReturns = getProdReturnUpload();
         if (!CollectionUtils.isEmpty(prodReturns)) {
             ContextHolder.setDataSize(prodReturns.size());
@@ -65,21 +63,6 @@ public class PurchaseProdInOutTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final 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 from product where  exists (select 1 from prodinout left join vendor on prodinout.pi_cardcode = vendor.ve_code left join prodiodetail on pi_id=pd_piid where pi_class='采购验退单' and pi_status = '已过账' and (pi_sendstatus = '待上传' or pi_sendstatus='上传中') and ve_uu is not null and nvl(ve_b2benable,0)=1 and pd_prodcode=pr_code) and nvl(pr_sendstatus,' ')<>'已上传' order by pr_id)  where rownum <= 500",
-                Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的采购验退单
      *
@@ -235,7 +218,7 @@ public class PurchaseProdInOutTask extends AbstractTask {
      * @return
      */
     List<ProdInOutRefreshPrice> getPriceBatchUpdate(String type) {
-        String sql = "select pbu_pdNo,pbu_inoutNo,pbu_orderPrice,pbu_id,pbu_taxRate,pd_prodCode,pd_orderDetNo from PriceBatchUpdate " +
+        String sql = "select pbu_detno pbu_pdNo,pbu_inoutNo,pbu_orderPrice,pbu_id,pbu_taxRate,pd_prodCode,pd_orderDetNo from PriceBatchUpdate " +
                 "left join prodIoDetail on pbu_pdId = pd_id " +
                 "where pbu_piClass = '" + type + "' and pbu_status = '99' and pbu_sendStatus = '待上传' and rowNum < 200";
         return jdbcTemplate.queryForBeanList(sql, ProdInOutRefreshPrice.class);

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

@@ -39,25 +39,6 @@ public class PurchaseSampleTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final List<Prod> prods = jdbcTemplate.queryForBeanList("select * from (select distinct product.* from product where exists" +
-                " (select 1 from productsample left join productsampledetail on" +
-                " productsample.ps_id=productsampledetail.pd_psid left join vendor on" +
-                " productsampledetail.pd_vendcode=vendor.ve_code where productsample.ps_sendstatus='待上传'" +
-                " and ve_uu is not null and nvl(ve_b2benable,0)=1 and productsample.ps_prodcode=pr_code)" +
-                " and nvl(pr_sendstatus,' ')<>'已上传') where rownum <= 500", Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-            if (prods.size() == DATA_SIZE_LIMIT) {
-                // 递归，直到相关物料全部传完
-                uploadProduct();
-            }
-        }
-    }
-
     /**
      * 获取需要上传的打样申请单
      *

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

@@ -78,8 +78,9 @@ public class PurchaseTask extends AbstractTask {
             }
             purchase.setPurchaseDetails(purchaseDetails);
             thisPost.add(purchase);
-            if ((count = count + purchaseDetails.size()) >= DATA_SIZE_LIMIT)
+            if ((count = count + purchaseDetails.size()) >= DATA_SIZE_LIMIT) {
                 break;
+            }
         }
         return thisPost;
     }

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

@@ -271,7 +271,6 @@ public class QuotationDownTask extends AbstractTask {
 
     @TaskMapping(title = "上传主动报价", fixedDelay = 60000)
     public void uploadQuotation() {
-        uploadProduct();
         List<Quotation> quotations = getQuotationsUpload();
         if (!CollectionUtils.isEmpty(quotations)) {
             ContextHolder.setDataSize(quotations.size());
@@ -286,17 +285,6 @@ public class QuotationDownTask extends AbstractTask {
         }
     }
 
-    /**
-     * 上传物料资料
-     */
-    private void uploadProduct() {
-        final List<Prod> prods = jdbcTemplate.queryForBeanList("select distinct product.* from product where exists (select 1 from quotation left join customer on qu_custcode=cu_code left join quotationdetail on qd_quid=qu_id where QU_SENDSTATUS='待上传' and cu_uu is not null and qd_prodcode=pr_code) and pr_statuscode='AUDITED' and nvl(pr_sendstatus,' ')<>'已上传'",
-                Prod.class);
-        if (!CollectionUtils.isEmpty(prods)) {
-            new ProductHandler(prods).run();
-        }
-    }
-
     /**
      * 获取需要上传的主动报价
      *

src/main/resources/database/template/deputyOrder.xml

@@ -93,6 +93,7 @@
                     v_sale.sa_a25_user := ${order.paycomaddress};
                     v_sale.sa_a10_user_2 := ${order.actualpaydate};
                     v_sale.sa_state_user := ${order.paymentmethod};
+                    v_sale.sa_ssa_user := ${order.paydeldate};
                     insert into sale values v_sale;
             </block>
                 <iterator loop="order.deputyOrderItems" var="item">