采购明细未上传处理

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderItemDao.java

@@ -35,24 +35,6 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	@Query("select count(d) from PurchaseOrderItem d where d.order.id = :orderId and d.replyQty >= d.qty")
 	public int getCountByReply(@Param("orderId") long orderId);
 
-	/**
-	 * 按订单id查找订单明细数量
-	 *
-	 * @param orderId
-	 * @return
-	 */
-	@Query("select count(d) from PurchaseOrderItem d where d.order.id = :orderId ")
-	int getCountByOrderId(@Param("orderId") long orderId);
-
-	/**
-	 * 按订单id查找订单明细
-	 *
-	 * @param orderId
-	 * @return
-	 */
-	@Query("select d from PurchaseOrderItem d where d.order.id = :orderId ")
-	List<PurchaseOrderItem> getItemByOrderId(@Param("orderId") long orderId);
-
 	/**
 	 * 按订单明细结案情况查找订单明细
 	 * 

src/main/java/com/uas/platform/b2b/erp/controller/NotExistOrderController.java

@@ -56,7 +56,7 @@ public class NotExistOrderController {
     @RequestMapping(value = "/saleMain", method = RequestMethod.GET)
     public List<NotExistOrders> findNotExistSaleMain() {
         List<NotExistOrders> orders = orderService.findByEnUUAndStatusAndType(SystemSession.getUser().getEnterprise().getUu(),
-                Status.NOT_UPLOAD.value(), OrderType.saleItem.name());
+                Status.NOT_UPLOAD.value(), OrderType.saleMain.name());
         logger.log("查询未上传订单", "查询未上传采购单", orders.size());
         return orders;
     }

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -74,19 +74,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		for (Purchase purchase : purchases) {
 			// 先查看是否已存在
 			Integer orderCount = purchaseOrderDao.countByEnUUAndCode(enUU, purchase.getPu_code());
-			Integer itemCount=0;
-			if (orderCount != 0) {
-				PurchaseOrder purchaseOrder = purchaseOrderDao.findByEnUUAndCode(enUU, purchase.getPu_code()).get(0);
-				itemCount= purchaseOrderItemDao.getCountByOrderId(purchaseOrder.getId());
-				if (purchase.getPurchaseDetails().size() != itemCount) {
-					List<PurchaseOrderItem> items = purchaseOrderItemDao.getItemByOrderId(purchaseOrder.getId());
-					for(PurchaseOrderItem item : items) {
-						purchaseOrderItemDao.delete(item.getId());
-					}
-					purchaseOrderDao.delete(purchaseOrder.getId());
-				}
-			}
-			if ((orderCount == 0) || (purchase.getPurchaseDetails().size() != itemCount)) {
+			if (orderCount == 0) {
 				PurchaseOrderInfo order = purchase.convert();
 				// 将order的UserUU set 为em_uu
 				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(order.getEnUU(), order.getVendUU());