Browse Source

采购明细未上传处理

Hu Jie 7 years ago
parent
commit
e5209b2f84

+ 10 - 0
src/main/java/com/uas/platform/b2b/dao/NotExistOrdersDao.java

@@ -39,4 +39,14 @@ public interface NotExistOrdersDao extends JpaRepository<NotExistOrders, Long>,
     @Transactional(rollbackOn = SQLException.class)
     @Transactional(rollbackOn = SQLException.class)
     @Query("update NotExistOrders set status = 203 where id = :id")
     @Query("update NotExistOrders set status = 203 where id = :id")
     void updateStatus(@Param("id") Long id);
     void updateStatus(@Param("id") Long id);
+
+    /**
+     * 更新下载状态
+     *
+     * @param id id
+     */
+    @Modifying
+    @Transactional(rollbackOn = SQLException.class)
+    @Query("update NotExistOrders set status = 203 where enUU = :enUU and code = :code and type = :type")
+    void updateByEnUUAndCodeAndType(@Param("enUU") Long enUU,@Param("code") String code,@Param("type")String type);
 }
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/dao/PurchaseNoticeDao.java

@@ -177,6 +177,6 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @param date 录入日期
 	 * @param date 录入日期
 	 * @return
 	 * @return
 	 */
 	 */
-	@Query("select p.id from PurchaseNotice p where  p.date = :date")
+	@Query("select p.id from PurchaseNotice p where  p.date >= :date")
 	List<Long> findByDate( @Param("date") Date date);
 	List<Long> findByDate( @Param("date") Date date);
 }
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/dao/PurchaseOrderDao.java

@@ -103,6 +103,6 @@ public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder
 	 * @param date 录入日期
 	 * @param date 录入日期
 	 * @return
 	 * @return
 	 */
 	 */
-	@Query("select p.id from PurchaseOrder p where  p.date = :fromDate")
+	@Query("select p.id from PurchaseOrder p where  p.date >= :fromDate")
 	List<Long> findByDate( @Param("fromDate") Date date);
 	List<Long> findByDate( @Param("fromDate") Date date);
 }
 }

+ 4 - 1
src/main/java/com/uas/platform/b2b/service/impl/NotExistOrderServiceImpl.java

@@ -66,7 +66,10 @@ public class NotExistOrderServiceImpl implements NotExistOrderService {
     public void updateDownloadStatus(String[] idArray) {
     public void updateDownloadStatus(String[] idArray) {
         if (idArray.length > 0) {
         if (idArray.length > 0) {
             for (String id : idArray) {
             for (String id : idArray) {
-                ordersDao.updateStatus(Long.valueOf(id));
+                //根据enUU、单据code、单据类型更新下载状态
+                NotExistOrders order = ordersDao.findOne(Long.valueOf(id));
+                ordersDao.updateByEnUUAndCodeAndType(order.getEnUU(),order.getCode(),order.getType());
+                //ordersDao.updateStatus(Long.valueOf(id));
             }
             }
         }
         }
     }
     }

+ 7 - 0
src/main/java/com/uas/platform/b2b/task/SendNoticeTask.java

@@ -16,6 +16,7 @@ import org.springframework.util.StringUtils;
 import java.net.URI;
 import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
@@ -82,7 +83,13 @@ public class SendNoticeTask {
     @Scheduled(cron = "0 0 13,19,23 * * ? ")
     @Scheduled(cron = "0 0 13,19,23 * * ? ")
     public void checkIndex() throws Exception{
     public void checkIndex() throws Exception{
         Date date = new Date();
         Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE,-1);
+        date = calendar.getTime();
         List<Long> idsNotice = purchaseNoticeDao.findByDate(date);
         List<Long> idsNotice = purchaseNoticeDao.findByDate(date);
+        calendar.add(Calendar.DATE,-4);
+        date = calendar.getTime();
         List<Long> idsOrders = purchaseOrderDao.findByDate(date);
         List<Long> idsOrders = purchaseOrderDao.findByDate(date);
         if (!CollectionUtils.isEmpty(idsNotice)) {
         if (!CollectionUtils.isEmpty(idsNotice)) {
             checkAndUpateAll("purc$notice",idsNotice);
             checkAndUpateAll("purc$notice",idsNotice);