移动端单据接口获取用户多个企业的单据数据

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

src/main/java/com/uas/platform/b2b/mobile/controller/InquiryItemController.java

@@ -14,6 +14,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.persistence.criteria.PredicateUtils;
 
 /**
  * 对移动端的数据接口<br>
@@ -43,7 +44,7 @@ public class InquiryItemController {
 	public Page<InquiryItem> getSaleInquiryItems(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		info.expression(PredicateUtils.in("vendUU", SystemSession.getUser().getEnUUs(), false));
 		return inquiryItemService.convertInquiryItem(purchaseInquiryService.findAllByPageInfo(info, keyword));
 	}
 

src/main/java/com/uas/platform/b2b/mobile/controller/NoticeController.java

@@ -14,6 +14,7 @@ import com.uas.platform.b2b.service.PurchaseNoticeService;
 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.persistence.criteria.PredicateUtils;
 
 /**
  * 对移动端的数据接口<br>
@@ -43,7 +44,7 @@ public class NoticeController {
 	public Page<Notice> getNotices(PageParams params, String keyword, Long fromDate, Long endDate) {
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		info.expression(PredicateUtils.in("vendUU", SystemSession.getUser().getEnUUs(), false));
 		return noticeService.convertNotice(purchaseNoticeService.findAllByPageInfo(info, keyword, fromDate, endDate));
 	}
 

src/main/java/com/uas/platform/b2b/mobile/controller/SaleChangeController.java

@@ -14,6 +14,7 @@ import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 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.persistence.criteria.PredicateUtils;
 
 /**
  * 对移动端的数据接口<br>
@@ -43,7 +44,7 @@ public class SaleChangeController {
 	public Page<PurchaseChange> getReceivedPurchaseOrderChanges(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		info.expression(PredicateUtils.in("vendUU", SystemSession.getUser().getEnUUs(), false));
 		return purchaseChangeService.convertPurchaseOrderChange(purchaseOrderChangeService.findAllByPageInfo(info,
 				keyword));
 	}

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -14,6 +14,7 @@ import com.uas.platform.b2b.service.PurchaseOrderService;
 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.persistence.criteria.PredicateUtils;
 
 /**
  * 对移动端的数据接口<br>
@@ -43,7 +44,7 @@ public class SaleController {
 	public Page<Purchase> getReceivedPurchaseOrders(PageParams params, String keyword, Long fromDate, Long endDate) {
 		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		info.expression(PredicateUtils.in("vendUU", SystemSession.getUser().getEnUUs(), false));
 		return purchaseService.convertPurchaseOrder(purchaseOrderService.findAllDetailByPageInfo(info, keyword, fromDate, endDate));
 	}
 

src/main/java/com/uas/platform/b2b/mobile/model/InquiryItem.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.mobile.model;
 import java.util.Date;
 
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.support.SystemSession;
 
 /**
  * 平台里面，以供应商的角度来查看采购询价单明细
@@ -41,6 +42,10 @@ public class InquiryItem {
 	 * 客户电话
 	 */
 	private String customerTel;
+	/**
+	 * 供应商企业名称
+	 */
+	private String vendName;
 	/**
 	 * 物料id
 	 */
@@ -181,6 +186,14 @@ public class InquiryItem {
 		this.agreed = agreed;
 	}
 
+	public String getVendName() {
+		return vendName;
+	}
+	public void setVendName(String vendName) {
+		this.vendName = vendName;
+	}
+	
+	public InquiryItem(){};
 	/**
 	 * 转化构造函数
 	 * @param purchaseInquiryItem
@@ -203,6 +216,11 @@ public class InquiryItem {
 		this.taxrate = purchaseInquiryItem.getTaxrate();
 		this.remark = purchaseInquiryItem.getRemark();
 		this.status = purchaseInquiryItem.getStatus();
+		// 取到多个企业的单据，需要切换供应商名字
+		if(purchaseInquiryItem.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+			SystemSession.getUser().setCurrentEnterprise(purchaseInquiryItem.getVendUU());
+		}
+		this.vendName = SystemSession.getUser().getEnterprise().getEnName();
 	}
 	
 }

src/main/java/com/uas/platform/b2b/mobile/model/Notice.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.mobile.model;
 import java.util.Date;
 
 import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.support.SystemSession;
 
 /**
  * 移动端接口，平台里面，以供应商的角度来查看客户送货提醒
@@ -83,6 +84,11 @@ public class Notice{
 	 * 客户名称
 	 */
 	private String customerName;
+	
+	/**
+	 * 供应商企业名称
+	 */
+	private String vendName;
 
 	/**
 	 * 采购员名字
@@ -230,6 +236,16 @@ public class Notice{
 		this.buyerTel = buyerTel;
 	}
 
+	public String getVendName() {
+		return vendName;
+	}
+
+	public void setVendName(String vendName) {
+		this.vendName = vendName;
+	}
+
+	public Notice(){}
+	
 	public Notice(PurchaseNotice notice){
 		this.id = notice.getId();
 		this.buyerName = notice.getOrderItem().getOrder().getUser().getUserName();
@@ -248,6 +264,11 @@ public class Notice{
 		this.remark = notice.getRemark();
 		this.status = notice.getStatus();
 		this.unit = notice.getOrderItem().getProduct().getUnit();
+		// 取到多个企业的单据，需要切换供应商名字
+		if(notice.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+			SystemSession.getUser().setCurrentEnterprise(notice.getVendUU());
+		}
+		this.vendName = SystemSession.getUser().getEnterprise().getEnName();
 	}
 	
 

src/main/java/com/uas/platform/b2b/mobile/model/Purchase.java

@@ -6,6 +6,7 @@ import org.apache.commons.collections.CollectionUtils;
 
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.support.SystemSession;
 
 /**
  * 数据传送到移动端的轻量级实体类 <br>
@@ -52,7 +53,10 @@ public class Purchase {
 	 * 采购方企业
 	 */
 	private String en_name;
-
+	/**
+	 * 供应商企业名称
+	 */
+	private String vendName;
 	/**
 	 * 金额
 	 */
@@ -138,6 +142,14 @@ public class Purchase {
 		this.pu_total = pu_total;
 	}
 
+	public String getVendName() {
+		return vendName;
+	}
+
+	public void setVendName(String vendName) {
+		this.vendName = vendName;
+	}
+
 	public Purchase() {
 	}
 
@@ -162,5 +174,10 @@ public class Purchase {
 				this.pu_total += item.getAmount();
 			}
 		}
+		// 取到多个企业的单据，需要切换供应商名字
+		if(order.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+			SystemSession.getUser().setCurrentEnterprise(order.getVendUU());
+		}
+		this.vendName = SystemSession.getUser().getEnterprise().getEnName();
 	}
 }

src/main/java/com/uas/platform/b2b/mobile/model/PurchaseChange.java

@@ -6,6 +6,7 @@ import org.apache.commons.collections.CollectionUtils;
 
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.NumberUtil;
@@ -72,6 +73,14 @@ public class PurchaseChange {
 	 * 是否已同意
 	 */
 	private String pc_agreed;
+	/**
+	 * 客户企业名称
+	 */
+	private String customerName;
+	/**
+	 * 供应商企业名称
+	 */
+	private String vendName;
 
 	public String getPc_code() {
 		return pc_code;
@@ -177,6 +186,22 @@ public class PurchaseChange {
 		this.pc_id = pc_id;
 	}
 
+	public String getCustomerName() {
+		return customerName;
+	}
+
+	public void setCustomerName(String customerName) {
+		this.customerName = customerName;
+	}
+
+	public String getVendName() {
+		return vendName;
+	}
+
+	public void setVendName(String vendName) {
+		this.vendName = vendName;
+	}
+
 	public PurchaseChange() {
 	}
 
@@ -199,6 +224,7 @@ public class PurchaseChange {
 		this.pc_purccode = orderChange.getOrderCode();
 		this.pc_rate = orderChange.getOldRate();
 		this.pc_remark = orderChange.getRemark();
+		this.customerName = orderChange.getEnterprise().getEnName();
 		this.pc_total = 0.0;
 		if (!CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
 			for (PurchaseOrderChangeItem item : orderChange.getOrderChangeItems()) {
@@ -206,6 +232,11 @@ public class PurchaseChange {
 			}
 			this.pc_total = NumberUtil.formatDouble(this.pc_total, 2);
 		}
+		// 取到多个企业的单据，需要切换供应商名字
+		if(orderChange.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+			SystemSession.getUser().setCurrentEnterprise(orderChange.getVendUU());
+		}
+		this.vendName = SystemSession.getUser().getEnterprise().getEnName();
 	}
 
 }