打印状态、查看状态标记

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

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -28,6 +29,7 @@ import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -75,6 +77,20 @@ public class SaleOrderController {
 	public PurchaseOrderAll getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
 		return purchaseOrderService.findById(id);
 	}
+	
+	/**
+	 * 作为卖家，根据采购单据ID查找采购订单(含明细)
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/printCount/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseEntity<String> printCount(@PathVariable("id") Long id) {
+		purchaseOrderService.print(id);
+		logger.log("客户采购单", "打印客户采购订单",id.toString());
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)
@@ -187,6 +203,51 @@ public class SaleOrderController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 修改查看状态，修改为已查看
+	 * 
+	 * @param idString
+	 * @return
+	 */
+	@RequestMapping(value = "/display", params = RequestState.READ, method = RequestMethod.POST)
+	public ResponseEntity<String> setDisplayRead(@RequestBody String idString) {
+		Map<String, String> map = FlexJsonUtils.fromJson(idString);
+		String ids = map.get("ids");
+		purchaseOrderService.setDisplay(ids.split(","), Constant.NO);
+		logger.log("客户采购单", "设置查看状态为已查看", "订单id:" + ids);
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
+
+	/**
+	 * 修改查看状态，修改为未查看
+	 * 
+	 * @param idString
+	 * @return
+	 */
+	@RequestMapping(value = "/display", params = RequestState.UNREAD, method = RequestMethod.POST)
+	public ResponseEntity<String> setDisplayUnRead(@RequestBody String idString) {
+		Map<String, String> map = FlexJsonUtils.fromJson(idString);
+		String ids = map.get("ids");
+		purchaseOrderService.setDisplay(ids.split(","), Constant.YES);
+		logger.log("客户采购单", "设置查看状态为未查看", "订单id:" + ids);
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
+
+	/**
+	 * 修改查看状态，修改为置顶
+	 * 
+	 * @param idString
+	 * @return
+	 */
+	@RequestMapping(value = "/display", params = RequestState.TOP, method = RequestMethod.POST)
+	public ResponseEntity<String> setDisplayTop(@RequestBody String idString) {
+		Map<String, String> map = FlexJsonUtils.fromJson(idString);
+		String ids = map.get("ids");
+		purchaseOrderService.setDisplay(ids.split(","), Constant.TOP);
+		logger.log("客户采购单", "设置查看状态为置顶", "订单id:" + ids);
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
+
 	/**
 	 * 导出
 	 * 

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

@@ -11,6 +11,7 @@ import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
 import com.uas.platform.b2b.model.User;
 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.encry.Md5Utils;
 
@@ -237,6 +238,7 @@ public class Purchase {
 		order.setVendUU(this.ve_uu);//设为单据中供应商UU
 		order.setVendUserUU(this.ve_contactuu);//设为ERP中单据供应商联系人UU
 		order.setAuditor(this.pu_auditman);
+		order.setDisplay(Constant.YES);//设为未查看
 		if (!CollectionUtils.isEmpty(this.purchaseDetails)) {
 			Set<PurchaseOrderAllItem> items = new HashSet<PurchaseOrderAllItem>();
 			for (PurchaseDetail detail : this.purchaseDetails) {

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

@@ -151,6 +151,18 @@ public class PurchaseOrder implements Serializable {
 	 */
 	@Column(name = "pu_end")
 	private Short end;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -320,4 +332,21 @@ public class PurchaseOrder implements Serializable {
 		this.end = end;
 	}
 
+	public Short getDisplay() {
+		if(this.display == null) this.display = 0;
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
+
 }

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

@@ -150,6 +150,18 @@ public class PurchaseOrderAll {
 	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@OrderBy("number")
 	private Set<PurchaseOrderAllItem> orderItems;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -310,4 +322,21 @@ public class PurchaseOrderAll {
 	public void setOrderItems(Set<PurchaseOrderAllItem> orderItems) {
 		this.orderItems = orderItems;
 	}
+
+	public Short getDisplay() {
+		if(this.display == null) this.display = 0;
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

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

@@ -156,6 +156,18 @@ public class PurchaseOrderDone {
 	 */
 	@Column(name = "pu_reply")
 	private Short reply;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -324,4 +336,21 @@ public class PurchaseOrderDone {
 	public void setReply(Short reply) {
 		this.reply = reply;
 	}
+
+	public Short getDisplay() {
+		if(this.display == null) this.display = 0;
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

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

@@ -156,6 +156,18 @@ public class PurchaseOrderEnd {
 	 */
 	@Column(name = "pu_end")
 	private Short end;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
 
 	public Long getId() {
 		return id;
@@ -324,4 +336,21 @@ public class PurchaseOrderEnd {
 	public void setEnd(Short end) {
 		this.end = end;
 	}
+
+	public Short getDisplay() {
+		if(this.display == null) this.display = 0;
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

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

@@ -150,6 +150,19 @@ public class PurchaseOrderTodo {
 	@Where(clause = "pd_status = 200")
 	@OrderBy("number")
 	private Set<PurchaseOrderTodoItem> orderItems;
+	
+	/**
+	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
+	 */
+	@Column(name = "pu_display")
+	private Short display;
+	
+	/**
+	 * 打印次数
+	 */
+	@Column(name = "pu_print")
+	private Short print;
+	
 
 	public Long getId() {
 		return id;
@@ -310,4 +323,21 @@ public class PurchaseOrderTodo {
 	public void setOrderItems(Set<PurchaseOrderTodoItem> orderItems) {
 		this.orderItems = orderItems;
 	}
+
+	public Short getDisplay() {
+		if(this.display == null) this.display = 0;
+		return display;
+	}
+
+	public void setDisplay(Short display) {
+		this.display = display;
+	}
+
+	public Short getPrint() {
+		return print;
+	}
+
+	public void setPrint(Short print) {
+		this.print = print;
+	}
 }

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

@@ -182,4 +182,17 @@ public interface PurchaseOrderService {
 	 * @return
 	 */
 	public int getOnhandCount();
+	
+	/**
+	 * 设置订单的查看状态
+	 * @param idArray
+	 * @param status 0 已查看，1 未查看， 2 置顶
+	 */
+	public void setDisplay(String[] idArray, Short status);
+	
+	/**
+	 * 打印订单，订单打印此次 +1
+	 * @param id
+	 */
+	public void print(Long id);
 }

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

@@ -159,6 +159,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	private PurchaseOrder updateOrderStatus(long orderId) {
 		int notReply = purchaseOrderItemDao.getCountByStatus(orderId, (short) Status.NOT_REPLY.value());
 		PurchaseOrder order = purchaseOrderDao.findOne(orderId);
+		if(order.getDisplay() == 1) order.setDisplay(Constant.NO);//设置查看状态为已查看
 		order.setStatus((short) (notReply > 0 ? Status.NOT_REPLY.value() : Status.REPLIED.value()));
 		if (purchaseOrderItemDao.getCountByReply(orderId) > 0)
 			order.setReply(Constant.YES);
@@ -338,4 +339,24 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 		}, pageInfo);
 	}
 
+	@Override
+	public void setDisplay(String[] idArray, Short status) {
+		for(String id : idArray) {
+			PurchaseOrder order = purchaseOrderDao.findOne(Long.parseLong(id));
+			if(order != null) {
+				order.setDisplay(status);
+				purchaseOrderDao.save(order);
+			}
+		}
+	}
+
+	@Override
+	public void print(Long id) {
+		PurchaseOrder order = purchaseOrderDao.findOne(id);
+		if(order != null) {
+			order.setPrint((short) ((order.getPrint() == null ? 0 : order.getPrint()) + 1));
+		}
+		purchaseOrderDao.save(order);
+	}
+
 }