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

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

@@ -41,10 +41,10 @@ public class MessageController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/onhand", method = RequestMethod.GET, headers = "Accept=application/json")
+	@RequestMapping(value = "/todo", method = RequestMethod.GET, headers = "Accept=application/json")
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
-	public ModelMap getOnhand() {
+	public ModelMap getTodo() {
 		ModelMap modelMap = new ModelMap();
 		modelMap.put("inquiry", purchaseInquiryService.getOnhandCount());
 		modelMap.put("order", purchaseOrderService.getOnhandCount());

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -44,4 +45,12 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	@Query("select count(n) from PurchaseNotice n where n.vendUU = :vendUU and n.status = :status")
 	public int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
 
+	/**
+	 * 按发货单更新通知单的发货数
+	 * 
+	 */
+	@Modifying(clearAutomatically = true)
+	@Query("update PurchaseNotice n set n.endQty=(select sum(s.qty) from SaleSendItem s where s.notice=n) where n.id= :id")
+	public void updateBySend(@Param("id") long id);
+
 }

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

@@ -54,7 +54,6 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	 * @param qty
 	 * @param delivery
 	 * @param remark
-	 * @param status
 	 * @param id
 	 */
 	@Modifying(clearAutomatically = true)

src/main/java/com/uas/platform/b2b/erp/model/AcceptNotify.java

@@ -10,6 +10,7 @@ import org.apache.commons.collections.CollectionUtils;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendItem;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Status;
 
 /**
  * 买家ERP的收料通知单
@@ -138,6 +139,8 @@ public class AcceptNotify {
 		send.setPayments(this.an_payment);
 		send.setCustUserUU(this.an_buyeruu);
 		send.setRemark(this.an_remark);
+		send.setSendStatus((short) Status.DOWNLOADED.value());
+		send.setBackStatus((short) Status.NOT_UPLOAD.value());
 		send.setCode(this.an_sendcode == null ? String.valueOf(System.currentTimeMillis()) : this.an_sendcode);
 		Set<SaleSendItem> items = new HashSet<SaleSendItem>();
 		if (!CollectionUtils.isEmpty(details)) {

src/main/java/com/uas/platform/b2b/erp/service/PurchaseNotifyService.java

@@ -6,6 +6,7 @@ import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendItem;
 
 public interface PurchaseNotifyService {
 
@@ -31,6 +32,6 @@ public interface PurchaseNotifyService {
 	 * @param accepts
 	 * @return
 	 */
-	List<SaleSend> convertAcceptNotify(List<AcceptNotify> accepts);
+	List<SaleSendItem> convertAcceptNotify(List<AcceptNotify> accepts);
 
 }

src/main/java/com/uas/platform/b2b/erp/service/SaleNotifyDownService.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2b.erp.model.SaleNotifyDownEnd;
 import com.uas.platform.b2b.erp.model.SaleOut;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendItem;
 
 public interface SaleNotifyDownService {
 
@@ -24,7 +25,7 @@ public interface SaleNotifyDownService {
 	 * @param outs
 	 * @return
 	 */
-	List<SaleSend> convertSaleOut(List<SaleOut> outs);
+	List<SaleSendItem> convertSaleOut(List<SaleOut> outs);
 	
 	/**
 	 * 将平台的发货单，转为卖家ERP的发货单

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

@@ -51,23 +51,25 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	}
 
 	@Override
-	public List<SaleSend> convertAcceptNotify(List<AcceptNotify> accepts) {
-		List<SaleSend> sends = new ArrayList<SaleSend>();
+	public List<SaleSendItem> convertAcceptNotify(List<AcceptNotify> accepts) {
+		List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
 		for (AcceptNotify accept : accepts) {
 			SaleSend send = accept.convert();
 			Set<SaleSendItem> items = send.getSendItems();
 			if (!CollectionUtils.isEmpty(items)) {
 				for (SaleSendItem item : items) {
+					item.setSend(send);
 					PurchaseNotice notice = item.getNotice();
 					List<PurchaseNotice> notices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(), notice.getSourceId());
 					if (!CollectionUtils.isEmpty(notices)) {
 						item.setNotice(notices.get(0));
 						item.setNoticeId(item.getNotice().getId());
+						sendItems.add(item);
 					}
 				}
 			}
 		}
-		return sends;
+		return sendItems;
 	}
 
 }

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

@@ -4,18 +4,24 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.erp.model.SaleNotifyDown;
 import com.uas.platform.b2b.erp.model.SaleNotifyDownEnd;
 import com.uas.platform.b2b.erp.model.SaleOut;
 import com.uas.platform.b2b.erp.service.SaleNotifyDownService;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
+import com.uas.platform.b2b.model.SaleSendItem;
 
 @Service
 public class SaleNotifyDownServiceImpl implements SaleNotifyDownService {
 
+	@Autowired
+	private PurchaseNoticeDao purchaseNoticeDao;
+
 	@Override
 	public List<SaleNotifyDown> convertPurchaseNotice(List<PurchaseNotice> notices) {
 		List<SaleNotifyDown> downs = new ArrayList<SaleNotifyDown>();
@@ -27,16 +33,26 @@ public class SaleNotifyDownServiceImpl implements SaleNotifyDownService {
 	}
 
 	@Override
-	public List<SaleSend> convertSaleOut(List<SaleOut> outs) {
-		List<SaleSend> sends = new ArrayList<SaleSend>();
+	public List<SaleSendItem> convertSaleOut(List<SaleOut> outs) {
+		List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
 		// 按卖家发货单明细的订单号，对应的买家的采购单的采购员、币别、付款方式分组
 		// 卖家的发货单产生的时候，直接是按币别、付款方式、客户联系人分组了
 		if (!CollectionUtils.isEmpty(outs)) {
 			for (SaleOut out : outs) {
-				sends.add(out.convert());
+				SaleSend send = out.convert();
+				if (!CollectionUtils.isEmpty(send.getSendItems())) {
+					for (SaleSendItem item : send.getSendItems()) {
+						item.setSend(send);
+						PurchaseNotice notice = purchaseNoticeDao.findOne(item.getNoticeId());
+						if (notice != null) {
+							item.setNotice(notice);
+							sendItems.add(item);
+						}
+					}
+				}
 			}
 		}
-		return sends;
+		return sendItems;
 	}
 
 	@Override

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

@@ -85,7 +85,7 @@ public class PurchaseNotice implements Serializable {
 	/**
 	 * 处理状态（已回复、未回复），全部发货后改为已回复
 	 */
-	@Column(name = "pn_status")
+	@Column(name = "pn_status", insertable = false, updatable = false)
 	private Short status;
 
 	/**

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

@@ -129,7 +129,7 @@ public class PurchaseOrder implements Serializable {
 	private String payments;
 
 	/**
-	 * 采购单状态
+	 * 处理状态（已回复、未回复），全部回复后改为已回复
 	 */
 	@Column(name = "pu_status")
 	private Short status;

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

@@ -135,7 +135,7 @@ public class PurchaseOrderAll {
 	private String payments;
 
 	/**
-	 * 采购单状态
+	 * 处理状态（已回复、未回复），全部回复后改为已回复
 	 */
 	@Column(name = "pu_status")
 	private Short status;

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

@@ -94,7 +94,10 @@ public class PurchaseOrderAllItem {
 	@Column(name = "pd_taxrate")
 	private Float taxrate;
 
-	@Column(name = "pd_status")
+	/**
+	 * 处理状态（已回复、未回复），全部回复后改为已回复
+	 */
+	@Column(name = "pd_status", insertable = false, updatable = false)
 	private Short status;
 
 	/**

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

@@ -124,9 +124,9 @@ public class PurchaseOrderItem {
 	private Date delivery;
 
 	/**
-	 * 回复状态
+	 * 处理状态（已回复、未回复），全部回复后改为已回复
 	 */
-	@Column(name = "pd_status")
+	@Column(name = "pd_status", insertable = false, updatable = false)
 	private Short status;
 
 	/**

src/main/java/com/uas/platform/b2b/service/PurchaseNoticeService.java

@@ -53,20 +53,13 @@ public interface PurchaseNoticeService {
 	 *            本次发货
 	 */
 	public void send(Long noticeId, SaleSend send);
-
-	/**
-	 * 单个发货
-	 * 
-	 * @param send
-	 */
-	public void send(SaleSend send);
-
+	
 	/**
 	 * 批量发货
 	 * 
-	 * @param sends
+	 * @param sendItems
 	 */
-	public void send(List<SaleSend> sends);
+	public void send(List<SaleSendItem> sendItems);
 
 	/**
 	 * 查找送货提醒单的发货记录
@@ -131,7 +124,7 @@ public interface PurchaseNoticeService {
 	 * @param idArray
 	 */
 	public void onEndDownSuccess(String[] idArray);
-	
+
 	/**
 	 * 获取待发货的客户送货提醒单条数
 	 * 

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

@@ -74,13 +74,10 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	}
 
 	@Override
-	public void send(SaleSend send) {
-		saleSendDao.save(send);
-	}
-
-	@Override
-	public void send(List<SaleSend> sends) {
-		saleSendDao.save(sends);
+	public void send(List<SaleSendItem> sendItems) {
+		saleSendItemDao.save(sendItems);
+		for (SaleSendItem item : sendItems)
+			purchaseNoticeDao.updateBySend(item.getNoticeId());
 	}
 
 	@Override

src/main/webapp/resources/js/common/services.js

@@ -67,8 +67,8 @@ define([ 'angular', 'toaster' ], function(angular) {
 	}).factory('MessageService', function($http, BaseService) {
 		var rootPath = BaseService.getRootPath();
 		return {
-			getOnhand : function(success) {
-				var request = $http.get(rootPath + '/message/onhand');
+			getTodo : function(success) {
+				var request = $http.get(rootPath + '/message/todo');
 				request.success(function(data){
 					success.call(null, data);
 				});

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

@@ -50,6 +50,41 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/index.html"
 				}
 			}
+		}).state('sale.todo', {
+			url : "/todo",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/todo.html"
+				}
+			}
+		}).state('sale.todo.inquiry', {
+			url : "/inquiry",
+			views : {
+				"todo-view" : {
+					templateUrl : "static/tpl/index/sale/inquiry.html"
+				}
+			}
+		}).state('sale.todo.order', {
+			url : "/order",
+			views : {
+				"todo-view" : {
+					templateUrl : "static/tpl/index/sale/order.html"
+				}
+			}
+		}).state('sale.todo.change', {
+			url : "/change",
+			views : {
+				"todo-view" : {
+					templateUrl : "static/tpl/index/sale/change.html"
+				}
+			}
+		}).state('sale.todo.notice', {
+			url : "/notice",
+			views : {
+				"todo-view" : {
+					templateUrl : "static/tpl/index/sale/notice.html"
+				}
+			}
 		}).state('sale.inquiry', {
 			url : "/inquiry",
 			views : {
@@ -57,6 +92,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/inquiry.html"
 				}
 			}
+		}).state('sale.inquiry.todo', {
+			url : "/todo",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/inquiry.html"
+				}
+			}
 		}).state('sale.order', {
 			url : "/order",
 			views : {
@@ -64,8 +106,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/order.html"
 				}
 			}
-		}).state('sale.order.reply', {
-			url : "/reply",
+		}).state('sale.order.todo', {
+			url : "/todo",
 			views : {
 				"sale-view" : {
 					templateUrl : "static/tpl/index/sale/order.html"
@@ -78,6 +120,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/change.html"
 				}
 			}
+		}).state('sale.change.todo', {
+			url : "/todo",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/change.html"
+				}
+			}
 		}).state('sale.notice', {
 			url : "/notice",
 			views : {
@@ -85,6 +134,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/notice.html"
 				}
 			}
+		}).state('sale.notice.todo', {
+			url : "/todo",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/notice.html"
+				}
+			}
 		}).state('user', {
 			url : "/user",
 			views : {
@@ -141,9 +197,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			});
 		};
 	});
-	app.controller('OnhandCtrl', function($scope, MessageService){
-		MessageService.getOnhand(function(data){
-			$scope.onhand = data;
+	app.controller('TodoCtrl', function($scope, MessageService){
+		MessageService.getTodo(function(data){
+			$scope.todo = data;
 		});
 	});
 	app.controller('DataCtrl', function($scope) {

src/main/webapp/resources/tpl/index/home/right.html

@@ -7,19 +7,19 @@
 			<li>交易中</li>
 			<li>交易后</li>
 		</ul>
-		<div class="todo-content" ng-controller="OnhandCtrl">
+		<div class="todo-content" ng-controller="TodoCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="icon">销售</li>
 				<li class="start">
 					<ul class="list-unstyled">
-						<li><a ui-sref="sale.inquiry">待报价(<span ng-class="{'text-default': onhand.inquiry>0}" ng-bind="onhand.inquiry"></span>)</a></li>
-						<li><a ui-sref="sale.order.reply">待回复(<span ng-class="{'text-default': onhand.order>0}" ng-bind="onhand.order"></span>)</a></li>
+						<li><a ui-sref="sale.todo.inquiry">待报价(<span ng-class="{'text-default': todo.inquiry>0}">{{todo.inquiry || 0}}</span>)</a></li>
+						<li><a ui-sref="sale.todo.order">待回复(<span ng-class="{'text-default': todo.order>0}">{{todo.order || 0}}</span>)</a></li>
 					</ul>
 				</li>
 				<li class="doing">
 					<ul class="list-unstyled">
-						<li><a ui-sref="sale.notice">待发货(<span ng-class="{'text-default': onhand.notice>0}" ng-bind="onhand.notice"></span>)</a></li>
-						<li><a ui-sref="sale.change">变更中(<span ng-class="{'text-default': onhand.orderChange>0}" ng-bind="onhand.orderChange"></span>)</a></li>
+						<li><a ui-sref="sale.todo.notice">待发货(<span ng-class="{'text-default': todo.notice>0}">{{todo.notice || 0}}</span>)</a></li>
+						<li><a ui-sref="sale.todo.change">变更中(<span ng-class="{'text-default': todo.orderChange>0}">{{todo.orderChange || 0}}</span>)</a></li>
 					</ul>
 				</li>
 				<li class="end">

src/main/webapp/resources/tpl/index/sale/change.html

@@ -110,20 +110,6 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
-		<div class="state-wrap" ng-controller="OnhandCtrl">
-			<ul class="list-unstyled list-inline">
-				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
-				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h" ng-bind="onhand.order"></em></a></li>
-				<li class="active"><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
-				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h" ng-bind="onhand.notice"></em></a></li>
-				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
-			</ul>
-		</div>
-	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">

src/main/webapp/resources/tpl/index/sale/index.html

@@ -1,19 +1,19 @@
 <div class="sale">
 	<!-- 顶部状态 Start -->
-	<div class="row block state">
+	<div class="row block state" ng-controller="TodoCtrl">
 		<div class="col-xs-6 todo">
 			<ul class="list-unstyled list-inline">
 				<li>
 					<div class="title">
-						<a ui-sref="sale.inquiry">待报价</a>
+						<a ui-sref="sale.todo.inquiry">待报价</a>
 					</div>
-					<div class="count">0</div>
+					<div class="count" ng-class="{'text-inverse': todo.inquiry > 0}">{{todo.inquiry || 0}}</div>
 				</li>
 				<li>
 					<div class="title">
-						<a ui-sref="sale.notice">待发货</a>
+						<a ui-sref="sale.todo.notice">待发货</a>
 					</div>
-					<div class="count">0</div>
+					<div class="count" ng-class="{'text-inverse': todo.notice > 0}">{{todo.notice || 0}}</div>
 				</li>
 				<li>
 					<div class="title">
@@ -23,15 +23,15 @@
 				</li>
 				<li>
 					<div class="title">
-						<a ui-sref="sale.order.reply">待回复</a>
+						<a ui-sref="sale.todo.order">待回复</a>
 					</div>
-					<div class="count text-inverse">6</div>
+					<div class="count" ng-class="{'text-inverse': todo.order > 0}">{{todo.order || 0}}</div>
 				</li>
 				<li>
 					<div class="title">
-						<a ui-sref="sale.order.change">变更中</a>
+						<a ui-sref="sale.todo.order">变更中</a>
 					</div>
-					<div class="count">2</div>
+					<div class="count" ng-class="{'text-inverse': todo.orderChange > 0}">{{todo.orderChange || 0}}</div>
 				</li>
 				<li>
 					<div class="title">

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -116,22 +116,6 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
-		<div class="state-wrap" ng-controller="OnhandCtrl">
-			<ul class="list-unstyled list-inline">
-				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li class="active"><a ui-sref="sale.inquiry"><span>待报价</span><em
-						class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
-				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h" ng-bind="onhand.order"></em></a></li>
-				<li><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
-				<li><a ui-sref="sale.notice"><span>待发货</span><em
-						class="tm-h" ng-bind="onhand.notice"></em></a></li>
-				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
-			</ul>
-		</div>
-	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">

src/main/webapp/resources/tpl/index/sale/left.html

@@ -28,8 +28,8 @@
 		<i></i>报价管理
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">客户询价管理</a></li>
-		<li><a href="#">主动报价</a></li>
+		<li><a ui-sref="sale.inquiry">客户询价管理</a></li>
+		<li><a ui-sref="sale.quotation">主动报价</a></li>
 	</ul>
 </div>
 <div class="left-nav">
@@ -37,9 +37,9 @@
 		<i></i>销售管理
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="#">销售订单管理</a></li>
-		<li><a href="#">变更管理</a></li>
-		<li><a href="#">发货管理</a></li>
+		<li><a ui-sref="sale.order">销售订单管理</a></li>
+		<li><a ui-sref="sale.change">变更管理</a></li>
+		<li><a ui-sref="sale.notice">发货管理</a></li>
 		<li><a href="#">退货管理</a></li>
 	</ul>
 </div>

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -145,22 +145,6 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
-		<div class="state-wrap" ng-controller="OnhandCtrl">
-			<ul class="list-unstyled list-inline">
-				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.inquiry"><span>待报价</span><em
-						class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
-				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h" ng-bind="onhand.order"></em></a></li>
-				<li><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
-				<li class="active"><a ui-sref="sale.notice"><span>待发货</span><em
-						class="tm-h" ng-bind="onhand.notice"></em></a></li>
-				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
-			</ul>
-		</div>
-	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">

src/main/webapp/resources/tpl/index/sale/order.html

@@ -114,19 +114,6 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
-		<div class="state-wrap" ng-controller="OnhandCtrl">
-			<ul class="list-unstyled list-inline">
-				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
-				<li class="active"><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h" ng-bind="onhand.order"></em></a></li>
-				<li><a ui-sref="sale.change"><span>变更中</span><em class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
-				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h" ng-bind="onhand.notice"></em></a></li>
-				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
-			</ul>
-		</div>
-	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">

src/main/webapp/resources/tpl/index/sale/todo.html

@@ -0,0 +1,17 @@
+<div class="condition block">
+	<div class="state-wrap" ng-controller="TodoCtrl">
+		<ul class="list-unstyled list-inline">
+			<li class="first"><a href="#"><span>所有订单</span></a></li>
+			<li><a ui-sref="sale.todo.inquiry"><span>待报价</span><em
+					class="tm-h" ng-bind="todo.inquiry"></em></a></li>
+			<li class="active"><a ui-sref="sale.todo.order"><span>待回复</span><em
+					class="tm-h" ng-bind="todo.order"></em></a></li>
+			<li><a ui-sref="sale.todo.change"><span>变更中</span><em
+					class="tm-h" ng-bind="todo.orderChange"></em></a></li>
+			<li><a ui-sref="sale.todo.notice"><span>待发货</span><em
+					class="tm-h" ng-bind="todo.notice"></em></a></li>
+			<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
+		</ul>
+	</div>
+</div>
+<div ui-view="todo-view"></div>