B2B功能优化调整

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

@@ -181,6 +181,11 @@ public class PurchaseOrderAllItem {
     @Column(name = "pd_audid")
     private Long audId;
 
+	/**
+	 * 最后一次回复数量
+	 */
+	@Transient
+	private Double latestReplyQty;
 
     public Long getId() {
 		return id;
@@ -409,6 +414,14 @@ public class PurchaseOrderAllItem {
 		this.prodsource = prodsource;
 	}
 
+	public Double getLatestReplyQty() {
+		return latestReplyQty;
+	}
+
+	public void setLatestReplyQty(Double latestReplyQty) {
+		this.latestReplyQty = latestReplyQty;
+	}
+
 	public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;

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

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.*;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Where;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.Date;
+import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
@@ -162,6 +160,12 @@ public class PurchaseOrderDoneItem {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 最后一次回复数量
+	 */
+	@Transient
+	private Double latestReplyQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -339,4 +343,8 @@ public class PurchaseOrderDoneItem {
 		acceptQtyNum = acceptQty == null ? 0 : acceptQty;
 		return qtyNum + returnQtyNum - acceptQtyNum;
 	}
+
+    public void setLatestReplyQty(Double latestReplyQty) {
+        this.latestReplyQty = latestReplyQty;
+    }
 }

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

@@ -1,13 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.*;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.Date;
+import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
@@ -166,6 +164,12 @@ public class PurchaseOrderEndItem {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 最后一次回复数量
+	 */
+	@Transient
+	private Double latestReplyQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -359,4 +363,8 @@ public class PurchaseOrderEndItem {
 		acceptQtyNum = acceptQty == null ? 0 : acceptQty;
 		return qtyNum + returnQtyNum - acceptQtyNum;
 	}
+
+    public void setLatestReplyQty(Double latestReplyQty) {
+        this.latestReplyQty = latestReplyQty;
+    }
 }

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

@@ -157,6 +157,12 @@ public class PurchaseOrderReceivedItem {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 最后一次回复数量
+	 */
+	@Transient
+	private Double latestReplyQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -346,4 +352,8 @@ public class PurchaseOrderReceivedItem {
 	public String getVendorName() {
 		return SystemSession.getUser().getEnterprise().getEnName();
 	}
+
+    public void setLatestReplyQty(Double latestReplyQty) {
+        this.latestReplyQty = latestReplyQty;
+    }
 }

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

@@ -1,23 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.hibernate.annotations.Where;
-
 /**
  * 平台里面，以供应商的角度来查看采购订单 <br>
  * 级联采购明细<br>
@@ -195,23 +183,41 @@ public class PurchaseOrderTodo {
 	@Transient
 	private String enName;
 
+	/**
+	 * 用途
+	 */
 	@Column(name = "pu_purpose")
-	private String purpose; // 用途，
+	private String purpose;
 
+	/**
+	 * 买家应收客户
+	 */
 	@Column(name = "pu_arcustcode")
-	private String arCustCode; // 买家应收客户，
+	private String arCustCode;
 
+	/**
+	 * 收货客户
+	 */
 	@Column(name = "pu_shcustcode")
-	private String shCustCode; // 收货客户，
+	private String shCustCode;
 
+	/**
+	 * 销售单号
+	 */
 	@Column(name = "pu_refcode")
-	private String refCode; // 销售单号
+	private String refCode;
 
+	/**
+	 * 客户编号
+	 */
 	@Column(name = "pu_custcode")
-	private String custCode; // 客户编号，
+	private String custCode;
 
+	/**
+	 * 客户名称
+	 */
 	@Column(name = "pu_custname")
-	private String custName; // 客户名称。
+	private String custName;
 
 	public String getPurpose() {
 		return purpose;

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

@@ -1,13 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.*;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.Date;
+import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
@@ -92,14 +90,6 @@ public class PurchaseOrderTodoItem {
 	@Column(name = "pd_vendspec")
 	private String vendspec;
 
-	public String getVendspec() {
-		return vendspec;
-	}
-
-	public void setVendspec(String vendspec) {
-		this.vendspec = vendspec;
-	}
-
 	/**
 	 * 含税单价
 	 */
@@ -160,6 +150,12 @@ public class PurchaseOrderTodoItem {
 	@Transient
 	private Boolean key;
 
+    /**
+     * 最后一次回复数量
+     */
+	@Transient
+	private Double latestReplyQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -234,6 +230,14 @@ public class PurchaseOrderTodoItem {
 		this.remark = remark;
 	}
 
+	public String getVendspec() {
+		return vendspec;
+	}
+
+	public void setVendspec(String vendspec) {
+		this.vendspec = vendspec;
+	}
+
 	public Double getPrice() {
 		return price;
 	}
@@ -338,7 +342,15 @@ public class PurchaseOrderTodoItem {
 		this.factory = factory;
 	}
 
-	public double getBalance() {
+    public Double getLatestReplyQty() {
+        return latestReplyQty;
+    }
+
+    public void setLatestReplyQty(Double latestReplyQty) {
+        this.latestReplyQty = latestReplyQty;
+    }
+
+    public double getBalance() {
 		double qtyNum, returnQtyNum, acceptQtyNum;
 		qtyNum = qty == null ? 0 : qty;
 		returnQtyNum = returnQty == null ? 0 : returnQty;

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

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.support.SystemSession;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.persistence.*;
+import java.util.Date;
+import java.util.Set;
 
 @Table(name = "purc$orderitems")
 @Entity
@@ -167,6 +165,12 @@ public class PurchaseOrderWaitingItem {
 	@Transient
 	private Boolean key;
 
+	/**
+	 * 最后一次回复数量
+	 */
+	@Transient
+	private Double latestReplyQty;
+
 	public Long getId() {
 		return id;
 	}
@@ -364,4 +368,8 @@ public class PurchaseOrderWaitingItem {
 	public String getVendorName() {
 		return SystemSession.getUser().getEnterprise().getEnName();
 	}
+
+    public void setLatestReplyQty(Double latestReplyQty) {
+        this.latestReplyQty = latestReplyQty;
+    }
 }

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -11,6 +11,7 @@ import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.BrandService;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.service.KindService;
+import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.persistence.criteria.PredicateFactory;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -154,9 +155,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private SaleTenderErpDao saleTenderErpDao;
 
-	@Autowired
-	private PagingReleaseDetailDao pagingReleaseDetailDao;
-
 	@Autowired
 	private VendorDao vendorDao;
 
@@ -199,7 +197,8 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private SaleTenderQuestionDao saleTenderQuestionDao;
 
-
+    @Autowired
+    private PurchaseOrderService purchaseOrderService;
 
 	/**
 	 * 联想词size
@@ -274,6 +273,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderAll> content = purchaseOrderAllDao.findAll(idsPage.getContent());
+		if (!CollectionUtils.isEmpty(content)) {
+			for (PurchaseOrderAll orderAll : content) {
+				if (!CollectionUtils.isEmpty(orderAll.getOrderItems())) {
+                    for (PurchaseOrderAllItem item : orderAll.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+				}
+			}
+		}
 		sortByProperty(content, PurchaseOrderAll.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -654,6 +662,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderTodo> searchPurchaseTodoOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderTodo> content = purchaseOrderTodoDao.findAll(idsPage.getContent());
+        if (!CollectionUtils.isEmpty(content)) {
+            for (PurchaseOrderTodo order : content) {
+                if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                    for (PurchaseOrderTodoItem item : order.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+                }
+            }
+        }
 		sortByProperty(content, PurchaseOrderTodo.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -665,6 +682,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderDone> searchPurchaseDoneOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderDone> content = purchaseOrderDoneDao.findAll(idsPage.getContent());
+        if (!CollectionUtils.isEmpty(content)) {
+            for (PurchaseOrderDone order : content) {
+                if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                    for (PurchaseOrderDoneItem item : order.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+                }
+            }
+        }
 		sortByProperty(content, PurchaseOrderDone.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -676,6 +702,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderEnd> searchaPurchaseEndOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderEnd> content = purchaseOrderEndDao.findAll(idsPage.getContent());
+        if (!CollectionUtils.isEmpty(content)) {
+            for (PurchaseOrderEnd order : content) {
+                if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                    for (PurchaseOrderEndItem item : order.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+                }
+            }
+        }
 		sortByProperty(content, PurchaseOrderEnd.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -691,6 +726,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderReceived> searchPurchaseReceivedOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderReceived> content = purchaseOrderReceivedDao.findAll(idsPage.getContent());
+        if (!CollectionUtils.isEmpty(content)) {
+            for (PurchaseOrderReceived order : content) {
+                if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                    for (PurchaseOrderReceivedItem item : order.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+                }
+            }
+        }
 		sortByProperty(content, PurchaseOrderReceived.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -702,6 +746,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseOrderWaiting> searchPurchaseWaitingOrderIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderWaiting> content = purchaseOrderWaitingDao.findAll(idsPage.getContent());
+        if (!CollectionUtils.isEmpty(content)) {
+            for (PurchaseOrderWaiting order : content) {
+                if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                    for (PurchaseOrderWaitingItem item : order.getOrderItems()) {
+                        item.setLatestReplyQty(purchaseOrderService.findLastReplyQty(item.getId()));
+                    }
+                }
+            }
+        }
 		sortByProperty(content, PurchaseOrderWaiting.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}

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

@@ -85,7 +85,7 @@ public interface PurchaseOrderService {
 
 	/**
 	 * 分页查找订单
-	 * 
+	 *
 	 * @param pageInfo
 	 * @return
 	 */
@@ -233,6 +233,16 @@ public interface PurchaseOrderService {
 	 */
 	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId);
 
+
+	/**
+	 * 获取明细最后一次回复数量
+	 *
+	 * @param orderItemId
+	 *            订单明细ID
+	 * @return
+	 */
+	Double findLastReplyQty(long orderItemId);
+
 	/**
 	 * 查找所有待上传到供应商ERP的订单
 	 * 
@@ -404,5 +414,4 @@ public interface PurchaseOrderService {
 	 */
     void coverPurchaseOrderItemProdToUser(Long enUU) throws Exception;
 
-//    SPage<SaleOrderForProd> findOrderItemsByPageInfo(PageInfo pageInfo, SearchFilter filter);
 }

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

@@ -10,7 +10,6 @@ import com.uas.platform.b2b.event.PurchaseOrderReplyReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.ProductUtils;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SPageUtils;
@@ -77,9 +76,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	@Autowired
 	private UserOrderDao userOrderDao;
 
-	@Autowired
-	private SearchService searchService;
-
 	@Autowired
 	private PrintLogDao printLogDao;
 
@@ -183,7 +179,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 						userOrders = new UserOrders(userUU, order.getVendUU(), order.getId(), "sale", "purc$orders");
 						list.add(userOrders);
 					}
-
 					/* 添加采购员的阅读记录*/
 					if (order.getUserUU() != null) {
                         userOrders = new UserOrders(order.getUserUU(), order.getEnUU(), order.getId(), "purc", "purc$orders");
@@ -245,6 +240,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+			if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+			    for (PurchaseOrderAllItem item : order.getOrderItems()) {
+			        item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -512,6 +512,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+			if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+			    for (PurchaseOrderTodoItem item : order.getOrderItems()) {
+			        item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -541,6 +546,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+            if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                for (PurchaseOrderDoneItem item : order.getOrderItems()) {
+                    item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -567,6 +577,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+            if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                for (PurchaseOrderEndItem item : order.getOrderItems()) {
+                    item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -598,6 +613,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+            if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                for (PurchaseOrderReceivedItem item : order.getOrderItems()) {
+                    item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -627,6 +647,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			if (enter != null) {
 				order.setEnName(enter.getEnName());
 			}
+            if (!CollectionUtils.isEmpty(order.getOrderItems())) {
+                for (PurchaseOrderWaitingItem item : order.getOrderItems()) {
+                    item.setLatestReplyQty(findLastReplyQty(item.getId()));
+                }
+            }
 		}
 		return pageOrders;
 	}
@@ -1026,4 +1051,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 			ProductUtils.paginationUpdateAndAddToProductUser(products);
 		}
 	}
+
+    /**
+     * 获取明细最后一次回复数量
+     *
+     * @param orderItemId 订单明细ID
+     * @return
+     */
+    @Override
+    public Double findLastReplyQty(long orderItemId) {
+        List<PurchaseOrderReply> replies = findReplyByOrderItem(orderItemId);
+        return CollectionUtils.isEmpty(replies) ? 0 : replies.get(0).getQty();
+    }
 }

src/main/webapp/WEB-INF/views/normal/index.html

@@ -19,16 +19,6 @@
 <body ng-controller="AuthCtrl">
 	<!-- top Start -->
 	<div class="fixed-menu">
-	<!-- <header class="navbar navbar-static-top" id="top">
-		<div class="container">
-			<nav class="hidden-xs">
-				<ul class="nav navbar-nav">
-					<li><a href="http://www.ubtob.com" target="_blank">优软云首页</a></li>
-					<li><a href="serve#/contact" target="_blank">联系我们</a></li>
-				</ul>
-			</nav>
-		</div>
-	</header> -->
 	<!-- top End -->
 	<!-- header Start -->
 	<div class="height6">&nbsp;</div>
@@ -200,81 +190,6 @@
 						</div>
 					</div>
 				</div>
-				<!--<div class="dropdown-menu01">
-					<div class="row pills text-center" id="dropdown-menu-sale">
-						<div class="col-xs-2" >
-							<a href="#/sale/order"><img src="static/img/home/sale-sm.png"><br>
-							销售</a>
-						</div>
-						<div class="col-xs-10">
-							<ul class="nav nav-pills">
-								<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
-								<li><a href="#/sale/prodList" title="产品导入">产品导入</a></li>
-								<li><a href="#/sale/inquiry" title="客户采购询价单">客户采购询价单</a></li>
-								<li><a href="#/sale/mould" title="客户模具询价单">客户模具询价单</a></li>
-								<li><a href="#/sale/quotation/list" title="主动报价单">主动报价单</a></li>
-								<li><a href="#/sale/tender" title="客户招标">客户招标</a></li>
-								&lt;!&ndash; 暂时隐藏 &ndash;&gt;
-								&lt;!&ndash;<li><a href="#/sale/opentender" title="平台公共招标">平台公共招标</a></li>&ndash;&gt;
-								<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
-								<li><a href="#/sale/change" title="客户采购变更">客户采购变更单</a></li>
-								<li><a href="#/sale/maketodo/makeorder" title="客户委外单">客户委外单</a></li>
-								<li><a ui-sref="sale.makechange" title="客户委外变更单">客户委外变更单</a></li>
-								<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
-								<li><a href="#/sale/send" title="发货单">发货单</a></li>
-								<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
-								<li><a href="#/sale/approval" title="客户认定单">客户认定单</a></li>
-								<li><a href="#/sale/MRB" title="客户MRB单">客户MRB单</a></li>
-								<li><a href="#/sale/badOut" title="客户不良品出库">客户不良品出库</a></li>
-								<li><a href="#/sale/badIn" title="客户不良品入库">客户不良品入库</a></li>
-								<li><a href="#/sale/accept" title="客户验收单">客户采购验收单</a></li>
-								<li><a href="#/sale/returns" title="客户验退单">客户采购验退单</a></li>
-								<li><a href="#/sale/makeaccept" title="客户委外验收单">客户委外验收单</a></li>
-								<li><a href="#/sale/makereturns" title="客户委外验退单">客户委外验退单</a></li>
-								<li><a href="#/cs/" title="客户服务">客户服务</a></li>
-							</ul>
-						</div>
-					</div>
-					<div class="row pills text-center" id="dropdown-menu-purc">
-						<div class="col-xs-2">
-							<a href="#/purc/order"><img alt="" src="static/img/home/purc-sm.png"><br>采购</a>
-						</div>
-						<div class="col-xs-10">
-							<ul class="nav nav-pills" >
-								<li><a href="#/purc/vendor" title="采购询价">供应商资料</a></li>
-								<li><a href="#/purc/tender" title="采购招标">采购招标</a></li>
-								<li><a ui-sref="purc.inquiry" title="采购询价">采购询价</a></li>
-								<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
-								<li><a href="#/purc/deputy" title="代采订单">代采订单</a></li>
-								<li><a href="#/purc/makeoutorder" title="委外订单">委外订单</a></li>
-							</ul>
-						</div>
-					</div>
-					<div class="row pills text-center" id="dropdown-menu-finance">
-						<div class="col-xs-2">
-							<a href="#/fa/apBill"><img src="static/img/home/finance-sm.png"><br>财务</a>
-						</div>
-						<div class="col-xs-10">
-							<ul class="nav nav-pills">
-								<li><a href="#/fa/apBill" title="客户应付发票">发票</a></li>
-								<li><a href="#/fa/apCheck" title="应收对账单">应收对账单</a></li>
-								<li><a href="#/fa/arCheck" title="应付对账单">应付对账单</a></li>
-							</ul>
-						</div>
-					</div>
-					<div class="row pills text-center" id="dropdown-menu-report">
-						<div class="col-xs-2">
-							<img src="static/img/home/report-sm.png"><br>统计报表
-						</div>
-						<div class="col-xs-10">
-							<ul class="nav nav-pills" >
-								<li><a title="销售出货统计">销售出货统计</a></li>
-								<li><a title="采购订单统计">采购订单统计</a></li>
-								<li><a title="考勤统计">考勤统计</a></li>
-							</ul>
-						</div>
-					</div>
-				</div>-->
 			</div>
 		</div>
 	</div>
@@ -286,20 +201,6 @@
 			<div ui-view="left-view"></div>
 		</div>
 		<div class="right">
-			<!-- 公司信息 Start -->
-		<!-- 	<div class="company">
-				<div class="inner block">
-					<div class="f14">
-						<i class="fa fa-map-marker fa-fw"></i><span
-							ng-bind="::userInfo.enterprise.enName"></span>
-					</div>
-					<div class="text-small">
-						<span class="text-border-success">优软认证</span>
-					</div>
-					<div class="text-muted">优软商务平台普通会员</div>
-				</div>
-			</div> -->
-			<!-- 公司信息 End -->
 			<div ui-view="right-view" class="view-slide-in"></div>
 		</div>
 	</div>
@@ -373,16 +274,6 @@
 		toaster-options="{'position-class': 'toast-top-center'}"></toaster-container>
 	<script type="text/javascript" src="static/lib/require.js"
 		data-main="static/js/index/main.js"></script>
-	<!-- <script>
-		/* 百度PV站长统计 */
-		var _hmt = _hmt || [];
-		(function() {
-		  var hm = document.createElement("script");
-		  hm.src = "//hm.baidu.com/hm.js?2079fe25539f78393813e94965659624";
-		  var s = document.getElementsByTagName("script")[0]; 
-		  s.parentNode.insertBefore(hm, s);
-		})();
-	</script> -->
 	<script src="static/lib/jquery/jquery.min.js"></script>
 	<script src="static/lib/bootstrap/js/bootstrap.js"></script>
 <script type="text/javascript">

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

@@ -3319,14 +3319,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
                     $scope.loading = false;
                     if (page) {
-                        //获取每个明细单最新回复数
-                        angular.forEach(page.content, function(order){
-                            angular.forEach(order.orderItems, function(item){
-                                PurcOrderItem.getLatestReplyQty({orderItemId: item.id}, null, function (map) {
-                                    item.latestReplyQty = map.latestReplyQty;
-                                });
-                            });
-                        });
                         $defer.resolve(page.content);
                         params.total(page.totalElement);
                         $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
@@ -3355,10 +3347,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             var sourceId = [];
             sourceId.push(id);
             PurcOrderItem.setRead({}, sourceId, function (message) {
-                // var success = message.success;
-                // if(success && $scope.isUnread(id)){
-                //     $scope.unread.all = $scope.unread.all - 1;
-                // }
                 getUnreadCount();
             });
         };

src/main/webapp/resources/js/index/services/Purc.js

@@ -94,13 +94,6 @@ define([ 'ngResource'], function() {
 					orderItemId: 'orderItemId'
 				}
 			},
-			getLatestReplyQty: {
-				url: 'sale/orders/items/:orderItemId/reply/last',
-				method: 'GET',
-				params: {
-				orderItemId: 'orderItemId'
-				}
-			},
 			setRead:{
 				url: 'sale/orders/setRead',
 				method: 'POST'

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

@@ -133,7 +133,7 @@
 		<div class="todo-label list-unstyled">
 			<em></em><label>工作台</label>
 		</div>
-		<div class="border01 todo-content" ng-controller="TodoCtrl">
+		<div class="border01 todo-content">
 			<!--工作台导航-->
 			<div class="toto-menu">
 				<div class="menu01 row">