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

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

@@ -19,6 +19,7 @@ import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
 
@@ -60,6 +61,8 @@ public class SaleInquiryController {
 	@ResponseBody
 	public Page<PurchaseInquiryItem> getTodoInquiries(PageParams params) {
 		PageInfo info = new PageInfo(params);
+		// 询价单状态为未回复
+		info.filter("status", Status.NOT_REPLY.value());
 		// 我作为卖家，把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		return purchaseInquiryService.findAllByPageInfo(info);

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -144,8 +144,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 						XingePusher.pushSingleAccountAndroid(userUU.toString(), "询价单回复",
 								"单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行", "");
 						// IOS
-						XingePusher.pushSingleAccountIOS(userUU.toString(), "询价单回复" + "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber()
-								+ "行");
+						XingePusher.pushSingleAccountIOS(userUU.toString(),
+								"询价单回复" + "单号:" + item.getInquiry().getCode() + ",第" + item.getNumber() + "行");
 					}
 				}
 				purchaseInquiryItemDao.save(item);
@@ -216,7 +216,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	@Override
 	public void reply(PurchaseInquiryItem inquiryItem) {
 		PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(inquiryItem.getId());
-		if (item.getStatus() == Status.REPLIED.value() || item.getReplySendStatus() == Status.DOWNLOADED.value())
+		if (item.getStatus() == Status.REPLIED.value()
+				|| (item.getReplySendStatus() != null && item.getReplySendStatus() == Status.DOWNLOADED.value()))
 			throw new IllegalStatusException("该询价单已经报价，不允许再次报价");
 		inquiryItem.setStatus((short) Status.REPLIED.value());
 		inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());

src/main/webapp/resources/js/index/app.js

@@ -469,9 +469,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
                 'inquiry.date': 'desc',
                 'inquiry.enterprise.enName': 'asc',
                 'inquiry.code': 'asc',
-            },
-            filter: {
-            	'status' : 200
             }
 		}, {
 			total : 0,