销售订单，采购订单获取待交货和已回复数据前先进行检验更新数据

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

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

@@ -23,6 +23,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
@@ -76,6 +77,9 @@ public class SaleOrderController {
 	@Autowired
 	private PurchaseOrderWaitingDao purchaseOrderWaitingDao;
 
+	@Autowired
+	private PurchaseOrderDoneDao purchaseOrderDoneDao;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
@@ -422,6 +426,7 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderDone> getDoneSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（已回复）");
+		purchaseOrderDoneDao.updateStatusForSaleDone(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -782,6 +787,7 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderDone> getDonePurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已回复）");
+		purchaseOrderDoneDao.updateStatusForPurcDone(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.REPLIED.value());

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.PurchaseOrderDone;
@@ -9,4 +10,20 @@ import com.uas.platform.b2b.model.PurchaseOrderDone;
 @Repository
 public interface PurchaseOrderDoneDao extends JpaSpecificationExecutor<PurchaseOrderDone>, JpaRepository<PurchaseOrderDone, Long> {
 
+	/**
+	 * 更新已回复状态
+	 * 
+	 * @param venduu
+	 */
+	@Procedure(procedureName = "sale$orders_done_status_update")
+	public void updateStatusForSaleDone(Long venduu);
+
+	/**
+	 * 更新已回复状态
+	 * 
+	 * @param venduu
+	 */
+	@Procedure(procedureName = "purc$orders_done_status_update")
+	public void updateStatusForPurcDone(Long venduu);
+
 }

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

@@ -20,7 +20,7 @@ public interface PurchaseOrderWaitingDao extends JpaSpecificationExecutor<Purcha
 	 * 
 	 * @param venduu
 	 */
-	@Procedure(procedureName = "sale$orders_status_update")
+	@Procedure(procedureName = "sale$orders_wait_status_update")
 	public void updateStatusForSale(Long venduu);
 
 	/**
@@ -28,6 +28,6 @@ public interface PurchaseOrderWaitingDao extends JpaSpecificationExecutor<Purcha
 	 * 
 	 * @param enuu
 	 */
-	@Procedure(procedureName = "purc$orders_status_update")
+	@Procedure(procedureName = "purc$orders_wait_status_update")
 	public void updateStatusForPurc(Long enuu);
 }

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

@@ -27,7 +27,7 @@ import org.hibernate.annotations.Where;
  * 
  */
 @Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date") })
-@Where(clause = "pu_reply=1")
+@Where(clause = "pu_reply=1 and (pu_end = 0 or pu_end is null)")
 @Entity
 public class PurchaseOrderDone {
 

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

@@ -150,7 +150,7 @@ public class PurchaseOrderEnd {
 	 */
 	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
 	@OrderBy("number")
-	@Where(clause = "pd_end=1")
+	@Where(clause = "pd_end=1 or (nvl(pd_acceptqty,0)=nvl(pd_qty,0)+nvl(pd_returnqty,0))")
 	private Set<PurchaseOrderEndItem> orderItems;
 
 	/**