结案采购单和结案委外单修改。erp获取投标单实体修改。

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

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

@@ -175,7 +175,7 @@ public class SaleTenderErp implements Serializable {
      */
     @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "st_venduu", insertable = false, updatable = false)
-    private EnterpriseBaseInfo enterpriseBaseInfo;
+    private EnterpriseBaseInfo vendor;
 
     /**
      * 审核状态(0代表已提交，1代表已审核，uas审批流用，平台发布单据为空)
@@ -352,12 +352,12 @@ public class SaleTenderErp implements Serializable {
         this.saleTenderItems = saleTenderItems;
     }
 
-    public EnterpriseBaseInfo getEnterpriseBaseInfo() {
-        return enterpriseBaseInfo;
+    public EnterpriseBaseInfo getVendor() {
+        return vendor;
     }
 
-    public void setEnterpriseBaseInfo(EnterpriseBaseInfo enterpriseBaseInfo) {
-        this.enterpriseBaseInfo = enterpriseBaseInfo;
+    public void setVendor(EnterpriseBaseInfo vendor) {
+        this.vendor = vendor;
     }
 
     public Long getEnUU() {

src/main/java/com/uas/platform/b2b/event/MakeOrderEndReleaseEvent.java

@@ -49,16 +49,16 @@ public class MakeOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDeta
         String context = "";
         Short isReply = Constant.NO; // 是由采购方结案，所以不是供应商回复操作
         String category = "sale"; // 对接收方来说，该单据类型
-        String table = "purc$orders";
+        String table = "make$orders";
         Long sourceId = make.getId();
         Short orderStatus = make.getStatus();
         Short toVendor = Constant.YES;
         if (make.getEnd() == Constant.YES) {
-            context = make.getEnterprise().getEnName() + "的" + emName + "结案了采购单（" + codeValue + ")，请及时确认！";
+            context = make.getEnterprise().getEnName() + "的" + emName + "结案了委外单（" + codeValue + ")，请及时确认！";
         } else if (make.getEnd() == Constant.NO) {
-            context = make.getEnterprise().getEnName() + "的" + emName + "反结案了采购单（" + codeValue + ")，请及时确认！";
+            context = make.getEnterprise().getEnName() + "的" + emName + "反结案了委外单（" + codeValue + ")，请及时确认！";
         }
-        String url = "#/sale/order/" + make.getId();
+        String url = "#/sale/makeorder/" + make.getId();
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context,
                 type, isReply, category,table, sourceId, orderStatus, toVendor, url);
         Long vendUU = make.getVendUU();

src/main/java/com/uas/platform/b2b/event/PurchaseOrderEndReleaseEvent.java

@@ -50,16 +50,16 @@ public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingRelease
         String context = "";
         Short isReply = Constant.NO; // 是由采购方结案，所以不是供应商回复操作
         String category = "sale"; // 对接收方来说，该单据类型
-        String table = "make$orders";
+        String table = "purc$orders";
         Long sourceId = item.getOrder().getId();
         Short orderStatus = item.getOrder().getStatus();
         Short toVendor = Constant.YES;
         if (item.getEnd() == Constant.YES) {
-            context = item.getOrder().getEnterprise().getEnName() + "的" + emName + "结案了委外（" + codeValue + ")，请及时确认！";
+            context = item.getOrder().getEnterprise().getEnName() + "的" + emName + "结案了采购单（" + codeValue + ")，请及时确认！";
         } else if (item.getEnd() == Constant.NO) {
-            context = item.getOrder().getEnterprise().getEnName() + "的" + emName + "反结案了委外单（" + codeValue + ")，请及时确认！";
+            context = item.getOrder().getEnterprise().getEnName() + "的" + emName + "反结案了采购单（" + codeValue + ")，请及时确认！";
         }
-        String url = "#/sale/makeorder/" + item.getOrder().getId();
+        String url = "#/sale/order/" + item.getOrder().getId();
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context,
                 type, isReply, category,table, sourceId, orderStatus, toVendor, url);
         Long vendUU = item.getOrder().getVendUU();