客户送样申请分状态显示

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

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

@@ -19,6 +19,8 @@ import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingItemDone;
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
@@ -29,6 +31,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.platform.core.web.bind.RequestState;
 
 /**
  * 卖家获取对应的客户打样申请单
@@ -64,6 +67,38 @@ public class SaleSampleController {
 		return purchaseProofingService.findAllByPageInfo(info, keyword);
 	}
 
+	/**
+	 * 作为卖家，分页获取客户的打样申请单（待处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET, params = RequestState.TODO)
+	@ResponseBody
+	public Page<PurchaseProofingItemTodo> getTodoProofingItems(PageParams params, String keyword) {
+		PageInfo info = new PageInfo(params);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		logger.log("客户打样申请", "查看所有客户打样申请（待处理）");
+		return purchaseProofingService.findTodoByPageInfo(info, keyword);
+	}
+
+	/**
+	 * 作为卖家，分页获取客户的打样申请单（已处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET, params = RequestState.DONE)
+	@ResponseBody
+	public Page<PurchaseProofingItemDone> getDoneProofingItems(PageParams params, String keyword) {
+		PageInfo info = new PageInfo(params);
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		logger.log("客户打样申请", "查看所有客户打样申请（已处理）");
+		return purchaseProofingService.findDoneByPageInfo(info, keyword);
+	}
+
 	/**
 	 * 作为卖家，根据打样申请明细ID查找客户客户打样申请明细
 	 * 

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

@@ -0,0 +1,13 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.PurchaseProofingItemDone;
+
+@Repository
+public interface PurchaseProofingItemDoneDao extends JpaSpecificationExecutor<PurchaseProofingItemDone>, JpaRepository<PurchaseProofingItemDone, Long> {
+
+
+}

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

@@ -0,0 +1,13 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
+
+@Repository
+public interface PurchaseProofingItemTodoDao extends JpaSpecificationExecutor<PurchaseProofingItemTodo>, JpaRepository<PurchaseProofingItemTodo, Long> {
+
+
+}

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 /**
  * 平台里面，以供应商的角度来查看客户打样申请明细
  * 
- * @author yingp
+ * @author suntg
  *
  */
 @Table(name = "purc$proofingitems")
@@ -95,7 +95,7 @@ public class PurchaseProofingItem {
 	private String remark;
 	
 	/**
-	 * 送样状态（未送样、已送样）
+	 * 送样状态（未送样 401、已送样 400）
 	 */
 	@Column(name = "ppi_status")
 	private Short status;

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

@@ -0,0 +1,225 @@
+package com.uas.platform.b2b.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Where;
+
+/**
+ * 平台里面，以供应商的角度来查看客户打样申请明细
+ * 已送样
+ * @author suntg
+ *
+ */
+@Table(name = "purc$proofingitems")
+@Where(clause = "ppi_status=400")
+@Entity
+public class PurchaseProofingItemDone {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$proofingitems_gen")
+	@SequenceGenerator(name = "purc$proofingitems_gen", sequenceName = "purc$proofingitems_seq", allocationSize = 1)
+	@Column(name = "ppi_id")
+	private Long id;
+
+	/**
+	 * 来源（买家ERP采购询价明细）的ID
+	 */
+	@Column(name = "ppi_sourceid", updatable = false)
+	private Long sourceId;
+
+	/**
+	 * 序号
+	 */
+	@Column(name = "ppi_number")
+	private Short number;
+
+	/**
+	 * 客户打样申请
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = "ppi_ppid", nullable = false)
+	private PurchaseProofing proofing;
+
+	/**
+	 * 币种
+	 */
+	@Column(name = "ppi_currency")
+	private String currency;
+
+	/**
+	 * 税率
+	 */
+	@Column(name = "ppi_taxrate")
+	private Double taxrate;
+
+	/**
+	 * 单价
+	 */
+	@Column(name = "ppi_price")
+	private Double price;
+
+	/**
+	 * 数量
+	 */
+	@Column(name = "ppi_qty")
+	private Double qty;
+
+	/**
+	 * 总价
+	 */
+	@Column(name = "ppi_amount")
+	private Double amount;
+
+	/**
+	 * 供应商UU
+	 */
+	@Column(name = "ppi_venduu")
+	private Long vendUU;
+
+	/**
+	 * 供应商联系人UU
+	 */
+	@Column(name = "ppi_venduseruu")
+	private Long vendUserUU;
+
+	/**
+	 * 备注
+	 */
+	@Column(name = "ppi_remark")
+	private String remark;
+	
+	/**
+	 * 送样状态（未送样、已送样）
+	 */
+	@Column(name = "ppi_status")
+	private Short status;
+	
+	/**
+	 * 传输到卖家ERP的状态
+	 */
+	@Column(name = "ppi_sendstatus")
+	private Short sendStatus;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getSourceId() {
+		return sourceId;
+	}
+
+	public void setSourceId(Long sourceId) {
+		this.sourceId = sourceId;
+	}
+
+	public Short getNumber() {
+		return number;
+	}
+
+	public void setNumber(Short number) {
+		this.number = number;
+	}
+
+	public PurchaseProofing getProofing() {
+		return proofing;
+	}
+
+	public void setProofing(PurchaseProofing proofing) {
+		this.proofing = proofing;
+	}
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public Double getTaxrate() {
+		return taxrate;
+	}
+
+	public void setTaxrate(Double taxrate) {
+		this.taxrate = taxrate;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getQty() {
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public Double getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Double amount) {
+		this.amount = amount;
+	}
+
+	public Long getVendUU() {
+		return vendUU;
+	}
+
+	public void setVendUU(Long vendUU) {
+		this.vendUU = vendUU;
+	}
+
+	public Long getVendUserUU() {
+		return vendUserUU;
+	}
+
+	public void setVendUserUU(Long vendUserUU) {
+		this.vendUserUU = vendUserUU;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Short getSendStatus() {
+		return sendStatus;
+	}
+
+	public void setSendStatus(Short sendStatus) {
+		this.sendStatus = sendStatus;
+	}
+
+	public Short getStatus() {
+		return status;
+	}
+
+	public void setStatus(Short status) {
+		this.status = status;
+	}
+
+
+}

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

@@ -0,0 +1,225 @@
+package com.uas.platform.b2b.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Where;
+
+/**
+ * 平台里面，以供应商的角度来查看客户打样申请明细
+ * 未送样
+ * @author suntg
+ *
+ */
+@Table(name = "purc$proofingitems")
+@Where(clause = "ppi_status=401")
+@Entity
+public class PurchaseProofingItemTodo {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$proofingitems_gen")
+	@SequenceGenerator(name = "purc$proofingitems_gen", sequenceName = "purc$proofingitems_seq", allocationSize = 1)
+	@Column(name = "ppi_id")
+	private Long id;
+
+	/**
+	 * 来源（买家ERP采购询价明细）的ID
+	 */
+	@Column(name = "ppi_sourceid", updatable = false)
+	private Long sourceId;
+
+	/**
+	 * 序号
+	 */
+	@Column(name = "ppi_number")
+	private Short number;
+
+	/**
+	 * 客户打样申请
+	 */
+	@ManyToOne(cascade = CascadeType.ALL, optional = true)
+	@JoinColumn(name = "ppi_ppid", nullable = false)
+	private PurchaseProofing proofing;
+
+	/**
+	 * 币种
+	 */
+	@Column(name = "ppi_currency")
+	private String currency;
+
+	/**
+	 * 税率
+	 */
+	@Column(name = "ppi_taxrate")
+	private Double taxrate;
+
+	/**
+	 * 单价
+	 */
+	@Column(name = "ppi_price")
+	private Double price;
+
+	/**
+	 * 数量
+	 */
+	@Column(name = "ppi_qty")
+	private Double qty;
+
+	/**
+	 * 总价
+	 */
+	@Column(name = "ppi_amount")
+	private Double amount;
+
+	/**
+	 * 供应商UU
+	 */
+	@Column(name = "ppi_venduu")
+	private Long vendUU;
+
+	/**
+	 * 供应商联系人UU
+	 */
+	@Column(name = "ppi_venduseruu")
+	private Long vendUserUU;
+
+	/**
+	 * 备注
+	 */
+	@Column(name = "ppi_remark")
+	private String remark;
+	
+	/**
+	 * 送样状态（未送样、已送样）
+	 */
+	@Column(name = "ppi_status")
+	private Short status;
+	
+	/**
+	 * 传输到卖家ERP的状态
+	 */
+	@Column(name = "ppi_sendstatus")
+	private Short sendStatus;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getSourceId() {
+		return sourceId;
+	}
+
+	public void setSourceId(Long sourceId) {
+		this.sourceId = sourceId;
+	}
+
+	public Short getNumber() {
+		return number;
+	}
+
+	public void setNumber(Short number) {
+		this.number = number;
+	}
+
+	public PurchaseProofing getProofing() {
+		return proofing;
+	}
+
+	public void setProofing(PurchaseProofing proofing) {
+		this.proofing = proofing;
+	}
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(String currency) {
+		this.currency = currency;
+	}
+
+	public Double getTaxrate() {
+		return taxrate;
+	}
+
+	public void setTaxrate(Double taxrate) {
+		this.taxrate = taxrate;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getQty() {
+		return qty;
+	}
+
+	public void setQty(Double qty) {
+		this.qty = qty;
+	}
+
+	public Double getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Double amount) {
+		this.amount = amount;
+	}
+
+	public Long getVendUU() {
+		return vendUU;
+	}
+
+	public void setVendUU(Long vendUU) {
+		this.vendUU = vendUU;
+	}
+
+	public Long getVendUserUU() {
+		return vendUserUU;
+	}
+
+	public void setVendUserUU(Long vendUserUU) {
+		this.vendUserUU = vendUserUU;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Short getSendStatus() {
+		return sendStatus;
+	}
+
+	public void setSendStatus(Short sendStatus) {
+		this.sendStatus = sendStatus;
+	}
+
+	public Short getStatus() {
+		return status;
+	}
+
+	public void setStatus(Short status) {
+		this.status = status;
+	}
+
+
+}

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

@@ -7,6 +7,8 @@ import org.springframework.data.domain.Page;
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingItemDone;
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.core.model.PageInfo;
 
@@ -42,7 +44,7 @@ public interface PurchaseProofingService {
 	public void uploadProofingSuccess(String[] idArray);
 
 	/**
-	 * 分页查找客户打样申请
+	 * 分页查找客户打样申请（全部）
 	 * 
 	 * @param pageInfo
 	 * @param keyword
@@ -50,6 +52,26 @@ public interface PurchaseProofingService {
 	 * @return
 	 */
 	public Page<PurchaseProofingItem> findAllByPageInfo(PageInfo pageInfo, String keyword);
+	
+	/**
+	 * 分页查找客户打样申请（待处理）
+	 * 
+	 * @param pageInfo
+	 * @param keyword
+	 *            查找关键词
+	 * @return
+	 */
+	public Page<PurchaseProofingItemTodo> findTodoByPageInfo(PageInfo pageInfo, String keyword);
+	
+	/**
+	 * 分页查找客户打样申请（已处理）
+	 * 
+	 * @param pageInfo
+	 * @param keyword
+	 *            查找关键词
+	 * @return
+	 */
+	public Page<PurchaseProofingItemDone> findDoneByPageInfo(PageInfo pageInfo, String keyword);
 
 	/**
 	 * 分页查找客户打样认定单

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

@@ -21,14 +21,18 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.AttachDao;
 import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
 import com.uas.platform.b2b.dao.PurchaseProofingDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDoneDao;
 import com.uas.platform.b2b.dao.PurchaseProofingItemIndexDao;
 import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemTodoDao;
 import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
 import com.uas.platform.b2b.event.PurchaseProofingItemSaveEvent;
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.PurchaseProofing;
 import com.uas.platform.b2b.model.PurchaseProofingApproval;
 import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingItemDone;
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.service.PurchaseProofingService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -43,6 +47,12 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 
 	@Autowired
 	private PurchaseProofingItemDao purchaseProofingItemDao;
+	
+	@Autowired
+	private PurchaseProofingItemDoneDao purchaseProofingItemDoneDao;
+	
+	@Autowired
+	private PurchaseProofingItemTodoDao purchaseProofingItemTodoDao;
 
 	@Autowired
 	private PurchaseProofingDao purchaseProofingDao;
@@ -377,4 +387,36 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}, pageInfo);
 	}
 
+	@Override
+	public Page<PurchaseProofingItemTodo> findTodoByPageInfo(final PageInfo pageInfo,
+			final String keyword) {
+		return purchaseProofingItemTodoDao.findAll(new Specification<PurchaseProofingItemTodo>() {
+
+			public Predicate toPredicate(Root<PurchaseProofingItemTodo> root, CriteriaQuery<?> query,
+					CriteriaBuilder builder) {
+				if (StringUtils.hasText(keyword))
+					pageInfo.expression(PredicateUtils.in("id", purchaseProofingItemIndexDao.findByKeyword(
+							SystemSession.getUser().getEnterprise().getUu(), keyword), false));
+				query.where(pageInfo.getPredicates(root, query, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
+	@Override
+	public Page<PurchaseProofingItemDone> findDoneByPageInfo(final PageInfo pageInfo,
+			final String keyword) {
+		return purchaseProofingItemDoneDao.findAll(new Specification<PurchaseProofingItemDone>() {
+
+			public Predicate toPredicate(Root<PurchaseProofingItemDone> root, CriteriaQuery<?> query,
+					CriteriaBuilder builder) {
+				if (StringUtils.hasText(keyword))
+					pageInfo.expression(PredicateUtils.in("id", purchaseProofingItemIndexDao.findByKeyword(
+							SystemSession.getUser().getEnterprise().getUu(), keyword), false));
+				query.where(pageInfo.getPredicates(root, query, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
 }