不良品入库，不良品出库页面调整。erp接口获取公开招标单方法修改。获取待报价模具询价单数量方法修改

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

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

@@ -45,27 +45,27 @@ public interface PurchaseInquiryMouldDao
 	public PurchaseInquiryMould findByVenduuAndId(@Param("venduu") long vendUU, @Param("id") long id);
 
 	/**
-	 * 根据企业UU号查询已报价模具询价单数量
+	 * 根据供应商企业UU号查询已报价模具询价单数量
 	 * 
-	 * @param enUU
+	 * @param venduu
 	 * @return
 	 */
-	@Query("select count(i) from PurchaseInquiryMould i where i.enuu = :enuu and i.status = 201")
-	public Long getOfferCountByEnUU(@Param("enuu") long enuu);
+	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = 201 and i.valid = 1")
+	public Long getOfferCountByEnUU(@Param("venduu") long venduu);
 
 	/**
-	 * 根据企业UU查询未报价模具询价单数量
+	 * 根据供应商UU查询未报价模具询价单数量
 	 * 
-	 * @param enUU
+	 * @param venduu
 	 * @return
 	 */
-	@Query("select count(i) from PurchaseInquiryMould i where i.enuu = :enuu and i.status = 200")
-	public Long getNotOfferCountByEnUU(@Param("enuu") long enuu);
+	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = 200 and i.valid = 1")
+	public Long getNotOfferCountByEnUU(@Param("venduu") long venduu);
 
 	/**
-	 * 根据供应商UU号获取客户询价单数量
+	 * 根据供应商UU号获取客户模具询价单数量
 	 * 
-	 * @param vendUU
+	 * @param venduu
 	 * @return
 	 */
 	@Query("select count(p) from PurchaseInquiryMould p where p.venduu = :venduu")

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -19,11 +19,15 @@ import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -337,6 +341,9 @@ public class TenderController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
+        pageParams.setNotEqualFilters(map);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("pt_ifopen", Constant.YES);
         return searchService.erpSearchPurcTenderIds(keyword, pageParams);

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -198,7 +198,7 @@
 			</td>
 			<td>
 				<div class="text-num" title="{{item.orderPrice}}">
-					<span ng-bind="::currency(badIn.currency)"></span>
+					<span ng-bind="::badIn.currency"></span>
 					<span ng-bind="::item.orderPrice"></span>
 				</div>
 				<div class="text-muted"

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -195,8 +195,8 @@
 			</td>
 			<td>
 				<div class="text-num" title="{{::item.orderPrice}}">
+					<span ng-bind="::badOut.currency"></span>
 					<span ng-bind="::item.orderPrice"></span>
-					<span ng-bind="::currency(badOut.currency)"></span>
 				</div>
 				<div class="text-muted"
 					title="{{item.orderItem.taxrate}}%">