删除历史单据模块

src/main/java/com/uas/platform/b2b/history/controller/SaleInquiryController.java

@@ -1,87 +0,0 @@
-package com.uas.platform.b2b.history.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.history.model.PurchaseInquiry;
-import com.uas.platform.b2b.history.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.history.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.model.Status;
-import com.uas.platform.core.web.bind.RequestState;
-
-/**
- * 卖家对询价单的操作（历史数据）
- * 
- * @author yingp
- * 
- */
-@Controller("history.SaleInquiryController")
-@RequestMapping("/sale/inquiry/history")
-public class SaleInquiryController {
-
-	@Autowired
-	private PurchaseInquiryService purchaseInquiryService;
-
-	/**
-	 * 作为卖家，收到的采购询价（全部）
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseInquiryItem> getReceivedPurchaseInquiries(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseInquiryService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的采购询价（待回复）
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseInquiryItem> getTodoInquiries(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 询价单状态为未回复
-		info.filter("status", Status.NOT_REPLY.value());
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseInquiryService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的采购询价明细
-	 * 
-	 */
-	@RequestMapping(value = "/items/{inquiryItemId}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseInquiryItem getInquiryItemById(@PathVariable("inquiryItemId") Long inquiryItemId) {
-		return purchaseInquiryService.findItemByItemId(inquiryItemId);
-	}
-
-	/**
-	 * 作为卖家，根据询价单ID查找询价单(含明细)
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseInquiry getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
-		return purchaseInquiryService.findById(id);
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/controller/SaleNoticeController.java

@@ -1,91 +0,0 @@
-package com.uas.platform.b2b.history.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.history.model.PurchaseNotice;
-import com.uas.platform.b2b.history.model.SaleSendItem;
-import com.uas.platform.b2b.history.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.model.Status;
-import com.uas.platform.core.web.bind.RequestState;
-
-/**
- * 卖家对送货提醒的操作（历史数据）
- * 
- * @author yingp
- * 
- */
-@Controller("history.SaleNoticeController")
-@RequestMapping("/sale/notice/history")
-public class SaleNoticeController {
-
-	@Autowired
-	private PurchaseNoticeService purchaseNoticeService;
-
-	/**
-	 * 作为卖家，收到的送货提醒
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseNotice> getReceivedPurchaseNotices(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseNoticeService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的送货提醒，对应id
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseNotice getReceivedPurchaseNoticeById(@PathVariable("id") Long id) {
-		return purchaseNoticeService.findById(id);
-	}
-
-	/**
-	 * 作为卖家，收到的送货提醒，对应id
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}/sendItems", method = RequestMethod.GET)
-	@ResponseBody
-	public List<SaleSendItem> getSendItemsNoticeById(@PathVariable("id") Long id) {
-		return purchaseNoticeService.findSendById(id);
-	}
-
-	/**
-	 * 作为卖家，收到的送货提醒(待发货)
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseNotice> getTodoPurchaseNotices(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 询价单状态为未回复
-		info.filter("status", Status.NOT_REPLY.value());
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseNoticeService.findAllByPageInfo(info);
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/controller/SaleOrderChangeController.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.history.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.history.model.PurchaseOrderChange;
-import com.uas.platform.b2b.history.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.model.Status;
-import com.uas.platform.core.web.bind.RequestState;
-
-/**
- * 卖家对变更单的操作（历史数据）
- * 
- * @author yingp
- * 
- */
-@Controller("history.SaleOrderChangeController")
-@RequestMapping("/sale/changes/history")
-public class SaleOrderChangeController {
-
-	@Autowired
-	private PurchaseOrderChangeService purchaseOrderChangeService;
-
-	/**
-	 * 作为卖家，收到的采购变更单
-	 * 
-	 * @param json
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseOrderChange> getReceivedPurchaseOrderChanges(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderChangeService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的采购变更单
-	 * 
-	 * @param json
-	 * @return
-	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseOrderChange> getTodoPurchaseOrderChanges(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 变更单状态为未回复
-		info.filter("status", Status.NOT_REPLY.value());
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderChangeService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，根据变更单ID查找采购变更单(含明细)
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseOrderChange getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
-		return purchaseOrderChangeService.findById(id);
-	}
-
-}

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

@@ -1,123 +0,0 @@
-package com.uas.platform.b2b.history.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.history.model.PurchaseOrder;
-import com.uas.platform.b2b.history.model.PurchaseOrderAll;
-import com.uas.platform.b2b.history.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.history.model.PurchaseOrderReply;
-import com.uas.platform.b2b.history.model.PurchaseOrderTodo;
-import com.uas.platform.b2b.history.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.web.bind.RequestState;
-
-/**
- * 卖家对订单的操作（历史数据）
- * 
- * @author yingp
- * 
- */
-@Controller("history.SaleOrderController")
-@RequestMapping("/sale/orders/history")
-public class SaleOrderController {
-
-	@Autowired
-	private PurchaseOrderService purchaseOrderService;
-
-	/**
-	 * 作为卖家，收到的采购订单
-	 * 
-	 * @param json
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.POST)
-	@ResponseBody
-	public Page<PurchaseOrder> getReceivedPurchaseOrders(@RequestBody String json) {
-		PageInfo info = new PageInfo(json);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderService.findAllByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，根据采购单据ID查找采购订单(含明细)
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseOrderAll getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) {
-		return purchaseOrderService.findById(id);
-	}
-
-	/**
-	 * 作为卖家，收到的采购订单(含明细)
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/items", method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseOrderAll> getReceivedPurchaseOrderItems(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderService.findAllDetailByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的采购订单(含明细)(待回复)
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/items", params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseOrderTodo> getTodoPurchaseOrderItems(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderService.findTodoByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，收到的采购订单(含明细)(已回复)
-	 * 
-	 * @param params
-	 * @return
-	 */
-	@RequestMapping(value = "/items", params = RequestState.END, method = RequestMethod.GET)
-	@ResponseBody
-	public Page<PurchaseOrderEnd> getEndPurchaseOrderItems(PageParams params) {
-		PageInfo info = new PageInfo(params);
-		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseOrderService.findEndByPageInfo(info);
-	}
-
-	/**
-	 * 作为卖家，查看我的回复
-	 * 
-	 * @param orderItemId
-	 *            订单明细行ID
-	 * @return
-	 */
-	@RequestMapping(value = "/items/{orderItemId}/reply", method = RequestMethod.GET)
-	@ResponseBody
-	public List<PurchaseOrderReply> getPurchaseReply(@PathVariable("orderItemId") Long orderItemId) {
-		return purchaseOrderService.findReplyByOrderItem(orderItemId);
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseInquiryDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseInquiry;
-
-@Repository("history.PurchaseInquiryDao")
-public interface PurchaseInquiryDao extends JpaSpecificationExecutor<PurchaseInquiry>, JpaRepository<PurchaseInquiry, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseInquiryItemDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseInquiryItem;
-
-@Repository("history.PurchaseInquiryItemDao")
-public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<PurchaseInquiryItem>, JpaRepository<PurchaseInquiryItem, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseInquiryReplyDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseInquiryReply;
-
-@Repository("history.PurchaseInquiryReplyDao")
-public interface PurchaseInquiryReplyDao extends JpaSpecificationExecutor<PurchaseInquiryReply>, JpaRepository<PurchaseInquiryReply, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseNoticeDao.java

@@ -1,13 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseNotice;
-
-@Repository("history.PurchaseNoticeDao")
-public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNotice>, JpaRepository<PurchaseNotice, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderAllDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderAll;
-
-@Repository("history.PurchaseOrderAllDao")
-public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOrderAll>, JpaRepository<PurchaseOrderAll, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderAllItemDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderAllItem;
-
-@Repository("history.PurchaseOrderAllItemDao")
-public interface PurchaseOrderAllItemDao extends JpaSpecificationExecutor<PurchaseOrderAllItem>, JpaRepository<PurchaseOrderAllItem, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderChangeDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderChange;
-
-@Repository("history.PurchaseOrderChangeDao")
-public interface PurchaseOrderChangeDao extends JpaSpecificationExecutor<PurchaseOrderChange>, JpaRepository<PurchaseOrderChange, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderChangeItemDao.java

@@ -1,13 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderChangeItem;
-
-@Repository("history.PurchaseOrderChangeItemDao")
-public interface PurchaseOrderChangeItemDao extends JpaSpecificationExecutor<PurchaseOrderChangeItem>,
-		JpaRepository<PurchaseOrderChangeItem, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrder;
-
-@Repository("history.PurchaseOrderDao")
-public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder>, JpaRepository<PurchaseOrder, Long> {
-	
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderEndDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderEnd;
-
-@Repository("history.PurchaseOrderEndDao")
-public interface PurchaseOrderEndDao extends JpaSpecificationExecutor<PurchaseOrderEnd>, JpaRepository<PurchaseOrderEnd, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderItemDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderItem;
-
-@Repository("history.PurchaseOrderItemDao")
-public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseOrderItem>, JpaRepository<PurchaseOrderItem, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderReplyDao.java

@@ -1,23 +0,0 @@
-package com.uas.platform.b2b.history.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.history.model.PurchaseOrderReply;
-
-@Repository("history.PurchaseOrderReplyDao")
-public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<PurchaseOrderReply>, JpaRepository<PurchaseOrderReply, Long> {
-	/**
-	 * 按订单明细ID查找订单明细回复
-	 * 
-	 * @param orderItemId
-	 * @return
-	 */
-	@Query("from PurchaseOrderReply r where r.orderItem.id = :orderItemId order by r.date desc")
-	public List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
-}

src/main/java/com/uas/platform/b2b/history/dao/PurchaseOrderTodoDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.PurchaseOrderTodo;
-
-@Repository("history.PurchaseOrderTodoDao")
-public interface PurchaseOrderTodoDao extends JpaSpecificationExecutor<PurchaseOrderTodo>, JpaRepository<PurchaseOrderTodo, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/SaleQuotationDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.SaleQuotation;
-
-@Repository("history.SaleQuotationDao")
-public interface SaleQuotationDao extends JpaSpecificationExecutor<SaleQuotation>, JpaRepository<SaleQuotation, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/SaleQuotationItemDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.SaleQuotationItem;
-
-@Repository("history.SaleQuotationItemDao")
-public interface SaleQuotationItemDao extends JpaSpecificationExecutor<SaleQuotationItem>, JpaRepository<SaleQuotationItem, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/SaleSendDao.java

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.history.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.history.model.SaleSend;
-
-@Repository("history.SaleSendDao")
-public interface SaleSendDao extends JpaSpecificationExecutor<SaleSend>, JpaRepository<SaleSend, Long> {
-
-}

src/main/java/com/uas/platform/b2b/history/dao/SaleSendItemDao.java

@@ -1,25 +0,0 @@
-package com.uas.platform.b2b.history.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.history.model.SaleSendItem;
-
-@Repository("history.SaleSendItemDao")
-public interface SaleSendItemDao extends JpaSpecificationExecutor<SaleSendItem>, JpaRepository<SaleSendItem, Long> {
-
-	/**
-	 * 按送货提醒单ID查找发货单明细
-	 * 
-	 * @param noticeId
-	 * @return
-	 */
-	@Query("from SaleSendItem s where s.notice.id = :noticeId order by s.id")
-	List<SaleSendItem> findByNoticeId(@Param("noticeId") long noticeId);
-
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseInquiry.java

@@ -1,208 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Enterprise;
-
-/**
- * 客户采购询价单（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$inquiry$his")
-@Entity(name = "PurchaseInquiryHistory")
-public class PurchaseInquiry implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2147648497108840786L;
-
-	@Id
-	@Column(name = "in_id")
-	private Long id;
-
-	/**
-	 * 询价单所属企业UU
-	 */
-	@Column(name = "in_enuu")
-	private Long enUU;
-	
-	/**
-	 * 询价单所属用户UU
-	 */
-	@Column(name = "in_recorderuu")
-	private Long recorderUU;
-
-	/**
-	 * 询价企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
-	@JoinColumn(name = "in_enuu", insertable = false, updatable = false)
-	private Enterprise enterprise;
-
-	/**
-	 * 流水号
-	 */
-	@Column(name = "in_code")
-	private String code;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "in_date")
-	private Date date;
-
-	/**
-	 * 录入人
-	 */
-	@Column(name = "in_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "in_auditor")
-	private String auditor;
-
-	/**
-	 * 报价截止日期
-	 */
-	@Column(name = "in_enddate")
-	private Date endDate;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "in_remark")
-	private String remark;
-
-	/**
-	 * 是否公开<br>
-	 * 1、 公共<br>
-	 * 0、 不用开
-	 */
-	@Column(name = "in_isopen")
-	private Short isOpen;
-
-	/**
-	 * 询价明细
-	 */
-	@OneToMany(mappedBy = "inquiry", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<PurchaseInquiryItem> inquiryItems;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Enterprise getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public Long getRecorderUU() {
-		return recorderUU;
-	}
-
-	public void setRecorderUU(Long recorderUU) {
-		this.recorderUU = recorderUU;
-	}
-
-	@JsonIgnore
-	public Set<PurchaseInquiryItem> getInquiryItems() {
-		return inquiryItems;
-	}
-
-	public void setInquiryItems(Set<PurchaseInquiryItem> inquiryItems) {
-		this.inquiryItems = inquiryItems;
-	}
-
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseInquiryItem.java

@@ -1,395 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Product;
-
-/**
- * 客户采购询价单明细（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$inquiryitems$his")
-@Entity(name = "PurchaseInquiryItemHistory")
-public class PurchaseInquiryItem {
-
-	@Id
-	@Column(name = "id_id")
-	private Long id;
-
-	/**
-	 * 来源（买家ERP采购询价明细）的ID
-	 */
-	@Column(name = "id_sourceid", updatable = false)
-	private Long sourceId;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "id_number")
-	private Short number;
-
-	/**
-	 * 询价单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "id_inid", nullable = false)
-	private PurchaseInquiry inquiry;
-
-	/**
-	 * 买家采购员UU
-	 */
-	@Column(name = "id_useruu")
-	private Long userUU;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "id_prid", insertable = false, updatable = false)
-	private Product product;
-
-	@Column(name = "id_prid")
-	private Long productId;
-
-	/**
-	 * 币种
-	 */
-	@Column(name = "id_currency")
-	private String currency;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "id_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "id_remark")
-	private String remark;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "id_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "id_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * （买家预先提供的）有效期始
-	 */
-	@Column(name = "id_fromdate")
-	private Date fromDate;
-
-	/**
-	 * （买家预先提供的）有效期止
-	 */
-	@Column(name = "id_todate")
-	private Date toDate;
-
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "id_vendfromdate")
-	private Date vendFromDate;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "id_vendtodate")
-	private Date vendToDate;
-
-	/**
-	 * （卖家报的）最小订购量
-	 */
-	@Column(name = "id_minorderqty")
-	private Double minOrderQty;
-
-	/**
-	 * （卖家报的）最小包装量
-	 */
-	@Column(name = "id_minpackqty")
-	private Double minPackQty;
-
-	/**
-	 * 分段报价明细
-	 */
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	@JoinColumn(name = "ir_idid")
-	@OrderBy("lapQty")
-	private Set<PurchaseInquiryReply> replies;
-
-	/**
-	 * {未回复、已回复}
-	 */
-	@Column(name = "id_status")
-	private Short status;
-
-	/**
-	 * (针对卖家的)询价传输状态{待上传、已下载}
-	 */
-	@Column(name = "id_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * (针对买家的)报价信息传输状态{待上传、已下载}
-	 */
-	@Column(name = "id_backstatus")
-	private Short backStatus;
-
-	/**
-	 * (针对卖家的)报价信息传输状态{待上传、已下载}
-	 */
-	@Column(name = "id_replysendstatus")
-	private Short replySendStatus;
-
-	/**
-	 * 是否采纳
-	 */
-	@Column(name = "id_agreed")
-	private Short agreed;
-
-	/**
-	 * (针对卖家的)是否采纳信息传输状态{待上传、已下载}
-	 */
-	@Column(name = "id_decidestatus")
-	private Short decideStatus;
-
-	/**
-	 * 是否买家已设置分段数
-	 */
-	@Column(name = "id_custlap")
-	private Short custLap;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	@JsonIgnore
-	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 PurchaseInquiry getInquiry() {
-		return inquiry;
-	}
-
-	public void setInquiry(PurchaseInquiry inquiry) {
-		this.inquiry = inquiry;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Date getFromDate() {
-		return fromDate;
-	}
-
-	public void setFromDate(Date fromDate) {
-		this.fromDate = fromDate;
-	}
-
-	public Date getToDate() {
-		return toDate;
-	}
-
-	public void setToDate(Date toDate) {
-		this.toDate = toDate;
-	}
-
-	public Date getVendFromDate() {
-		return vendFromDate;
-	}
-
-	public void setVendFromDate(Date vendFromDate) {
-		this.vendFromDate = vendFromDate;
-	}
-
-	public Date getVendToDate() {
-		return vendToDate;
-	}
-
-	public void setVendToDate(Date vendToDate) {
-		this.vendToDate = vendToDate;
-	}
-
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Set<PurchaseInquiryReply> getReplies() {
-		return replies;
-	}
-
-	public void setReplies(Set<PurchaseInquiryReply> replies) {
-		this.replies = replies;
-	}
-
-	public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
-	public Short getAgreed() {
-		return agreed;
-	}
-
-	public void setAgreed(Short agreed) {
-		this.agreed = agreed;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Double getMinOrderQty() {
-		return minOrderQty;
-	}
-
-	public void setMinOrderQty(Double minOrderQty) {
-		this.minOrderQty = minOrderQty;
-	}
-
-	public Double getMinPackQty() {
-		return minPackQty;
-	}
-
-	public void setMinPackQty(Double minPackQty) {
-		this.minPackQty = minPackQty;
-	}
-
-	public Short getBackStatus() {
-		return backStatus;
-	}
-
-	public void setBackStatus(Short backStatus) {
-		this.backStatus = backStatus;
-	}
-
-	public Short getReplySendStatus() {
-		return replySendStatus;
-	}
-
-	public void setReplySendStatus(Short replySendStatus) {
-		this.replySendStatus = replySendStatus;
-	}
-
-	public Short getDecideStatus() {
-		return decideStatus;
-	}
-
-	public void setDecideStatus(Short decideStatus) {
-		this.decideStatus = decideStatus;
-	}
-
-	public Short getCustLap() {
-		return custLap;
-	}
-
-	public void setCustLap(Short custLap) {
-		this.custLap = custLap;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseInquiryReply.java

@@ -1,65 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 采购询价单明细的报价记录（历史数据）
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$inquiryreply$his")
-@Entity(name = "PurchaseInquiryReplyHistory")
-public class PurchaseInquiryReply implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7073527318773931836L;
-
-	@Id
-	@Column(name = "ir_id")
-	private Long id;
-
-	/**
-	 * （买家或卖家定义的）分段数量
-	 */
-	@Column(name = "ir_lapqty")
-	private Double lapQty;
-
-	/**
-	 * （卖家报的）单价
-	 */
-	@Column(name = "ir_price")
-	private Double price;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Double getLapQty() {
-		return lapQty;
-	}
-
-	public void setLapQty(Double lapQty) {
-		this.lapQty = lapQty;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseNotice.java

@@ -1,234 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-/**
- * 客户送货提醒（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$notice$his")
-@Entity(name = "PurchaseNoticeHistory")
-public class PurchaseNotice implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4637910155625380065L;
-	@Id
-	@Column(name = "pn_id")
-	private Long id;
-
-	/**
-	 * 来源系统的送货提醒ID
-	 */
-	@Column(name = "pn_sourceid")
-	private long sourceId;
-
-	/**
-	 * 送货提醒单所属企业UU
-	 */
-	@Column(name = "pn_enuu")
-	private Long enUU;
-
-	/**
-	 * 卖家企业UU
-	 */
-	@Column(name = "pn_venduu")
-	private Long vendUU;
-
-	/**
-	 * 录入日期
-	 */
-	@Column(name = "pn_date")
-	private Date date;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pn_qty")
-	private Double qty;
-
-	/**
-	 * 已发货数
-	 */
-	@Column(name = "pn_endqty")
-	private Double endQty;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pn_delivery")
-	private Date delivery;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pn_remark")
-	private String remark;
-
-	/**
-	 * 处理状态（已回复、未回复），全部发货后改为已回复
-	 */
-	@Column(name = "pn_status", insertable = false, updatable = false)
-	private Short status;
-
-	/**
-	 * 客户采购单明细
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pn_pdid", insertable = false, updatable = false, nullable = false)
-	private PurchaseOrderItem orderItem;
-
-	@Column(name = "pn_pdid")
-	private Long orderItemId;
-
-	/**
-	 * （对卖家）传输状态
-	 */
-	@Column(name = "pn_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 是否已结案
-	 */
-	@Column(name = "pn_end")
-	private Short end;
-
-	/**
-	 * 结案状态是否已传输到卖家ERP的情况
-	 */
-	@Column(name = "pn_endstatus")
-	private Short endStatus;
-
-	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 Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public Double getEndQty() {
-		return endQty;
-	}
-
-	public void setEndQty(Double endQty) {
-		this.endQty = endQty;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public PurchaseOrderItem getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(PurchaseOrderItem orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Short getEnd() {
-		return end;
-	}
-
-	public void setEnd(Short end) {
-		this.end = end;
-	}
-
-	public Short getEndStatus() {
-		return endStatus;
-	}
-
-	public void setEndStatus(Short endStatus) {
-		this.endStatus = endStatus;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Long getOrderItemId() {
-		return orderItemId;
-	}
-
-	public void setOrderItemId(Long orderItemId) {
-		this.orderItemId = orderItemId;
-	}
-
-}

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

@@ -1,298 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-
-/**
- * 客户采购订单（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$orders$his")
-@Entity(name = "PurchaseOrderHistory")
-public class PurchaseOrder implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8022534626635555144L;
-
-	@Id
-	@Column(name = "pu_id")
-	private Long id;
-
-	/**
-	 * 采购单所属企业UU
-	 */
-	@Column(name = "pu_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pu_enuu", insertable = false, updatable = false)
-	private Enterprise enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pu_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "pu_useruu")
-	private Long userUU;
-
-	/**
-	 * 采购单号
-	 */
-	@Column(name = "pu_code")
-	private String code;
-
-	/**
-	 * 采购类型
-	 */
-	@Column(name = "pu_type")
-	private String type;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "pu_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "pu_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "pu_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "pu_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "pu_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "pu_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pu_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "pu_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "pu_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "pu_payments")
-	private String payments;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pu_status")
-	private Short status;
-
-	/**
-	 * 从平台传到供应商ERP的状态
-	 */
-	@Column(name = "pu_sendstatus")
-	private Short sendStatus;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	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 getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Enterprise getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-}

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

@@ -1,353 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-
-/**
- * 客户采购订单（历史数据） <br>
- * 级联采购明细
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$orders$his")
-@Entity(name = "PurchaseOrderAllHistory")
-public class PurchaseOrderAll {
-
-	@Id
-	@Column(name = "pu_id")
-	private Long id;
-
-	/**
-	 * 采购企业UU
-	 */
-	@Column(name = "pu_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
-	@JoinColumn(name = "pu_enuu", insertable = false, updatable = false)
-	private Enterprise enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pu_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "pu_useruu")
-	private Long userUU;
-
-	/**
-	 * 采购单号
-	 */
-	@Column(name = "pu_code")
-	private String code;
-
-	/**
-	 * 采购类型
-	 */
-	@Column(name = "pu_type")
-	private String type;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "pu_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "pu_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "pu_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "pu_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "pu_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "pu_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pu_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "pu_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "pu_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "pu_payments")
-	private String payments;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pu_status")
-	private Short status;
-
-	/**
-	 * 从平台传到供应商ERP的状态
-	 */
-	@Column(name = "pu_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 采购单明细
-	 */
-	@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;
-
-	/**
-	 * 打印次数(采购方)
-	 */
-	@Column(name = "pu_custprint")
-	private Short custPrint;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Enterprise getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public Short getCustPrint() {
-		return custPrint;
-	}
-
-	public void setCustPrint(Short custPrint) {
-		this.custPrint = custPrint;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	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 getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Set<PurchaseOrderAllItem> getOrderItems() {
-		return orderItems;
-	}
-
-	public void setOrderItems(Set<PurchaseOrderAllItem> orderItems) {
-		this.orderItems = orderItems;
-	}
-
-	public Short getDisplay() {
-		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/history/model/PurchaseOrderAllItem.java

@@ -1,260 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Product;
-
-@Table(name = "purc$orderitems$his")
-@Entity(name = "PurchaseOrderAllItemHistory")
-public class PurchaseOrderAllItem {
-
-	@Id
-	@Column(name = "pd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "pd_number")
-	private Short number;
-
-	/**
-	 * 采购订单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "pd_puid", nullable = false)
-	private PurchaseOrderAll order;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "pd_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pd_qty")
-	private Double qty;
-
-	/**
-	 * 已回复的数量
-	 */
-	@Column(name = "pd_replyqty")
-	private Double replyQty;
-
-	/**
-	 * (最近一次)回复的交期
-	 */
-	@Column(name = "pd_replydelivery")
-	private Date replyDelivery;
-	
-	/**
-	 * (最近一次)回复的备注
-	 */
-	@Column(name = "pd_replyremark")
-	private String replyRemark;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pd_remark")
-	private String remark;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "pd_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "pd_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pd_status", insertable = false, updatable = false)
-	private Short status;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "pd_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "pd_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "pd_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pd_delivery")
-	private Date delivery;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	public PurchaseOrderAll getOrder() {
-		return order;
-	}
-
-	public void setOrder(PurchaseOrderAll order) {
-		this.order = order;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public Double getReplyQty() {
-		return replyQty;
-	}
-
-	public void setReplyQty(Double replyQty) {
-		this.replyQty = replyQty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public Date getReplyDelivery() {
-		return replyDelivery;
-	}
-
-	public void setReplyDelivery(Date replyDelivery) {
-		this.replyDelivery = replyDelivery;
-	}
-
-	public String getReplyRemark() {
-		return replyRemark;
-	}
-
-	public void setReplyRemark(String replyRemark) {
-		this.replyRemark = replyRemark;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderChange.java

@@ -1,322 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.core.model.Constant;
-
-/**
- * 客户采购订单变更单 （历史数据）<br>
- * 级联变更明细
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$changes$his")
-@Entity(name = "PurchaseOrderChangeHistory")
-public class PurchaseOrderChange implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -8957353551959748654L;
-
-	@Id
-	@Column(name = "pc_id")
-	private Long id;
-
-	/**
-	 * 采购变更单所属企业UU
-	 */
-	@Column(name = "pc_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购变更单号
-	 */
-	@Column(name = "pc_code")
-	private String code;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "pc_recorder")
-	private String recorder;
-
-	/**
-	 * 单据录入日期
-	 */
-	@Column(name = "pc_indate")
-	private Date date;
-
-	/**
-	 * 变更内容描述
-	 */
-	@Column(name = "pc_description")
-	private String description;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pc_remark")
-	private String remark;
-
-	/**
-	 * 从平台传到供应商ERP的状态
-	 */
-	@Column(name = "pc_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 从平台传回复内容到供应商ERP的状态
-	 */
-	@Column(name = "pc_replysendstatus")
-	private Short replySendStatus;
-
-	/**
-	 * 状态（未回复、已回复）
-	 */
-	@Column(name = "pc_status")
-	private Short status;
-
-	/**
-	 * 卖家是否同意了买家的变更请求(1,0)
-	 */
-	@Column(name = "pc_agreed")
-	private Short agreed;
-
-	/**
-	 * 回复备注
-	 */
-	@Column(name = "pc_replyremark")
-	private String replyRemark;
-
-	/**
-	 * 从平台传回复信息到买方ERP的状态
-	 */
-	@Column(name = "pc_backstatus")
-	private Short backStatus;
-
-	/**
-	 * 新付款方式
-	 */
-	@Column(name = "pc_newpayments")
-	private String newPayments;
-
-	/**
-	 * 新付款币种
-	 */
-	@Column(name = "pc_newcurrency")
-	private String newCurrency;
-
-	/**
-	 * 新汇率
-	 */
-	@Column(name = "pc_newrate")
-	private Float newRate;
-
-	/**
-	 * 采购订单
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pc_puid", insertable = false, updatable = false)
-	private PurchaseOrder order;
-
-	@Column(name = "pc_puid")
-	private Long orderId;
-
-	/**
-	 * 采购变更单明细
-	 */
-	@OneToMany(mappedBy = "orderChange", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<PurchaseOrderChangeItem> orderChangeItems;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	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 String getNewPayments() {
-		return newPayments;
-	}
-
-	public void setNewPayments(String newPayments) {
-		this.newPayments = newPayments;
-	}
-
-	public String getNewCurrency() {
-		return newCurrency;
-	}
-
-	public void setNewCurrency(String newCurrency) {
-		this.newCurrency = newCurrency;
-	}
-
-	public Float getNewRate() {
-		return newRate;
-	}
-
-	public void setNewRate(Float newRate) {
-		this.newRate = newRate;
-	}
-
-	public PurchaseOrder getOrder() {
-		return order;
-	}
-
-	public void setOrder(PurchaseOrder order) {
-		this.order = order;
-	}
-
-	public Set<PurchaseOrderChangeItem> getOrderChangeItems() {
-		return orderChangeItems;
-	}
-
-	public void setOrderChangeItems(Set<PurchaseOrderChangeItem> orderChangeItems) {
-		this.orderChangeItems = orderChangeItems;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getAgreed() {
-		return agreed;
-	}
-
-	public void setAgreed(Short agreed) {
-		this.agreed = agreed;
-	}
-
-	public String getReplyRemark() {
-		return replyRemark;
-	}
-
-	public void setReplyRemark(String replyRemark) {
-		this.replyRemark = replyRemark;
-	}
-
-	public Short getBackStatus() {
-		return backStatus;
-	}
-
-	public void setBackStatus(Short backStatus) {
-		this.backStatus = backStatus;
-	}
-
-	public Short getReplySendStatus() {
-		return replySendStatus;
-	}
-
-	public void setReplySendStatus(Short replySendStatus) {
-		this.replySendStatus = replySendStatus;
-	}
-
-	public Long getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(Long orderId) {
-		this.orderId = orderId;
-	}
-
-	@JsonIgnore
-	public boolean isAgreed() {
-		return this.agreed != null && Constant.YES == this.agreed;
-	}
-
-	/**
-	 * 变更信息转入到采购订单
-	 * 
-	 * @return
-	 */
-	public PurchaseOrder convert() {
-		if (StringUtils.hasText(this.newPayments))
-			this.order.setPayments(this.newPayments);
-		if (StringUtils.hasText(this.newCurrency)) {
-			this.order.setCurrency(this.newCurrency);
-			this.order.setRate(this.newRate);
-		}
-		return this.order;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderChangeItem.java

@@ -1,213 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Product;
-
-/**
- * 客户采购订单变更单明细（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$changeitems$his")
-@Entity(name = "PurchaseOrderChangeItemHistory")
-public class PurchaseOrderChangeItem {
-
-	@Id
-	@Column(name = "pcd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "pcd_number")
-	private Short number;
-
-	/**
-	 * 采购订单变更单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "pcd_pcid", nullable = false)
-	private PurchaseOrderChange orderChange;
-
-	/**
-	 * 采购订单明细
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pcd_pdid", insertable = false, updatable = false)
-	private PurchaseOrderItem orderItem;
-
-	@Column(name = "pcd_pdid")
-	private Long orderItemId;
-
-	/**
-	 * 新产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pcd_newprid", insertable = false, updatable = false)
-	private Product newProduct;
-
-	@Column(name = "pcd_newprid")
-	private Long newProductId;
-
-	/**
-	 * 新数量
-	 */
-	@Column(name = "pcd_newqty")
-	private Double newQty;
-
-	/**
-	 * 新含税单价
-	 */
-	@Column(name = "pcd_newprice")
-	private Double newPrice;
-
-	/**
-	 * 新税率
-	 */
-	@Column(name = "pcd_newtaxrate")
-	private Float newTaxrate;
-
-	/**
-	 * 新交货日期
-	 */
-	@Column(name = "pcd_newdelivery")
-	private Date newDelivery;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pcd_remark")
-	private String remark;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	public PurchaseOrderChange getOrderChange() {
-		return orderChange;
-	}
-
-	public void setOrderChange(PurchaseOrderChange orderChange) {
-		this.orderChange = orderChange;
-	}
-
-	public PurchaseOrderItem getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(PurchaseOrderItem orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public Product getNewProduct() {
-		return newProduct;
-	}
-
-	public void setNewProduct(Product newProduct) {
-		this.newProduct = newProduct;
-	}
-
-	public Double getNewQty() {
-		return newQty;
-	}
-
-	public void setNewQty(Double newQty) {
-		this.newQty = newQty;
-	}
-
-	public Double getNewPrice() {
-		return newPrice;
-	}
-
-	public Long getOrderItemId() {
-		return orderItemId;
-	}
-
-	public void setOrderItemId(Long orderItemId) {
-		this.orderItemId = orderItemId;
-	}
-
-	public Long getNewProductId() {
-		return newProductId;
-	}
-
-	public void setNewProductId(Long newProductId) {
-		this.newProductId = newProductId;
-	}
-
-	public void setNewPrice(Double newPrice) {
-		this.newPrice = newPrice;
-	}
-
-	public Float getNewTaxrate() {
-		return newTaxrate;
-	}
-
-	public void setNewTaxrate(Float newTaxrate) {
-		this.newTaxrate = newTaxrate;
-	}
-
-	public Date getNewDelivery() {
-		return newDelivery;
-	}
-
-	public void setNewDelivery(Date newDelivery) {
-		this.newDelivery = newDelivery;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	/**
-	 * 变更明细转入到采购订单明细
-	 * 
-	 * @return
-	 */
-	public PurchaseOrderItem convert() {
-		if (this.newDelivery != null)
-			this.orderItem.setDelivery(this.newDelivery);
-		if (this.newPrice != null)
-			this.orderItem.setPrice(this.newPrice);
-		if (this.newQty != null && this.newQty > 0)
-			this.orderItem.setQty(this.newQty);
-		if (this.newTaxrate != null)
-			this.orderItem.setTaxrate(this.newTaxrate);
-		if (this.newProduct != null) {
-			this.orderItem.setProduct(this.newProduct);
-			this.orderItem.setProductId(this.newProductId);
-		}
-		return this.orderItem;
-	}
-
-}

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

@@ -1,357 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-
-/**
- * 客户采购订单（历史数据） <br>
- * 级联采购明细<br>
- * 已结案采购单
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$orders$his")
-@Entity(name = "PurchaseOrderEndHistory")
-public class PurchaseOrderEnd {
-
-	@Id
-	@Column(name = "pu_id")
-	private Long id;
-
-	/**
-	 * 采购企业UU
-	 */
-	@Column(name = "pu_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
-	@JoinColumn(name = "pu_enuu", insertable = false, updatable = false)
-	private Enterprise enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pu_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "pu_useruu")
-	private Long userUU;
-
-	/**
-	 * 采购单号
-	 */
-	@Column(name = "pu_code")
-	private String code;
-
-	/**
-	 * 采购类型
-	 */
-	@Column(name = "pu_type")
-	private String type;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "pu_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "pu_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "pu_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "pu_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "pu_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "pu_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pu_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "pu_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "pu_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "pu_payments")
-	private String payments;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pu_status")
-	private Short status;
-
-	/**
-	 * 从平台传到供应商ERP的状态
-	 */
-	@Column(name = "pu_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 采购单明细
-	 */
-	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	@Where(clause = "pd_end=1")
-	private Set<PurchaseOrderEndItem> orderItems;
-	
-	/**
-	 * 显示状态(0 已查看 ， 1 未查看， 2 置顶)
-	 */
-	@Column(name = "pu_display")
-	private Short display;
-	
-	/**
-	 * 打印次数
-	 */
-	@Column(name = "pu_print")
-	private Short print;
-
-	/**
-	 * 打印次数(采购方)
-	 */
-	@Column(name = "pu_custprint")
-	private Short custPrint;
-
-	public Short getCustPrint() {
-		return custPrint;
-	}
-
-	public void setCustPrint(Short custPrint) {
-		this.custPrint = custPrint;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Enterprise getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	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 getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Set<PurchaseOrderEndItem> getOrderItems() {
-		return orderItems;
-	}
-
-	public void setOrderItems(Set<PurchaseOrderEndItem> orderItems) {
-		this.orderItems = orderItems;
-	}
-
-	public Short getDisplay() {
-		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/history/model/PurchaseOrderEndItem.java

@@ -1,260 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Product;
-
-@Table(name = "purc$orderitems$his")
-@Entity(name = "PurchaseOrderEndItemHistory")
-public class PurchaseOrderEndItem {
-
-	@Id
-	@Column(name = "pd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "pd_number")
-	private Short number;
-
-	/**
-	 * 采购订单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "pd_puid", nullable = false)
-	private PurchaseOrderEnd order;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "pd_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pd_qty")
-	private Double qty;
-
-	/**
-	 * 已回复的数量
-	 */
-	@Column(name = "pd_replyqty")
-	private Double replyQty;
-
-	/**
-	 * (最近一次)回复的交期
-	 */
-	@Column(name = "pd_replydelivery")
-	private Date replyDelivery;
-
-	/**
-	 * (最近一次)回复的备注
-	 */
-	@Column(name = "pd_replyremark")
-	private String replyRemark;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pd_remark")
-	private String remark;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "pd_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "pd_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pd_status", insertable = false, updatable = false)
-	private Short status;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "pd_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "pd_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "pd_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pd_delivery")
-	private Date delivery;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	@JsonIgnore
-	public PurchaseOrderEnd getOrder() {
-		return order;
-	}
-
-	public void setOrder(PurchaseOrderEnd order) {
-		this.order = order;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public Double getReplyQty() {
-		return replyQty;
-	}
-
-	public void setReplyQty(Double replyQty) {
-		this.replyQty = replyQty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public Date getReplyDelivery() {
-		return replyDelivery;
-	}
-
-	public void setReplyDelivery(Date replyDelivery) {
-		this.replyDelivery = replyDelivery;
-	}
-
-	public String getReplyRemark() {
-		return replyRemark;
-	}
-
-	public void setReplyRemark(String replyRemark) {
-		this.replyRemark = replyRemark;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-}

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

@@ -1,292 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import com.uas.platform.b2b.model.Product;
-
-/**
- * 客户采购订单明细（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$orderitems$his")
-@Entity(name = "PurchaseOrderItemHistory")
-public class PurchaseOrderItem {
-
-	@Id
-	@Column(name = "pd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "pd_number")
-	private Short number;
-
-	/**
-	 * 采购订单
-	 */
-	@ManyToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
-	@JoinColumn(name = "pd_puid")
-	private PurchaseOrder order;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "pd_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pd_qty")
-	private Double qty;
-
-	/**
-	 * 回复数量
-	 */
-	@Column(name = "pd_replyqty")
-	private Double replyQty;
-
-	/**
-	 * (最近一次)回复的交期
-	 */
-	@Column(name = "pd_replydelivery")
-	private Date replyDelivery;
-
-	/**
-	 * (最近一次)回复的备注
-	 */
-	@Column(name = "pd_replyremark")
-	private String replyRemark;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pd_remark")
-	private String remark;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "pd_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "pd_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "pd_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "pd_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "pd_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pd_delivery")
-	private Date delivery;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pd_status", insertable = false, updatable = false)
-	private Short status;
-
-	/**
-	 * 是否已结案
-	 */
-	@Column(name = "pd_end")
-	private Short end;
-
-	/**
-	 * 结案状态是否已传输到卖家ERP的情况
-	 */
-	@Column(name = "pd_endstatus")
-	private Short endStatus;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	public PurchaseOrder getOrder() {
-		return order;
-	}
-
-	public void setOrder(PurchaseOrder order) {
-		this.order = order;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Double getReplyQty() {
-		return replyQty;
-	}
-
-	public void setReplyQty(Double replyQty) {
-		this.replyQty = replyQty;
-	}
-
-	public String getReplyRemark() {
-		return replyRemark;
-	}
-
-	public void setReplyRemark(String replyRemark) {
-		this.replyRemark = replyRemark;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public Date getReplyDelivery() {
-		return replyDelivery;
-	}
-
-	public void setReplyDelivery(Date replyDelivery) {
-		this.replyDelivery = replyDelivery;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getEnd() {
-		return end;
-	}
-
-	public void setEnd(Short end) {
-		this.end = end;
-	}
-
-	public Short getEndStatus() {
-		return endStatus;
-	}
-
-	public void setEndStatus(Short endStatus) {
-		this.endStatus = endStatus;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/PurchaseOrderReply.java

@@ -1,174 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-/**
- * 
- * 采购订单回复记录（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "purc$reply$his")
-@Entity(name = "PurchaseOrderReplyHistory")
-public class PurchaseOrderReply implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "pr_id")
-	private Long id;
-
-	/**
-	 * 回复时日期
-	 */
-	@Column(name = "pr_date")
-	@OrderBy
-	private Date date;
-
-	/**
-	 * 采购订单明细
-	 */
-	@ManyToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "pr_pdid")
-	private PurchaseOrderItem orderItem;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pr_qty")
-	private Double qty;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pr_remark")
-	private String remark;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pr_delivery")
-	private Date delivery;
-
-	/**
-	 * (针对买家的)传输状态{待上传、已下载}
-	 */
-	@Column(name = "pr_status")
-	private Short status;
-
-	/**
-	 * (针对卖家的)传输状态{待上传、已下载}
-	 */
-	@Column(name = "pr_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 回复人
-	 */
-	@Column(name = "pr_recorder")
-	private String recorder;
-
-	/**
-	 * 类型{供应商ERP回复、供应商平台回复、采购主动回复}
-	 */
-	@Column(name = "pr_type")
-	private String type;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	@JsonIgnore
-	public PurchaseOrderItem getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(PurchaseOrderItem orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-}

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

@@ -1,358 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Where;
-
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.User;
-
-/**
- * 客户采购订单（历史数据） <br>
- * 级联采购明细<br>
- * 待回复采购单
- * 
- * @author yingp
- * 
- */
-@Table(name = "purc$orders$his")
-@Entity(name = "PurchaseOrderTodoHistory")
-@Where(clause = "pu_status=200")
-public class PurchaseOrderTodo {
-
-	@Id
-	@Column(name = "pu_id")
-	private Long id;
-
-	/**
-	 * 采购企业UU
-	 */
-	@Column(name = "pu_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
-	@JoinColumn(name = "pu_enuu", insertable = false, updatable = false)
-	private Enterprise enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pu_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "pu_useruu")
-	private Long userUU;
-
-	/**
-	 * 采购单号
-	 */
-	@Column(name = "pu_code")
-	private String code;
-
-	/**
-	 * 采购类型
-	 */
-	@Column(name = "pu_type")
-	private String type;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "pu_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "pu_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "pu_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "pu_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "pu_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "pu_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pu_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "pu_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "pu_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "pu_payments")
-	private String payments;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pu_status")
-	private Short status;
-
-	/**
-	 * 从平台传到供应商ERP的状态
-	 */
-	@Column(name = "pu_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 采购单明细
-	 */
-	@OneToMany(mappedBy = "order", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@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;
-
-	/**
-	 * 打印次数(采购方)
-	 */
-	@Column(name = "pu_custprint")
-	private Short custPrint;
-
-	public Short getCustPrint() {
-		return custPrint;
-	}
-
-	public void setCustPrint(Short custPrint) {
-		this.custPrint = custPrint;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Enterprise getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	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 getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Set<PurchaseOrderTodoItem> getOrderItems() {
-		return orderItems;
-	}
-
-	public void setOrderItems(Set<PurchaseOrderTodoItem> orderItems) {
-		this.orderItems = orderItems;
-	}
-
-	public Short getDisplay() {
-		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/history/model/PurchaseOrderTodoItem.java

@@ -1,260 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.uas.platform.b2b.model.Product;
-
-@Table(name = "purc$orderitems$his")
-@Entity(name = "PurchaseOrderTodoItemHistory")
-public class PurchaseOrderTodoItem {
-
-	@Id
-	@Column(name = "pd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "pd_number")
-	private Short number;
-
-	/**
-	 * 采购订单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "pd_puid", nullable = false)
-	private PurchaseOrderTodo order;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "pd_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "pd_qty")
-	private Double qty;
-
-	/**
-	 * 已回复的数量
-	 */
-	@Column(name = "pd_replyqty")
-	private Double replyQty;
-
-	/**
-	 * (最近一次)回复的交期
-	 */
-	@Column(name = "pd_replydelivery")
-	private Date replyDelivery;
-
-	/**
-	 * (最近一次)回复的备注
-	 */
-	@Column(name = "pd_replyremark")
-	private String replyRemark;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "pd_remark")
-	private String remark;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "pd_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "pd_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 处理状态（已回复、未回复），全部回复后改为已回复
-	 */
-	@Column(name = "pd_status", insertable = false, updatable = false)
-	private Short status;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "pd_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "pd_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "pd_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "pd_delivery")
-	private Date delivery;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	public PurchaseOrderTodo getOrder() {
-		return order;
-	}
-
-	public void setOrder(PurchaseOrderTodo order) {
-		this.order = order;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public Double getReplyQty() {
-		return replyQty;
-	}
-
-	public void setReplyQty(Double replyQty) {
-		this.replyQty = replyQty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public Date getReplyDelivery() {
-		return replyDelivery;
-	}
-
-	public void setReplyDelivery(Date replyDelivery) {
-		this.replyDelivery = replyDelivery;
-	}
-
-	public String getReplyRemark() {
-		return replyRemark;
-	}
-
-	public void setReplyRemark(String replyRemark) {
-		this.replyRemark = replyRemark;
-	}
-
-	public Short getStatus() {
-		return status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-}

src/main/java/com/uas/platform/b2b/history/model/SaleQuotation.java

@@ -1,227 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 主动报价单（历史数据）<br>
- * （以供应商的视角）
- * 
- * @author yingp
- * 
- */
-@Table(name = "sale$quotation$his")
-@Entity(name = "SaleQuotationHistory")
-public class SaleQuotation implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5284541388827978036L;
-
-	@Id
-	@Column(name = "qu_id")
-	private Long id;
-
-	/**
-	 * 流水号
-	 */
-	@Column(name = "qu_code")
-	private String code;
-
-	/**
-	 * 所属企业(卖家)UU
-	 */
-	@Column(name = "qu_enuu")
-	private Long enUU;
-	
-	/**
-	 * 所属用户(卖家)UU
-	 */
-	@Column(name = "qu_useruu")
-	private Long userUU;
-
-	/**
-	 * 客户UU
-	 */
-	@Column(name = "qu_custuu")
-	private Long custUU;
-
-	/**
-	 * 客户联系人UU
-	 */
-	@Column(name = "qu_custuseruu")
-	private Long custUserUU;
-
-	/**
-	 * 录入日期（有效开始日期）
-	 */
-	@Column(name = "qu_date")
-	private Date date;
-
-	/**
-	 * 有效截止日期
-	 */
-	@Column(name = "qu_enddate")
-	private Date endDate;
-
-	/**
-	 * 币种
-	 */
-	@Column(name = "qu_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "qu_rate")
-	private Float rate;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "qu_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "qu_remark")
-	private String remark;
-
-	/**
-	 * （对买家）传输状态
-	 */
-	@Column(name = "qu_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * 报价明细
-	 */
-	@OneToMany(mappedBy = "quotation", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<SaleQuotationItem> quotationItems;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Long getCustUU() {
-		return custUU;
-	}
-
-	public void setCustUU(Long custUU) {
-		this.custUU = custUU;
-	}
-
-	public Long getCustUserUU() {
-		return custUserUU;
-	}
-
-	public void setCustUserUU(Long custUserUU) {
-		this.custUserUU = custUserUU;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-	
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public Set<SaleQuotationItem> getQuotationItems() {
-		return quotationItems;
-	}
-
-	public void setQuotationItems(Set<SaleQuotationItem> quotationItems) {
-		this.quotationItems = quotationItems;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/SaleQuotationItem.java

@@ -1,196 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import com.uas.platform.b2b.model.Product;
-
-/**
- * 主动报价单明细（历史数据）
- * 
- * @author yingp
- * 
- */
-@Table(name = "sale$quotationitem$his")
-@Entity(name = "SaleQuotationItemHistory")
-public class SaleQuotationItem {
-
-	@Id
-	@Column(name = "qd_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "qd_number")
-	private Short number;
-
-	/**
-	 * 关联主动报价单主记录
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "qd_quid", nullable = false)
-	private SaleQuotation quotation;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "qd_prid", insertable = false, updatable = false)
-	private Product product;
-
-	@Column(name = "qd_prid")
-	private Long productId;
-
-	/**
-	 * 客户料
-	 */
-	@Column(name = "qd_custprcode")
-	private String custProductCode;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "qd_remark")
-	private String remark;
-
-	/**
-	 * 最小订购量
-	 */
-	@Column(name = "qd_minorderqty")
-	private Double minOrderQty;
-
-	/**
-	 * 最小包装量
-	 */
-	@Column(name = "qd_minpackqty")
-	private Double minPackQty;
-
-	/**
-	 * 分段报价明细
-	 */
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	@JoinColumn(name = "qdd_qdid")
-	@OrderBy("lapQty")
-	private Set<SaleQuotationPrice> prices;
-	
-	/**
-	 * 是否采纳
-	 */
-	@Column(name = "qd_agreed")
-	private Short agreed;
-
-	/**
-	 * (针对卖家的)是否采纳信息传输状态{待上传、已下载}
-	 */
-	@Column(name = "qd_decidestatus")
-	private Short decideStatus;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	public SaleQuotation getQuotation() {
-		return quotation;
-	}
-
-	public void setQuotation(SaleQuotation quotation) {
-		this.quotation = quotation;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public String getCustProductCode() {
-		return custProductCode;
-	}
-
-	public void setCustProductCode(String custProductCode) {
-		this.custProductCode = custProductCode;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Double getMinOrderQty() {
-		return minOrderQty;
-	}
-
-	public void setMinOrderQty(Double minOrderQty) {
-		this.minOrderQty = minOrderQty;
-	}
-
-	public Double getMinPackQty() {
-		return minPackQty;
-	}
-
-	public void setMinPackQty(Double minPackQty) {
-		this.minPackQty = minPackQty;
-	}
-
-	public Set<SaleQuotationPrice> getPrices() {
-		return prices;
-	}
-
-	public void setPrices(Set<SaleQuotationPrice> prices) {
-		this.prices = prices;
-	}
-
-	public Short getAgreed() {
-		return agreed;
-	}
-
-	public void setAgreed(Short agreed) {
-		this.agreed = agreed;
-	}
-
-	public Short getDecideStatus() {
-		return decideStatus;
-	}
-
-	public void setDecideStatus(Short decideStatus) {
-		this.decideStatus = decideStatus;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/SaleQuotationPrice.java

@@ -1,59 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 
- * 主动报价，分段报价信息（历史数据）
- * 
- * @author yingp
- *
- */
-@Table(name = "sale$quotationprice$his")
-@Entity(name = "SaleQuotationPriceHistory")
-public class SaleQuotationPrice {
-
-	@Id
-	@Column(name = "qdd_id")
-	private Long id;
-
-	/**
-	 * 分段数量
-	 */
-	@Column(name = "qdd_lapqty")
-	private Double lapQty;
-
-	/**
-	 * 单价
-	 */
-	@Column(name = "qdd_price")
-	private Double price;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Double getLapQty() {
-		return lapQty;
-	}
-
-	public void setLapQty(Double lapQty) {
-		this.lapQty = lapQty;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/SaleSend.java

@@ -1,215 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-/**
- * 发货单（历史数据）<br>
- * （以供应商的视角）
- * 
- * @author yingp
- * 
- */
-@Table(name = "sale$send$his")
-@Entity(name = "SaleSendHistory")
-public class SaleSend implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3659150923247159570L;
-
-	@Id
-	@Column(name = "ss_id")
-	private Long id;
-
-	/**
-	 * 单号
-	 */
-	@Column(name = "ss_code")
-	private String code;
-
-	/**
-	 * 发货单 所属企业(卖家)UU
-	 */
-	@Column(name = "ss_enuu")
-	private Long enUU;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "ss_payments")
-	private String payments;
-
-	/**
-	 * 币别
-	 */
-	@Column(name = "ss_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "ss_rate")
-	private Float rate;
-
-	/**
-	 * 客户企业UU
-	 */
-	@Column(name = "ss_custuu")
-	private Long custUU;
-
-	/**
-	 * 客户联系人UU
-	 */
-	@Column(name = "ss_custuseruu")
-	private Long custUserUU;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "ss_remark")
-	private String remark;
-	
-	/**
-	 * 录单人
-	 */
-	@Column(name = "ss_recorder")
-	private String recorder;
-
-	/**
-	 * 发货明细
-	 */
-	@OneToMany(mappedBy = "send", cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<SaleSendItem> sendItems;
-
-	/**
-	 * （对买家）传输状态
-	 */
-	@Column(name = "ss_sendstatus")
-	private Short sendStatus;
-
-	/**
-	 * （对卖家）传输状态
-	 */
-	@Column(name = "ss_backstatus")
-	private Short backStatus;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public Long getCustUU() {
-		return custUU;
-	}
-
-	public void setCustUU(Long custUU) {
-		this.custUU = custUU;
-	}
-
-	public Long getCustUserUU() {
-		return custUserUU;
-	}
-
-	public void setCustUserUU(Long custUserUU) {
-		this.custUserUU = custUserUU;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	@JsonIgnore
-	public Set<SaleSendItem> getSendItems() {
-		return sendItems;
-	}
-
-	public void setSendItems(Set<SaleSendItem> sendItems) {
-		this.sendItems = sendItems;
-	}
-
-	public Short getSendStatus() {
-		return sendStatus;
-	}
-
-	public void setSendStatus(Short sendStatus) {
-		this.sendStatus = sendStatus;
-	}
-
-	public Short getBackStatus() {
-		return backStatus;
-	}
-
-	public void setBackStatus(Short backStatus) {
-		this.backStatus = backStatus;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/model/SaleSendItem.java

@@ -1,134 +0,0 @@
-package com.uas.platform.b2b.history.model;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-/**
- * 发货单明细（历史数据）
- * 
- * @author yingp
- * 
- */
-@Table(name = "sale$senditem$his")
-@Entity(name = "SaleSendItemHistory")
-public class SaleSendItem {
-
-	@Id
-	@Column(name = "si_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "si_number")
-	private Short number;
-
-	/**
-	 * 客户送货提醒单
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "si_noticeid", insertable = false, updatable = false, nullable = false)
-	private PurchaseNotice notice;
-
-	@Column(name = "si_noticeid")
-	private Long noticeId;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "si_qty")
-	private Double qty;
-
-	/**
-	 * 单价
-	 */
-	@Column(name = "si_price")
-	private Double price;
-
-	/**
-	 * 发货单
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "si_ssid", nullable = false)
-	private SaleSend send;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "si_remark")
-	private String remark;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	public PurchaseNotice getNotice() {
-		return notice;
-	}
-
-	public void setNotice(PurchaseNotice notice) {
-		this.notice = notice;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public SaleSend getSend() {
-		return send;
-	}
-
-	public void setSend(SaleSend send) {
-		this.send = send;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Long getNoticeId() {
-		return noticeId;
-	}
-
-	public void setNoticeId(Long noticeId) {
-		this.noticeId = noticeId;
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/service/PurchaseInquiryService.java

@@ -1,35 +0,0 @@
-package com.uas.platform.b2b.history.service;
-
-import org.springframework.data.domain.Page;
-
-import com.uas.platform.b2b.history.model.PurchaseInquiry;
-import com.uas.platform.b2b.history.model.PurchaseInquiryItem;
-import com.uas.platform.core.model.PageInfo;
-
-public interface PurchaseInquiryService {
-
-	/**
-	 * 分页查找询价单
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseInquiryItem> findAllByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 用询价单ID查找询价单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseInquiry findById(Long id);
-
-	/**
-	 * 用询价单明细ID查找询价单明细
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseInquiryItem findItemByItemId(Long itemId);
-
-}

src/main/java/com/uas/platform/b2b/history/service/PurchaseNoticeService.java

@@ -1,37 +0,0 @@
-package com.uas.platform.b2b.history.service;
-
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
-import com.uas.platform.b2b.history.model.PurchaseNotice;
-import com.uas.platform.b2b.history.model.SaleSendItem;
-import com.uas.platform.core.model.PageInfo;
-
-public interface PurchaseNoticeService {
-
-	/**
-	 * 分页查找送货提醒单
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseNotice> findAllByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 用单据ID查找送货提醒单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseNotice findById(Long id);
-
-	/**
-	 * 查找送货提醒单的发货记录
-	 * 
-	 * @param noticeId
-	 * @return
-	 */
-	public List<SaleSendItem> findSendById(long noticeId);
-
-}

src/main/java/com/uas/platform/b2b/history/service/PurchaseOrderChangeService.java

@@ -1,26 +0,0 @@
-package com.uas.platform.b2b.history.service;
-
-import org.springframework.data.domain.Page;
-
-import com.uas.platform.b2b.history.model.PurchaseOrderChange;
-import com.uas.platform.core.model.PageInfo;
-
-public interface PurchaseOrderChangeService {
-
-	/**
-	 * 分页查找变更单，包括明细
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseOrderChange> findAllByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 用变更单ID查找变更单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseOrderChange findById(Long id);
-
-}

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

@@ -1,65 +0,0 @@
-package com.uas.platform.b2b.history.service;
-
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
-import com.uas.platform.b2b.history.model.PurchaseOrder;
-import com.uas.platform.b2b.history.model.PurchaseOrderAll;
-import com.uas.platform.b2b.history.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.history.model.PurchaseOrderReply;
-import com.uas.platform.b2b.history.model.PurchaseOrderTodo;
-import com.uas.platform.core.model.PageInfo;
-
-public interface PurchaseOrderService {
-
-	/**
-	 * 分页查找订单
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseOrder> findAllByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 分页查找订单，包括明细
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseOrderAll> findAllDetailByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 分页查找待回复订单，包括明细
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseOrderTodo> findTodoByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 分页查找已结案订单明细
-	 * 
-	 * @param pageInfo
-	 * @return
-	 */
-	public Page<PurchaseOrderEnd> findEndByPageInfo(PageInfo pageInfo);
-
-	/**
-	 * 用订单ID查找订单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseOrderAll findById(Long id);
-
-	/**
-	 * 查找订单明细的回复记录
-	 * 
-	 * @param orderItemId
-	 *            订单明细ID
-	 * @return
-	 */
-	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId);
-
-}

src/main/java/com/uas/platform/b2b/history/service/impl/PurchaseInquiryServiceImpl.java

@@ -1,50 +0,0 @@
-package com.uas.platform.b2b.history.service.impl;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.history.dao.PurchaseInquiryDao;
-import com.uas.platform.b2b.history.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.history.model.PurchaseInquiry;
-import com.uas.platform.b2b.history.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.history.service.PurchaseInquiryService;
-import com.uas.platform.core.model.PageInfo;
-
-@Service("history.PurchaseInquiryService")
-public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
-
-	@Autowired
-	private PurchaseInquiryItemDao purchaseInquiryItemDao;
-
-	@Autowired
-	private PurchaseInquiryDao purchaseInquiryDao;
-
-	@Override
-	public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo) {
-		return purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
-
-			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public PurchaseInquiry findById(Long id) {
-		return purchaseInquiryDao.findOne(id);
-	}
-
-	@Override
-	public PurchaseInquiryItem findItemByItemId(Long itemId) {
-		return purchaseInquiryItemDao.findOne(itemId);
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/service/impl/PurchaseNoticeServiceImpl.java

@@ -1,52 +0,0 @@
-package com.uas.platform.b2b.history.service.impl;
-
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.history.dao.PurchaseNoticeDao;
-import com.uas.platform.b2b.history.dao.SaleSendItemDao;
-import com.uas.platform.b2b.history.model.PurchaseNotice;
-import com.uas.platform.b2b.history.model.SaleSendItem;
-import com.uas.platform.b2b.history.service.PurchaseNoticeService;
-import com.uas.platform.core.model.PageInfo;
-
-@Service("history.PurchaseNoticeService")
-public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
-
-	@Autowired
-	private PurchaseNoticeDao purchaseNoticeDao;
-
-	@Autowired
-	private SaleSendItemDao saleSendItemDao;
-
-	@Override
-	public Page<PurchaseNotice> findAllByPageInfo(final PageInfo pageInfo) {
-		return purchaseNoticeDao.findAll(new Specification<PurchaseNotice>() {
-
-			public Predicate toPredicate(Root<PurchaseNotice> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public PurchaseNotice findById(Long id) {
-		return purchaseNoticeDao.findOne(id);
-	}
-
-	@Override
-	public List<SaleSendItem> findSendById(long noticeId) {
-		return saleSendItemDao.findByNoticeId(noticeId);
-	}
-
-}

src/main/java/com/uas/platform/b2b/history/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -1,39 +0,0 @@
-package com.uas.platform.b2b.history.service.impl;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.history.dao.PurchaseOrderChangeDao;
-import com.uas.platform.b2b.history.model.PurchaseOrderChange;
-import com.uas.platform.b2b.history.service.PurchaseOrderChangeService;
-import com.uas.platform.core.model.PageInfo;
-
-@Service("history.PurchaseOrderChangeService")
-public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeService {
-
-	@Autowired
-	private PurchaseOrderChangeDao purchaseOrderChangeDao;
-
-	@Override
-	public Page<PurchaseOrderChange> findAllByPageInfo(final PageInfo pageInfo) {
-		return purchaseOrderChangeDao.findAll(new Specification<PurchaseOrderChange>() {
-
-			public Predicate toPredicate(Root<PurchaseOrderChange> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public PurchaseOrderChange findById(Long id) {
-		return purchaseOrderChangeDao.findOne(id);
-	}
-}

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

@@ -1,103 +0,0 @@
-package com.uas.platform.b2b.history.service.impl;
-
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.history.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.history.dao.PurchaseOrderDao;
-import com.uas.platform.b2b.history.dao.PurchaseOrderEndDao;
-import com.uas.platform.b2b.history.dao.PurchaseOrderReplyDao;
-import com.uas.platform.b2b.history.dao.PurchaseOrderTodoDao;
-import com.uas.platform.b2b.history.model.PurchaseOrder;
-import com.uas.platform.b2b.history.model.PurchaseOrderAll;
-import com.uas.platform.b2b.history.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.history.model.PurchaseOrderReply;
-import com.uas.platform.b2b.history.model.PurchaseOrderTodo;
-import com.uas.platform.b2b.history.service.PurchaseOrderService;
-import com.uas.platform.core.exception.NotFoundException;
-import com.uas.platform.core.model.PageInfo;
-
-@Service("history.PurchaseOrderService")
-public class PurchaseOrderServiceImpl implements PurchaseOrderService {
-
-	@Autowired
-	private PurchaseOrderDao purchaseOrderDao;
-
-	@Autowired
-	private PurchaseOrderAllDao purchaseOrderAllDao;
-
-	@Autowired
-	private PurchaseOrderTodoDao purchaseOrderTodoDao;
-
-	@Autowired
-	private PurchaseOrderEndDao purchaseOrderEndDao;
-
-	@Autowired
-	private PurchaseOrderReplyDao purchaseOrderReplyDao;
-
-	public Page<PurchaseOrder> findAllByPageInfo(final PageInfo pageInfo) {
-		return purchaseOrderDao.findAll(new Specification<PurchaseOrder>() {
-
-			public Predicate toPredicate(Root<PurchaseOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public Page<PurchaseOrderAll> findAllDetailByPageInfo(final PageInfo pageInfo) {
-		return purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
-
-			public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public PurchaseOrderAll findById(Long id) {
-		PurchaseOrderAll purchaseOrder = purchaseOrderAllDao.findOne(id);
-		if (purchaseOrder == null)
-			throw new NotFoundException();
-		return purchaseOrder;
-	}
-
-	@Override
-	public Page<PurchaseOrderTodo> findTodoByPageInfo(final PageInfo pageInfo) {
-		return purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
-
-			public Predicate toPredicate(Root<PurchaseOrderTodo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public Page<PurchaseOrderEnd> findEndByPageInfo(final PageInfo pageInfo) {
-		return purchaseOrderEndDao.findAll(new Specification<PurchaseOrderEnd>() {
-
-			public Predicate toPredicate(Root<PurchaseOrderEnd> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
-	}
-
-	@Override
-	public List<PurchaseOrderReply> findReplyByOrderItem(long orderItemId) {
-		return purchaseOrderReplyDao.findByOrderItemId(orderItemId);
-	}
-
-}

src/main/webapp/resources/js/index/app.js

@@ -3135,7 +3135,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
     }]);
 
-    app.controller('SaleOrderCtrl', ['$scope', '$filter', 'PurcOrderItem', 'PurcOrder', 'ngTableParams', 'toaster', 'ReportService', 'BaseService', 'PurcOrderItemHis', 'PagingRelease', 'SnapshotService', 'PurcOrderItemInfo', 'token', 'CurrentRole', '$timeout', '$modal', function ($scope, $filter, PurcOrderItem, PurcOrder, ngTableParams, toaster, ReportService, BaseService, PurcOrderItemHis, PagingRelease, SnapshotService, PurcOrderItemInfo, token, CurrentRole, $timeout, $modal) {
+    app.controller('SaleOrderCtrl', ['$scope', '$filter', 'PurcOrderItem', 'PurcOrder', 'ngTableParams', 'toaster', 'ReportService', 'BaseService', 'PagingRelease', 'SnapshotService', 'PurcOrderItemInfo', 'token', 'CurrentRole', '$timeout', '$modal', function ($scope, $filter, PurcOrderItem, PurcOrder, ngTableParams, toaster, ReportService, BaseService, PagingRelease, SnapshotService, PurcOrderItemInfo, token, CurrentRole, $timeout, $modal) {
         BaseService.scrollBackToTop();
 
         // 判断是否为普通用户
@@ -3645,7 +3645,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
     }]);
 
-    app.controller('SaleChangeCtrl', ['$scope', '$filter', 'PurcChange', 'PurcChanges', 'ngTableParams', 'toaster', 'BaseService', 'PurcChangeHis', 'CurrentRole', function ($scope, $filter, PurcChange, PurcChanges, ngTableParams, toaster, BaseService, PurcChangeHis, CurrentRole) {
+    app.controller('SaleChangeCtrl', ['$scope', '$filter', 'PurcChange', 'PurcChanges', 'ngTableParams', 'toaster', 'BaseService', 'CurrentRole', function ($scope, $filter, PurcChange, PurcChanges, ngTableParams, toaster, BaseService, CurrentRole) {
         BaseService.scrollBackToTop();
 
         // 获取当前用户是否为普通用户
@@ -7215,7 +7215,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     // 发货提醒
-    app.controller('SaleNoticeCtrl', ['$scope', '$rootScope', '$filter', 'PurcNotice', 'ngTableParams', 'toaster', 'BaseService', 'PurcNoticeHis', '$modal', 'SaleTruck', 'Symbol', '$state', '$timeout', 'PurcNoticeInfo', 'token', 'CurrentRole', function ($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, PurcNoticeHis, $modal, SaleTruck, Symbol, $state, $timeout, PurcNoticeInfo, token, CurrentRole) {
+    app.controller('SaleNoticeCtrl', ['$scope', '$rootScope', '$filter', 'PurcNotice', 'ngTableParams', 'toaster', 'BaseService', '$modal', 'SaleTruck', 'Symbol', '$state', '$timeout', 'PurcNoticeInfo', 'token', 'CurrentRole', function ($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, $modal, SaleTruck, Symbol, $state, $timeout, PurcNoticeInfo, token, CurrentRole) {
         BaseService.scrollBackToTop();
         // 获取当前用户是否为普通用户
         CurrentRole.isUser({}, {}, function (data) {