购物车数据会显示到待交货列表的异常的处理

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -92,7 +92,7 @@ public class BaseInfoController {
 
 	/**
 	 * 标准物料
-	 * 
+	 *
 	 * @param params
 	 * @param keyword
 	 * @return
@@ -127,7 +127,7 @@ public class BaseInfoController {
 
 	/**
 	 * 非标准物料
-	 * 
+	 *
 	 * @param params
 	 * @param keyword
 	 * @return
@@ -207,10 +207,9 @@ public class BaseInfoController {
 
 	/**
 	 * 通过id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
-	 * @return
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/edit/delete", method = RequestMethod.POST)
@@ -228,7 +227,7 @@ public class BaseInfoController {
 
 	/**
 	 * 获取附件信息
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -240,7 +239,7 @@ public class BaseInfoController {
 
 	/**
 	 * 更新物料信息
-	 * 
+	 *
 	 * @param prodInfo
 	 * @return
 	 */
@@ -255,7 +254,7 @@ public class BaseInfoController {
 
 	/**
 	 * 新增物料
-	 * 
+	 *
 	 * @param prodInfo
 	 * @return
 	 */
@@ -268,7 +267,7 @@ public class BaseInfoController {
 
 	/**
 	 * 获取批量上传产品的模板
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/upload/template", method = RequestMethod.GET)
@@ -349,7 +348,7 @@ public class BaseInfoController {
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
 		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
-			:getNonStandardProductInfo(params, keyword).getContent());
+				: getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出非标准可卖产品Excel列表");
 		return modelAndView;
@@ -357,12 +356,12 @@ public class BaseInfoController {
 
 	/**
 	 * 通过excel批量导入物料
-	 * 
+	 *
 	 * @param uploadItem
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/release/excel", method = RequestMethod.POST)
-	public ModelMap releaseByExcel(FileUpload uploadItem) throws IOException,IllegalOperatorException {
+	public ModelMap releaseByExcel(FileUpload uploadItem) throws IOException, IllegalOperatorException {
 		ModelMap map = new ModelMap();
 		String fileName = uploadItem.getFile().getOriginalFilename();
 		String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
@@ -380,24 +379,24 @@ public class BaseInfoController {
 		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.get("success"));
 		return map;
 	}
-	
+
 	/**
 	 * 企业列表
-	 * 
+	 *
 	 * @param params
 	 * @param keyword
 	 * @return
 	 */
-	@RequestMapping(value="/enterprise",method = RequestMethod.GET)
+	@RequestMapping(value = "/enterprise", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Enterprise> getAllEnterprises(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		return searchService.searchEnterpriseCheckIds(keyword, pageParams);
 	}
-	
+
 	/**
 	 * 存储平台下的采购单
-	 * 
+	 *
 	 * @param json
 	 * @return
 	 * @modify-author hejq
@@ -415,17 +414,17 @@ public class BaseInfoController {
 			if (neworder.getStatus().equals(Status.NOT_REPLY.value())) {
 				logger.log("采购订单", "新增提交采购订单", neworder.getCode());
 			} else if (neworder.getStatus().equals(Status.UNAUDIT.value())) {
-                logger.log("采购订单", "新增保存采购订单", neworder.getCode());
+				logger.log("采购订单", "新增保存采购订单", neworder.getCode());
 			}
 		} else {
 			throw new IllegalOperatorException("页面数据加载异常，请刷新页面重试");
 		}
 		return new ResponseEntity<ModelMap>(map, HttpStatus.OK);
 	}
-	
+
 	/**
 	 * 添加为客户
-	 * 
+	 *
 	 * @param json
 	 * @return
 	 */
@@ -437,7 +436,7 @@ public class BaseInfoController {
 
 	/**
 	 * 添加为供应商
-	 * 
+	 *
 	 * @param json
 	 * @return
 	 */
@@ -449,7 +448,7 @@ public class BaseInfoController {
 
 	/**
 	 * 跳转到企业圈
-	 * 
+	 *
 	 * @return
 	 * @throws Exception
 	 */
@@ -462,7 +461,7 @@ public class BaseInfoController {
 
 	/**
 	 * 顶部通过关键词查询账户中心的相关的企业信息
-	 * 
+	 *
 	 * @param keyword
 	 * @param params
 	 * @return
@@ -504,10 +503,10 @@ public class BaseInfoController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
-	
+
 	/**
 	 * 顶部查询物料库所有物料
-	 * 
+	 *
 	 * @param params
 	 * @param keyword
 	 * @return
@@ -521,7 +520,7 @@ public class BaseInfoController {
 
 	/**
 	 * 开启关闭销售
-	 * 
+	 *
 	 * @param status
 	 */
 	@RequestMapping(value = "/edit/toggle/{status}", method = RequestMethod.POST)
@@ -543,6 +542,7 @@ public class BaseInfoController {
 
 	/**
 	 * 设置单据已读
+	 *
 	 * @author wangmh
 	 */
 	@RequestMapping(value = "/setRead", method = RequestMethod.POST)
@@ -553,6 +553,7 @@ public class BaseInfoController {
 
 	/**
 	 * 获得未阅读单据id
+	 *
 	 * @author wangmh
 	 */
 	@RequestMapping(value = "/getUnreadIds", method = RequestMethod.GET)
@@ -562,25 +563,4 @@ public class BaseInfoController {
 		return new ModelMap("content", list);
 	}
 
-//	/**
-//	 * 统计未阅读单据各个状态数量
-//	 *
-//	 * @return
-//	 * @author wangmh
-//	 */
-//	@RequestMapping(value = "/unread", method = RequestMethod.GET, headers = "Accept=application/json")
-//	@ResponseBody
-//	@ResponseStatus(value = HttpStatus.OK)
-//	public ModelMap getOrderUnreadCount() {
-//		final ModelMap modelMap = new ModelMap();
-//		List<Object[]> list = productService.getProductCount("sale");
-//		int all = 0;
-//		int value;
-//		for(Object[] objects : list){
-//			value = Integer.valueOf(objects[0].toString());
-//			all = all + value;
-//		}
-//		modelMap.put("all", all);
-//		return modelMap;
-//	}
-}
+}

src/main/java/com/uas/platform/b2b/controller/PurcInquiryController.java

@@ -6,7 +6,6 @@ import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurcInquiryService;
 import com.uas.platform.b2b.service.PurchaseInquiryDetailService;
-import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
@@ -68,9 +67,6 @@ public class PurcInquiryController {
 	@Autowired
     private UserService userService;
 
-	@Autowired
-    private PurchaseInquiryService purchaseInquiryService;
-
 	@Autowired
 	private PurchaseInquiryDetailService detailService;
 

src/main/java/com/uas/platform/b2b/model/PurchaseOrderWaiting.java

@@ -14,7 +14,7 @@ import java.util.Set;
 
 @Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date") })
 @Entity
-@Where(clause = "(pu_end=0 or pu_end is null) and pu_id in (select i.pd_puid from purc$orderitems i where ifnull(i.pd_acceptqty,0)<ifnull(i.pd_qty,0)+ifnull(i.pd_returnqty,0))")
+@Where(clause = "(pu_end=0 or pu_end is null) and pu_id in (select i.pd_puid from purc$orderitems i where ifnull(i.pd_acceptqty,0)<ifnull(i.pd_qty,0)+ifnull(i.pd_returnqty,0)) and status <> 311")
 public class PurchaseOrderWaiting {
 	
 	@Id