清理无效方法

src/main/java/com/uas/platform/b2b/core/serializer/LazyPropertyFilter.java

@@ -6,7 +6,9 @@ import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
 /**
- * Created by Pro1 on 2017/11/13.
+ *
+ * @author Pro1
+ * @date 2017/11/13
  *
  * JSON序列化时，过滤Hibernate代理对象或者延迟加载的对象FetchType.LAZY
  */
@@ -14,12 +16,14 @@ public class LazyPropertyFilter implements PropertyFilter{
 
     @Override
     public boolean apply(Object object, String name, Object value) {
-        if (value instanceof HibernateProxy) {//hibernate代理对象
+        //hibernate代理对象
+        if (value instanceof HibernateProxy) {
             LazyInitializer initializer = ((HibernateProxy) value).getHibernateLazyInitializer();
             if (initializer.isUninitialized()) {
                 return false;
             }
-        } else if (value instanceof PersistentCollection) {//实体关联集合一对多等
+        } else if (value instanceof PersistentCollection) {
+            //实体关联集合一对多等
             PersistentCollection collection = (PersistentCollection) value;
             if (!collection.wasInitialized()) {
                 return false;

src/main/java/com/uas/platform/b2b/core/support/ApplicationContextRegister.java

@@ -1,12 +1,16 @@
 package com.uas.platform.b2b.core.support;
 
+import com.uas.platform.b2b.core.util.ContextUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
-
+/**
+ * application
+ *
+ * @author yingp
+ */
 public class ApplicationContextRegister implements ApplicationContextAware {
 
 	private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);

src/main/java/com/uas/platform/b2b/core/util/DateUtils.java

@@ -6,6 +6,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+/**
+ * 时间工具类
+ *
+ * @author US50
+ */
 public class DateUtils {
 
 	public static final int COMPARE_NONE = 0;

src/main/java/com/uas/platform/b2b/core/util/OrdersDataStat.java

@@ -1,37 +0,0 @@
-package com.uas.platform.b2b.core.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.uas.platform.b2b.erp.model.EnterpriseMessageStat;
-
-/**
- * 后台所有单据数据转换成前台图例数据
- * @author aof
- * @date 2015年10月9日
- */
-public class OrdersDataStat {
-	
-	/**
-	 * 将单据信息转化成图例数据
-	 * @param map
-	 * @return
-	 */
-	public static List<EnterpriseMessageStat> getStatData(Map<String, Long> map) {
-		int n = 0;
-		EnterpriseMessageStat[] stats = new EnterpriseMessageStat[map.size()];
-		List<EnterpriseMessageStat> message = new ArrayList<EnterpriseMessageStat>();
-		for (Entry<String, Long> entry : map.entrySet()) {
-			EnterpriseMessageStat e = new EnterpriseMessageStat();
-			e.setLog_message(entry.getKey());
-			e.setLog_sum(entry.getValue());
-			stats[n] = e;
-			message.add(stats[n]);
-			n++;
-		}
-		return message;
-	}
-	
-}

src/main/java/com/uas/platform/b2b/core/util/SearchKeyUtils.java

@@ -8,6 +8,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * 搜索工具类
+ *
+ * @author US50
+ */
 public class SearchKeyUtils {
 
 	private static final String COMPANY_END = "有限公司";

src/main/java/com/uas/platform/b2b/core/util/SplitArray.java

@@ -4,9 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by wangmh and hejq on 2017/8/29.
+ * 拆分数组
+ *
+ * @author wangmh and hejq
+ * @date 2017/8/29
  */
-public class SplitArray{
+public class SplitArray {
 
     /**
      * SQL查询in表达式中最大的数量

src/main/java/com/uas/platform/b2b/core/util/StringUtil.java

@@ -3,6 +3,11 @@ package com.uas.platform.b2b.core.util;
 import java.util.Random;
 import java.util.UUID;
 
+/**
+ * 自定义String工具类
+ *
+ * @author yingp
+ */
 public class StringUtil {
 
 	/**

src/main/java/com/uas/platform/b2b/core/util/ThreadTask.java

@@ -6,7 +6,10 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Created by wangmh on 2017/7/19.
+ * 线程
+ *
+ * @author wangmh
+ * @date 2017/7/19
  */
 public class ThreadTask {
 

src/main/java/com/uas/platform/b2b/core/util/ThreadUtils.java

@@ -1,27 +1,16 @@
 package com.uas.platform.b2b.core.util;
 
+import com.uas.platform.core.concurrent.*;
+import org.springframework.util.CollectionUtils;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.core.concurrent.ICallable;
-import com.uas.platform.core.concurrent.ICallableAdapter;
-import com.uas.platform.core.concurrent.IRunnable;
-import com.uas.platform.core.concurrent.IRunnableAdapter;
-import com.uas.platform.core.concurrent.Listener;
-import com.uas.platform.core.concurrent.Listeners;
-
 /**
  * 多线程处理工具
+ * @author US50
  */
 public class ThreadUtils {
 

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

@@ -1,13 +1,18 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.ApbillAdjustment;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.ApbillAdjustment;
+import java.util.List;
 
+/**
+ * 货款调账
+ *
+ * @author hejq
+ * @date 2018-09-06 10:58
+ */
 @Repository
 public interface ApbillAdjustmentDao
 		extends JpaRepository<ApbillAdjustment, Long>, JpaSpecificationExecutor<ApbillAdjustment> {
@@ -15,17 +20,17 @@ public interface ApbillAdjustmentDao
 	/**
 	 * 通过企业uu查询货款调帐
 	 * 
-	 * @param enuu
-	 * @return
+	 * @param enuu 企业UU
+	 * @return List<ApbillAdjustment>
 	 */
 	List<ApbillAdjustment> findByEnuu(Long enuu);
 
 	/**
 	 * 根据单据编号判断是否已存在
 	 * 
-	 * @param enuu
-	 * @param inoutno
-	 * @return
+	 * @param enuu 客户UU
+	 * @param inoutno 出库库单号
+	 * @return List<ApbillAdjustment>
 	 */
 	List<ApbillAdjustment> findByCustuuAndInoutno(Long enuu, String inoutno);
 }

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

@@ -1,13 +1,17 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.ApprovalFlow;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.ApprovalFlow;
+import java.util.List;
 
+/**
+ * 审批流
+ *
+ * @author hejq
+ */
 @Repository
 public interface ApprovalFlowDao extends JpaRepository<ApprovalFlow, Long>, JpaSpecificationExecutor<ApprovalFlow> {
 
@@ -17,7 +21,7 @@ public interface ApprovalFlowDao extends JpaRepository<ApprovalFlow, Long>, JpaS
 	 * @param enuu
 	 * @return
 	 */
-	public List<ApprovalFlow> findByEnuu(Long enuu);
+    List<ApprovalFlow> findByEnuu(Long enuu);
 
 	/**
 	 * 通过企业uu和流程名称查找节点
@@ -26,5 +30,5 @@ public interface ApprovalFlowDao extends JpaRepository<ApprovalFlow, Long>, JpaS
 	 * @param appname
 	 * @return
 	 */
-	public ApprovalFlow findByEnuuAndAppname(Long enuu, String appname);
+    ApprovalFlow findByEnuuAndAppname(Long enuu, String appname);
 }

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

@@ -1,10 +1,14 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.Attach;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.Attach;
-
+/**
+ * 附件
+ *
+ * @author US50
+ */
 @Repository
 public interface AttachDao extends JpaRepository<Attach, Long> {
 	

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

@@ -1,10 +1,14 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.Resource;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.Resource;
-
+/**
+ * 权限访问资源
+ *
+ * @author US50
+ */
 @Repository
 public interface AuthorityDao extends JpaRepository<Resource, Long> {
 

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

@@ -8,7 +8,9 @@ import org.springframework.stereotype.Repository;
 /**
  * 系统一些操作的记录
  *
- * Created by US50 on 2017-12-12.
+ *
+ * @author US50
+ * @date 2017-12-12
  */
 @Repository
 public interface CommunalLogDao extends JpaSpecificationExecutor<CommunalLog>, JpaRepository<CommunalLog, Long> {

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

@@ -15,7 +15,9 @@ import java.util.List;
 /**
  * 平台不存在订单数据库操作
  *
- * Created by hejq on 2018-06-19.
+ *
+ * @author hejq
+ * @date 2018-06-19
  */
 @Repository
 public interface NotExistOrdersDao extends JpaRepository<NotExistOrders, Long>, JpaSpecificationExecutor<NotExistOrders> {

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

@@ -15,7 +15,9 @@ import java.util.List;
 /**
  * 平台不存在的ERP物料编号数据库操作
  *
- * Created by hejq on 2018-03-14.
+ *
+ * @author hejq
+ * @date 2018-03-14
  */
 @Repository
 public interface NotExistProductDao extends JpaSpecificationExecutor<NotExistProduct>, JpaRepository<NotExistProduct, Long> {

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

@@ -1,57 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.DeputyOrder;
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.core.model.Constant;
-import org.apache.axis.utils.StringUtils;
-
-import java.util.Date;
-import java.util.List;
-
-public class DeputyorderReplyEvent extends SaveReleaseEvent<PagingReleaseDetail, DeputyOrder> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public DeputyorderReplyEvent(List<DeputyOrder> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public PagingReleaseDetail release(DeputyOrder order) {
-		Long emUU = order.getDeputyEnterprise().getEnAdminuu();
-		String emName = "操作员";
-		if (!StringUtils.isEmpty(order.getVenduser())) {
-			emName = order.getVenduser();
-		}
-		if (order.getUseruu() != null) {
-			emUU = order.getUseruu();
-		}
-		Long enUU = order.getEnuu();
-		Date date = new Date();
-		String codeValue = order.getSalecode();
-		String from = "ERP";
-		String type = "代采订单回复";
-		String title = "B2B商务提醒";
-		Short isReply = Constant.YES;
-		String category = "purc";
-		String table = "purc$deputyorders";
-		Long sourceId = order.getId();
-		Short orderStatus = order.getStatuscode().shortValue();
-		Short toVendor = Constant.NO;
-		String url = "purc/deputy" + order.getId();
-		String context = order.getDeputyEnterprise().getEnName() + "审核了你的代采订单（" + codeValue + ")！";
-		PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,
-				isReply, category, table, sourceId, orderStatus, toVendor, url);
-		Long vendUU = order.getEnuu();
-		Long vendUserUU = order.getUseruu();
-		String vendUserName = "操作员";
-		PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
-		releaseDetail.setPagingRelease(release);
-		return releaseDetail;
-	}
-
-}

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

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 委外验收单在平台保存时生成消息事件
  *
+ * @author US50
  */
 public class MakeAcceptSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, MakeAccept> {
 
@@ -36,14 +37,16 @@ public class MakeAcceptSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDe
         Date date = new Date();
         String codeValue = accept.getCode();
         String from = "B2B";
-        if (accept.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (accept.getErpId() != null) {
             from = "ERP";
         }
         String type = "新增委外验收单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "make$accept";
         Long sourceId = accept.getId();
         String url = "#/sale/makeaccept";

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

@@ -1,6 +1,9 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
+import com.uas.platform.b2b.model.PagingRelease;
+import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
@@ -10,6 +13,7 @@ import java.util.List;
 /**
  * 委外变更单保存时生成消息事件
  *
+ * @author US50
  */
 public class MakeOrderChangeSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, MakeOrderChangeItem> {
 
@@ -38,14 +42,16 @@ public class MakeOrderChangeSaveReleaseEvent extends SaveReleaseEvent<PagingRele
         Date date = new Date();
         String codeValue = change.getCode();
         String from = "B2B";
-        if (change.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (change.getErpId() != null) {
             from = "ERP";
         }
         String type = "新增委外变更单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "make$changes";
         Long sourceId = change.getId();
         Short orderStatus = (short)Status.NOT_REPLY.value();

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

@@ -41,14 +41,17 @@ public class MakeOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDeta
         Date date = new Date();
         String codeValue = make.getCode();
         String from = "B2B";
-        if (make.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (make.getErpId() != null) {
             from = "ERP";
         }
         String type = "结案采购订单";
         String title = "B2B商务提醒";
         String context = "";
-        Short isReply = Constant.NO; // 是由采购方结案，所以不是供应商回复操作
-        String category = "sale"; // 对接收方来说，该单据类型
+        // 是由采购方结案，所以不是供应商回复操作
+        Short isReply = Constant.NO;
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "make$orders";
         Long sourceId = make.getId();
         Short orderStatus = make.getStatus();

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

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 委外订单保存时生成消息事件
  *
+ * @author US50
  */
 public class MakeOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, MakeOrder> {
 
@@ -41,14 +42,16 @@ public class MakeOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDet
         Date date = new Date();
         String codeValue = make.getCode();
         String from = "B2B";
-        if (make.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (make.getErpId() != null) {
             from = "ERP";
         }
         String type = "新增委外订单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "make$orders";
         Long sourceId = make.getId();
         String url = "#/sale/makeorder/" + make.getId();

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

@@ -1,68 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.PurcInquiry;
-import com.uas.platform.b2b.model.PurcInquiryItem;
-import com.uas.platform.core.model.Constant;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 公共询价单保存时生成消息事件
- *
- * Created by dongbw
- *
- */
-public class PurcInquirySaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurcInquiryItem> {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurcInquirySaveReleaseEvent(List<PurcInquiryItem> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param item
-     * @return
-     */
-    @Override
-    public PagingReleaseDetail release(PurcInquiryItem item) {
-        PurcInquiry purcInquiry = item.getInquiry();
-        Long emUU = purcInquiry.getRecorderUU();
-        String emName = purcInquiry.getRecorder();
-        Long enUU = purcInquiry.getEnUU();
-        Date date = new Date();
-        String codeValue = purcInquiry.getCode();
-        String from = "ERP";
-        Short isReply = Constant.NO;
-        String category = "sale";
-        String table = "purc$puinquiryitems";
-        Long sourceId = item.getId();
-        Short orderStatus = 200;
-        Short toVendor = Constant.YES;
-        String type = "新增公共询价单";
-        String title = "B2B商务提醒";
-        // 这里的公共询价单详情参数就是从表id
-        String url = "#/baseInfo/inquiryList/" + item.getId();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        String inDate = formatter.format(purcInquiry.getDate());
-        String endDate = formatter.format(purcInquiry.getEndDate());
-        String context = "\"" + purcInquiry.getEnterprise().getEnName() + "\"发起了公共询价(" + codeValue + ")，请快速报价！";
-        PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
-        // 公共询价无供应商UU
-        Long vendUU = 1L;
-        Long vendUserUU = 1L;
-        String vendUserName = "业务员";
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.core.model.Constant;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 采购验收单在平台保存时生成消息事件
- *
- */
-public class PurchaseAcceptSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseAccept> {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseAcceptSaveReleaseEvent(List<PurchaseAccept> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param accept
-     * @return
-     */
-    @Override
-	public PagingReleaseDetail release(PurchaseAccept accept) {
-        String emName = accept.getRecorder();
-        Long enUU = accept.getEnUU();
-        Date date = new Date();
-        String codeValue = accept.getCode();
-        String from = "B2B";
-        if (accept.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
-            from = "ERP";
-        }
-        String type = "新增采购验收单";
-        String title = "B2B商务提醒";
-        Short toVendor = Constant.YES;
-        Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
-        String table = "purc$accept";
-        Long sourceId = accept.getId();
-        String url = "#/sale/accept/" + accept.getId();
-        String context;
-        if (null != accept.getSendCode()) {
-            context = accept.getEnterprise().getEnName() + "的" + emName + "签收了您送货单（" + accept.getSendCode() + "）的产品！采购验收单号：" + codeValue;
-        } else {
-            context = accept.getEnterprise().getEnName() + "的" + emName + "签收了您的产品！采购验收单号：" + codeValue;
-        }
-        PagingRelease release = new PagingRelease(null, emName, enUU, date, codeValue, from, title, context, type, isReply,
-                category, table, sourceId, null, toVendor, url);
-        Long vendUU = accept.getVendUU();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, null, null);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}

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

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * UAS确认或不同意对账单时生成消息事件
  *
+ * @author US50
  */
 public class PurchaseApCheckReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseApCheck> {
 
@@ -39,7 +40,8 @@ public class PurchaseApCheckReplyReleaseEvent extends SaveReleaseEvent<PagingRel
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.YES;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "purc$apcheck";
         Long sourceId = apCheck.getId();
         String url = "#/sale/apCheck/" + apCheck.getId();

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

@@ -11,8 +11,7 @@ import java.util.List;
 /**
  * 询价单保存时生成消息事件
  *
- * Created by dongbw
- *
+ * @author dongbw
  */
 public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
@@ -40,7 +39,8 @@ public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<Pagi
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();
         String from = "B2B";
-        if (inquiryItem.getInquiry().getSourceId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (inquiryItem.getInquiry().getSourceId() != null) {
             from = "ERP";
         }
         String type = "采纳询价单";

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

@@ -11,8 +11,7 @@ import java.util.List;
 /**
  * erp用户作废询价单时生成消息事件
  *
- * Created by dongbw
- *
+ * @author dongbw
  */
 public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
@@ -40,7 +39,8 @@ public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<Pag
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();
         String from = "B2B";
-        if (inquiryItem.getInquiry().getSourceId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (inquiryItem.getInquiry().getSourceId() != null) {
             from = "ERP";
         }
         String type = "回复询价单";

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * 回复询价单时生成消息事件
- * Created by dongbw
+ * @author dongbw
  */
 public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 

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

@@ -5,15 +5,13 @@ import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.core.model.Constant;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
 /**
  * 询价单保存时生成消息事件
  *
- * Created by dongbw
- *
+ * @author dongbw
  */
 public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
@@ -41,7 +39,8 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();
         String from = "ERP";
-        if ("B2B".equals(inquiryItem.getInquiry().getSourceApp())) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if ("B2B".equals(inquiryItem.getInquiry().getSourceApp())) {
             from = "B2B";
         }
         Short isReply = Constant.NO;
@@ -54,8 +53,6 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
         String title = "B2B商务提醒";
         // 收到的客户采购询价单的详情url
         String url = "#/sale/inquiry/" + inquiryItem.getInquiry().getId();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String orderDate = formatter.format(inquiryItem.getInquiry().getDate());
         String context = "您的合作伙伴\"" + inquiryItem.getInquiry().getEnterprise().getEnName() + "\"发布新的询价单(" + codeValue + ")，请快速报价！";
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
         Long vendUU = inquiryItem.getVendUU();

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

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 模具询价单作废时生成消息事件
+ * @author US50
  */
 public class PurchaseInquiryMouldInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryMould> {
 
@@ -37,14 +38,16 @@ public class PurchaseInquiryMouldInvalidReleaseEvent extends SaveReleaseEvent<Pa
         Date date = new Date();
         String codeValue = mould.getCode();
         String from = "B2B";
-        if (mould.getErpSourceId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (mould.getErpSourceId() != null) {
             from = "ERP";
         }
         String type = "作废模具询价单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "v$purc$inquirymould";
         Long sourceId = mould.getId();
         String url = "#/sale/mould/" + mould.getId();

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

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.core.model.Constant;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 回复模具询价单时生成消息事件
- * Created by dongbw
- */
-public class PurchaseInquiryMouldReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryMould> {
-
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseInquiryMouldReplyReleaseEvent(List<PurchaseInquiryMould> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param mould
-     * @return
-     */
-    @Override
-    public PagingReleaseDetail release(PurchaseInquiryMould mould) {
-        // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是vendUser
-        Long emUU = mould.getVendUserUU();
-        String emName = "操作员";
-        if (null != mould.getVendUser()) {
-            emName = mould.getVendUser().getUserName();
-        }
-        Long vendUU = mould.getVenduu();
-        Date date = new Date();
-        String codeValue = mould.getCode();
-        String from = "B2B";
-        String type = "回复模具询价单";
-        String title = "B2B商务提醒";
-        String enName = mould.getEnterprise().getEnName();
-        Short isReply = Constant.YES;
-        String category = "purc";
-        String table = "v$purc$inquirymould";
-        Long sourceId = mould.getId();
-        // 根据状态判断是修改报价，还是第一次回复报价
-        Short orderStatus = mould.getStatus();
-        String context;
-        if (orderStatus == 201) {
-            context = enName + "的" + emName + "回复了模具询价单（" + codeValue + "）的单价，请及时确认！";
-        } else {
-            context = enName + "的" + emName + "修改了模具询价单（" + codeValue + "）的单价，请及时确认！";
-        }
-        Short toVendor = Constant.NO;
-        String url = "#/purc/mould/" + mould.getId();
-        PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
-        Long enUU = mould.getEnuu();
-        Long userUU = mould.getUseruu();
-        String userName = "操作员";
-        if (null == userUU) {
-           userUU = 1L;
-        }
-        if (null != mould.getRecorder()) {
-            userName = mould.getRecorder();
-        }
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(enUU, userUU, userName);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}

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

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 模具询价单保存时生成消息事件
+ * @author US50
  */
 public class PurchaseInquiryMouldSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryMould> {
 
@@ -37,14 +38,16 @@ public class PurchaseInquiryMouldSaveReleaseEvent extends SaveReleaseEvent<Pagin
         Date date = new Date();
         String codeValue = mould.getCode();
         String from = "B2B";
-        if (mould.getErpSourceId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (mould.getErpSourceId() != null) {
             from = "ERP";
         }
         String type = "新增模具询价单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "v$purc$inquirymould";
         Long sourceId = mould.getId();
         String url = "#/sale/mould/" + mould.getId();

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

@@ -1,74 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.core.model.Constant;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 时生成消息事件
- *
- */
-public class PurchaseNoticeEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseNotice> {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseNoticeEndReleaseEvent(List<PurchaseNotice> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param notice
-     * @return
-     */
-    @Override
-    public PagingReleaseDetail release(PurchaseNotice notice) {
-        //TODO 取消发货通知之后，触发新增消息事件。
-        PurchaseOrder order = notice.getOrderItem().getOrder();
-        Long emUU = order.getUserUU();
-        String emName = "操作员";
-        if (null != order.getUser()) {
-            emName = order.getUser().getUserName();
-        }
-        Long enUU = order.getEnUU();
-        Date date = new Date();
-        String codeValue = order.getCode();
-        String from = "B2B";
-        if (order.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
-            from = "ERP";
-        }
-        String type = "取消送货提醒";
-        String title = "B2B商务提醒";
-        String context = "";
-        Short isReply = Constant.NO; // 是由采购方结案，所以不是供应商回复操作
-        String category = "sale"; // 对接收方来说，该单据类型
-        String table = "purc$notice";
-        Long sourceId = order.getId();
-        Short orderStatus = order.getStatus();
-        Short toVendor = Constant.YES;
-        if (order.getEnd() == Constant.YES) {
-            context = order.getEnterprise().getEnName() + "的" + emName + "取消了（" + codeValue + " （" + notice.getOrderItem().getProduct().getCode() + "））送货提醒通知！";
-        }
-        String url = "#/sale/notice";
-        PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context,
-                type, isReply, category,table, sourceId, orderStatus, toVendor, url);
-        Long vendUU = order.getVendUU();
-        Long vendUserUU = order.getVendUserUU();
-        if (null == vendUserUU) {
-            vendUserUU = 1L;
-        }
-        String vendUserName = order.getVenduser();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.PagingRelease;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.core.model.Constant;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 发货通知单保存时生成消息事件
- *
- *
- */
-public class PurchaseNoticeSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseNotice> {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseNoticeSaveReleaseEvent(List<PurchaseNotice> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param notice
-     * @return
-     */
-    @Override
-	public PagingReleaseDetail release(PurchaseNotice notice) {
-        //TODO 保存新发货通知之后，触发新增消息事件。
-        PurchaseOrder order = notice.getOrderItem().getOrder();
-        Long emUU = order.getUserUU();
-        String emName = order.getRecorder();
-        Long enUU = notice.getEnUU();
-        Date date = new Date();
-        String codeValue = order.getCode();
-        String from = "B2B";
-        if (notice.getSourceId() != null) { // erp传到平台的单据，包含erpId字段记录来源
-            from = "ERP";
-        }
-        String type = "新增发货提醒";
-        String title = "B2B商务提醒";
-        Short toVendor = Constant.YES;
-        Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
-        String table = "purc$notice";
-        Long sourceId = notice.getId();
-        String url = "#/sale/notice";
-        Short orderStatus = notice.getStatus();
-        String context = order.getEnterprise().getEnName() + "的" + emName + "给您发送了送货提醒通知！对应采购单号：" + codeValue;
-        PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
-        Long vendUU = notice.getVendUU();
-        Long vendUserUU = order.getVendUserUU();
-        if (null == vendUserUU) {
-            vendUserUU = 1L;
-        }
-        String vendUserName = order.getVenduser();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}

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

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 采购变更单保存时生成消息事件
  *
- *
+ * @author US50
  */
 public class PurchaseOrderChangeSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderChange> {
 
@@ -39,14 +39,16 @@ public class PurchaseOrderChangeSaveReleaseEvent extends SaveReleaseEvent<Paging
         Date date = new Date();
         String codeValue = change.getCode();
         String from = "B2B";
-        if (change.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (change.getErpId() != null) {
             from = "ERP";
         }
         String type = "新增采购订单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "purc$changes";
         Long sourceId = change.getId();
         String url = "#/sale/change/" + change.getId();

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

@@ -10,8 +10,8 @@ import java.util.List;
 
 /**
  * 采购订单结案时生成消息事件
- * Created by dongbw
  * 17/03/23 14:06.
+ * @author dongbw
  */
 public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderItem> {
 
@@ -42,14 +42,17 @@ public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingRelease
         Date date = new Date();
         String codeValue = item.getOrder().getCode();
         String from = "B2B";
-        if (item.getOrder().getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (item.getOrder().getErpId() != null) {
             from = "ERP";
         }
         String type = "结案采购订单";
         String title = "B2B商务提醒";
         String context = "";
-        Short isReply = Constant.NO; // 是由采购方结案，所以不是供应商回复操作
-        String category = "sale"; // 对接收方来说，该单据类型
+        // 是由采购方结案，所以不是供应商回复操作
+        Short isReply = Constant.NO;
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "purc$orders";
         Long sourceId = item.getOrder().getId();
         Short orderStatus = item.getOrder().getStatus();

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

@@ -11,8 +11,8 @@ import java.util.List;
 
 /**
  * 回复采购订单时生成消息事件
- * Created by dongbw
  *
+ * @author dongbw
  */
 public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrder> {
 
@@ -35,7 +35,8 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
     public PagingReleaseDetail release(PurchaseOrder orderAll) {
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是venduser
         Long emUU = orderAll.getVendUserUU();
-        String emName = "操作员";  // 默认一个值，避免为空
+        // 默认一个值，避免为空
+        String emName = "操作员";
         if (null != orderAll.getVenduser()) {
             emName = orderAll.getVenduser();
         }
@@ -51,7 +52,8 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
         String table = "purc$orders";
         Long sourceId = orderAll.getId();
         String url = "#/purc/order/" + orderAll.getId();
-        Short orderStatus = (short)Status.REPLIED.value(); // 回复的单，直接设置为已回复状态
+        // 回复的单，直接设置为已回复状态
+        Short orderStatus = (short)Status.REPLIED.value();
         String context = orderAll.getReceiveName() + "的" + emName + "回复了采购单（" + codeValue + "）的交期，请及时确认！";
         PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
         Long enUU = orderAll.getEnUU();

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

@@ -10,8 +10,8 @@ import java.util.List;
 
 /**
  * 采购订单保存时生成消息事件
- * Created by dongbw
  * 17/03/23 14:06.
+ * @author dongbw
  */
 public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderInfo> {
 
@@ -42,14 +42,16 @@ public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleas
         Date date = new Date();
         String codeValue = orderAll.getCode();
         String from = "B2B";
-        if (orderAll.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (orderAll.getErpId() != null) {
             from = "ERP";
         }
         String type = "新增采购订单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "purc$orders";
         Long sourceId = orderAll.getId();
         String url = "#/sale/order/" + orderAll.getId();

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

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 客户认定单保存时生成消息事件
+ * @author US50
  */
 public class PurchaseProofingApprovalSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseProofingApproval> {
 
@@ -39,7 +40,8 @@ public class PurchaseProofingApprovalSaveReleaseEvent extends SaveReleaseEvent<P
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "purc$proofingapproval";
         Long sourceId = approval.getId();
         String url = "#/sale/approval";

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

@@ -12,8 +12,7 @@ import java.util.List;
 /**
  * 打样申请单保存时生成消息事件
  *
- * Created by dongbw
- *
+ * @author dongbw
  */
 public class PurchaseProofingItemSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseProofingItem> {
 
@@ -41,7 +40,8 @@ public class PurchaseProofingItemSaveReleaseEvent extends SaveReleaseEvent<Pagin
         Date date = new Date();
         String codeValue = proofing.getCode();
         String from = "B2B";
-        if (proofing.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (proofing.getErpId() != null) {
             from = "ERP";
         }
         Short isReply = Constant.NO;

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

@@ -12,6 +12,7 @@ import java.util.List;
 /**
  * 招标单评标时生成消息事件
  *
+ * @author US50
  */
 public class PurchaseTenderDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleTender> {
 
@@ -45,7 +46,8 @@ public class PurchaseTenderDecideReleaseEvent extends SaveReleaseEvent<PagingRel
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "v$purc$tender";
         Long sourceId = saleTender.getPtId();
         String url = "#/sale/tender/" + saleTender.getPtId();

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

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 招标单保存时生成消息事件
  *
+ * @author US50
  */
 public class PurchaseTenderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleTender> {
 
@@ -44,7 +45,8 @@ public class PurchaseTenderSaveReleaseEvent extends SaveReleaseEvent<PagingRelea
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "v$purc$tender";
         Long sourceId = saleTender.getPtId();
         String url = "#/sale/tender/" + saleTender.getPtId();

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

@@ -1,14 +1,17 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.PagingRelease;
+import com.uas.platform.b2b.model.PagingReleaseDetail;
+import com.uas.platform.b2b.model.SaleQuotation;
+import com.uas.platform.b2b.model.SaleQuotationItem;
 import com.uas.platform.core.model.Constant;
 
 import java.util.Date;
 import java.util.List;
 
 /**
- * Created by dongbw
  * 17/07/26 16:34.
+ * @author dongbw
  */
 public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleQuotationItem>{
 
@@ -41,14 +44,16 @@ public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingRele
         Date date = new Date();
         String codeValue = quotation.getCode();
         String from = "B2B";
-        if (quotation.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (quotation.getErpId() != null) {
             from = "ERP";
         }
         String type = "回复主动报价单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.YES;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "sale$quotation";
         Long sourceId = quotation.getId();
         String url = "#/sale/quotation/" + quotation.getId();

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

@@ -9,8 +9,8 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * Created by dongbw
  * 17/07/26 17:22.
+ * @author dongbw
  */
 public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleQuotation>{
 
@@ -41,14 +41,16 @@ public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingRel
         Date date = new Date();
         String codeValue = quotation.getCode();
         String from = "B2B";
-        if (quotation.getErpId() != null) { // erp传到平台的单据，包含erpId字段记录来源
+        // erp传到平台的单据，包含erpId字段记录来源
+        if (quotation.getErpId() != null) {
             from = "ERP";
         }
         String type = "回复主动报价单";
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.YES;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "sale$quotation";
         Long sourceId = quotation.getId();
         String url = "#/sale/quotation/" + quotation.getId();

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

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 买家ERP收料时生成消息事件
  *
- *
+ * @author US50
  */
 public class SaleSendAcceptReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleSend> {
 
@@ -45,7 +45,8 @@ public class SaleSendAcceptReleaseEvent extends SaveReleaseEvent<PagingReleaseDe
         String title = "B2B商务提醒";
         Short toVendor = Constant.YES;
         Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
+        // 对接收方来说，该单据类型
+        String category = "sale";
         String table = "sale$send";
         Long sourceId = send.getId();
         String url = "#/sale/send" + send.getId();

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

@@ -1,61 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.core.model.Constant;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 买家修改收料通知的数量时生成消息事件
- *
- *
- */
-public class SaleSendRefuseReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, SaleSend> {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public SaleSendRefuseReleaseEvent(List<SaleSend> savedList) {
-        super(savedList);
-    }
-
-    /**
-     * 生成对应消息记录
-     *
-     * @param send
-     * @return
-     */
-    @Override
-	public PagingReleaseDetail release(SaleSend send) {
-        Long emUU = send.getCustUserUU();
-        String emName = "操作员";
-        if (null != send.getCustUser()) {
-            emName = send.getCustUser().getUserName();
-        }
-        Long enUU = send.getCustUU();
-        Date date = new Date();
-        String codeValue = send.getCode();
-        String from = "ERP";
-        String type = "修改发货数量";
-        String title = "B2B商务提醒";
-        Short toVendor = Constant.YES;
-        Short isReply = Constant.NO;
-        String category = "sale";  // 对接收方来说，该单据类型
-        String table = "sale$send";
-        Long sourceId = send.getId();
-        String url = "#/sale/send" + send.getId();
-        Short orderStatus = 0;
-        String context = send.getCustomer().getEnName() + "的" + emName + "拒收了您送货单（" + codeValue + "）的产品！";
-        PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
-        Long vendUU = send.getEnUU();
-        // 发货单未记录录入人uu
-        Long vendUserUU = 1L;
-        String vendUserName = send.getRecorder();
-        PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
-        releaseDetail.setPagingRelease(release);
-        return releaseDetail;
-    }
-}