Explorar o código

代采订单回传方法更新,增加已同意单据回传

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10802 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq %!s(int64=8) %!d(string=hai) anos
pai
achega
4a4f1e6143

+ 4 - 2
src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -312,7 +312,7 @@ public class DeputyOrderController {
 	}
 
 	/**
-	 * 买家查看代采订单(已下载,审核同意)
+	 * 买家查看代采订单(已下载,审核同意)
 	 * 
 	 * @param params
 	 * @return
@@ -335,6 +335,7 @@ public class DeputyOrderController {
 			pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("deo_statuscode", Status.NOTAGREED.value());
+		pageParams.getFilters().put("deo_entrystatus", "保存");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
@@ -617,7 +618,7 @@ public class DeputyOrderController {
 	}
 
 	/**
-	 * 买家查看代采订单(已下载,审核同意)
+	 * 买家查看代采订单(已下载,审核同意)
 	 * 
 	 * @param params
 	 * @return
@@ -628,6 +629,7 @@ public class DeputyOrderController {
 		PageInfo pageInfo = new PageInfo(params);
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		pageInfo.filter("statuscode", Status.NOTAGREED.value());
+		pageInfo.filter("entrystatus", "保存");
 		return deputyOrderService.getOrders(pageInfo, filter);
 	}
 

+ 1 - 1
src/main/java/com/uas/platform/b2b/erp/controller/DeputyOrderDownController.java

@@ -233,7 +233,7 @@ public class DeputyOrderDownController {
 	}
 
 	/**
-	 * ERP审核通过的单据传回来更新状态
+	 * ERP审核通过的单据传回来更新状态
 	 * 
 	 * @param data
 	 * @throws UnsupportedEncodingException