采购单明细回复请求及业务

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

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.PurchaseReply;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -75,9 +76,12 @@ public class SaleOrderController {
 	 * @param json
 	 * @return
 	 */
-	@RequestMapping(value = "/orders/items/reply", method = RequestMethod.POST)
-	public ResponseEntity<String> replyOrderItem(@RequestBody String json) {
+	@RequestMapping(value = "/orders/items/{orderItemId}/reply", method = RequestMethod.POST)
+	public ResponseEntity<String> replyOrderItem(@RequestBody String json, @PathVariable("orderItemId") Long orderItemId) {
 		PurchaseReply reply = FlexJsonUtils.fromJson(json, PurchaseReply.class);
+		PurchaseOrderItem orderItem = new PurchaseOrderItem();
+		orderItem.setId(orderItemId);
+		reply.setOrderItem(orderItem);
 		purchaseOrderService.reply(reply);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}

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

@@ -5,13 +5,10 @@ import java.sql.Date;
 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.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Table(name = "purc$orderitems")
@@ -19,8 +16,6 @@ import javax.persistence.Table;
 public class PurchaseOrderItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$orderitems_gen")
-	@SequenceGenerator(name = "purc$orderitems_gen", sequenceName = "purc$orderitems_seq", allocationSize = 1)
 	@Column(name = "pd_id")
 	private Long id;
 

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

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
-import java.sql.Date;
+import java.util.Date;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -45,8 +45,8 @@ public class PurchaseReply implements Serializable {
 	/**
 	 * 采购订单明细
 	 */
-	@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
-	@JoinColumn(name = "pr_pdid", updatable = true, insertable = false)
+	@ManyToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	@JoinColumn(name = "pr_pdid")
 	private PurchaseOrderItem orderItem;
 
 	/**

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -62,6 +63,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 	@Override
 	public void reply(PurchaseReply reply) {
+		reply.setDate(new Date());
 		purchaseReplyDao.save(reply);
 		PurchaseOrderItem item = purchaseOrderItemDao.findOne(reply.getOrderItem().getId());
 		Double replyQty = item.getReplyQty();