【越加红】纷享销客 物料资料上传

是否寄售专用 由否改为是时定时报废CRM对应的物料

src/main/java/com/uas/eis/task/ProductTask.java

@@ -101,20 +101,20 @@ public class ProductTask {
                 BaseResult baseResult = productManager.updateGoods(product);
                 int errorCode = baseResult.getErrorCode();
                 if(errorCode == 0){
-                    baseDao.execute("update productInfoSync set pis_updatestatus='已更新',pis_updatedate=sysdate where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate)");
+                    baseDao.execute("update productInfoSync set pis_updatestatus='已更新',pis_updatedate=sysdate where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
                 }else{
-                    baseDao.execute("update productInfoSync set pis_error='"+baseResult.getErrorMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate)");
+                    baseDao.execute("update productInfoSync set pis_error='"+baseResult.getErrorMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
                     logger.info("异常信息："+baseResult.getErrorMessage());
                 }
             }catch (Exception e){
-                baseDao.execute("update productInfoSync set pis_error='"+e.getMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate)");
+                baseDao.execute("update productInfoSync set pis_error='"+e.getMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
                 logger.info("异常信息："+e.getMessage());
                 e.printStackTrace();
             }
         }
     }
     //是否寄售专用 由否改为是时定时报废CRM对应的物料
-    @Scheduled(cron = "0 15 23 * * ?")
+    @Scheduled(cron = "0 30 23 * * ?")
     public void syncUpdateProductsOnSFJSZY() {
         SqlRowList rs = baseDao.queryForRowSet("select * from (select distinct pis_prodcode from productInfoSync where trunc(pis_date)=trunc(sysdate) and pis_updatedate is null) left join product on pis_prodcode=pr_code where nvl(pr_statuscode,' ')='AUDITED' and nvl(pr_sendstatus,' ')='已上传' and nvl(pr_sfjszy_user,' ')='是' order by pr_id");
         while (rs.next()){
@@ -124,26 +124,30 @@ public class ProductTask {
                 int errorCode = baseResult.getErrorCode();
                 if(errorCode == 0){
                     baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'物料资料作废成功','物料资料作废','"+rs.getString("pr_code")+"')");
+                    List<String> idList = new ArrayList<>();
+                    idList.add(product.get_id());
+                    BaseResult baseResult_del = productManager.deleteProducts(idList);
+                    int errorCode_del = baseResult_del.getErrorCode();
+                    if(errorCode_del == 0){
+                        baseDao.execute("update product set pr_sendstatus='待上传' where pr_id="+rs.getInt("pr_id"));
+                        baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'物料资料删除成功','物料资料删除','"+rs.getString("pr_code")+"')");
+                        baseDao.execute("update productInfoSync set pis_updatestatus='已更新',pis_updatedate=sysdate where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
+                    }else{
+                        baseDao.execute("update product set pr_sendstatus='未报废成功' where pr_id="+rs.getInt("pr_id"));
+                        baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'"+baseResult_del.getErrorMessage()+"','物料资料删除','"+rs.getString("pr_code")+"')");
+                        baseDao.execute("update productInfoSync set pis_error='"+baseResult_del.getErrorMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
+                        logger.info("异常信息："+baseResult_del.getErrorMessage());
+                    }
                 }else{
-                    baseDao.execute("update product set pr_sendstatus='未定时报废成功' where pr_id="+rs.getInt("pr_id"));
+                    baseDao.execute("update product set pr_sendstatus='未报废成功' where pr_id="+rs.getInt("pr_id"));
                     baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'"+baseResult.getErrorMessage()+"','物料资料作废','"+rs.getString("pr_code")+"')");
+                    baseDao.execute("update productInfoSync set pis_error='"+baseResult.getErrorMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
                     logger.info("异常信息："+baseResult.getErrorMessage());
                 }
-                List<String> idList = new ArrayList<>();
-                idList.add(product.get_id());
-                BaseResult baseResult_del = productManager.deleteProducts(idList);
-                int errorCode_del = baseResult_del.getErrorCode();
-                if(errorCode_del == 0){
-                    baseDao.execute("update product set pr_sendstatus='待上传' where pr_id="+rs.getInt("pr_id"));
-                    baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'物料资料删除成功','物料资料删除','"+rs.getString("pr_code")+"')");
-                }else{
-                    baseDao.execute("update product set pr_sendstatus='未定时报废成功' where pr_id="+rs.getInt("pr_id"));
-                    baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'"+baseResult_del.getErrorMessage()+"','物料资料删除','"+rs.getString("pr_code")+"')");
-                    logger.info("异常信息："+baseResult_del.getErrorMessage());
-                }
             }catch (Exception e){
-                baseDao.execute("update product set pr_sendstatus='未定时报废成功' where pr_id="+rs.getInt("pr_id"));
+                baseDao.execute("update product set pr_sendstatus='未报废成功' where pr_id="+rs.getInt("pr_id"));
                 baseDao.execute("insert into FXXKDockingErrorlog(ml_id,ml_date,ml_result,ml_type,ml_code) values(FXXKDOCKINGERRORLOG_SEQ.nextval,sysdate,'"+e.getMessage()+"','物料资料作废或删除','"+rs.getString("pr_code")+"')");
+                baseDao.execute("update productInfoSync set pis_error='"+e.getMessage()+"' where pis_prodcode='"+rs.getGeneralString("pis_prodcode")+"' and trunc(pis_date)=trunc(sysdate) and pis_updatedate is null");
                 logger.info("异常信息："+e.getMessage());
                 e.printStackTrace();
             }