处理客户分配之后的订单过滤问题。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7230 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -80,7 +80,7 @@ public class MakeOrderChangeController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("mcd_enuu", new MultiValue(list, true));
+			pageParams.getFilters().put("mcd_pcid", new MultiValue(list, true));
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();

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

@@ -65,7 +65,7 @@ public class SaleCustomerForecastController {
 		logger.log("客户采购预测单", "查看全部客户采购预测单");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
-		pageParams.getFilters().put("pfd_pfid", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pfd_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();
 		if (filter != null && filter.getDistribute() == null) {
 			return null;
@@ -75,7 +75,7 @@ public class SaleCustomerForecastController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("pfd_pfid", new MultiValue(list, true));
+			pageParams.getFilters().put("pfd_venduu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pfd_id", false, Type.LONG, new Long(1)));

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -77,12 +78,14 @@ public class SaleInquiryController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			System.out.println("客户分配条件------" + JSON.toJSONString(filter.getDistribute()));
 			List<Object> list = new ArrayList<>();
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
+		System.out.println("pageParams------" + JSON.toJSONString(pageParams));
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -111,7 +114,7 @@ public class SaleInquiryController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
@@ -143,7 +146,7 @@ public class SaleInquiryController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.YES);
@@ -175,7 +178,7 @@ public class SaleInquiryController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("id_enuu", new MultiValue(list, true));
+			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();

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

@@ -82,7 +82,7 @@ public class SaleQuotationController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
@@ -112,7 +112,7 @@ public class SaleQuotationController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
 
@@ -144,7 +144,7 @@ public class SaleQuotationController {
 			for (Object object : filter.getDistribute()) {
 				list.add(object);
 			}
-			pageParams.getFilters().put("pc_custuu", new MultiValue(list, true));
+			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("qu_status", Status.INPUTTING.value());
 		List<Sort> sortList = new ArrayList<>();