Browse Source

招标新增获取招标供应商接口、发送手机短信提醒接口;同步合作伙伴判空处理。

dongbw 8 years ago
parent
commit
52cba9c642
26 changed files with 206 additions and 19 deletions
  1. 2 0
      src/main/java/com/uas/platform/b2b/dao/SaleTenderDao.java
  2. 3 1
      src/main/java/com/uas/platform/b2b/erp/controller/RelationshipController.java
  3. 18 0
      src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java
  4. 14 0
      src/main/java/com/uas/platform/b2b/erp/model/B2BVendor.java
  5. 4 0
      src/main/java/com/uas/platform/b2b/erp/service/TenderService.java
  6. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/ARCheckServiceImpl.java
  7. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryMouldServiceImpl.java
  8. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java
  9. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/MakeServiceImpl.java
  10. 6 2
      src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseForecastServiceImpl.java
  11. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseSampleServiceImpl.java
  12. 5 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java
  13. 3 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/QuotationServiceImpl.java
  14. 73 1
      src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java
  15. 0 1
      src/main/java/com/uas/platform/b2b/listener/MessageListener.java
  16. 11 0
      src/main/java/com/uas/platform/b2b/model/PurchaseTender.java
  17. 15 0
      src/main/java/com/uas/platform/b2b/model/SaleTender.java
  18. 3 0
      src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java
  19. 1 0
      src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java
  20. 13 0
      src/main/java/com/uas/platform/b2b/support/MessageConf.java
  21. 10 0
      src/main/java/com/uas/platform/b2b/temporary/model/TenderContactInfo.java
  22. 2 1
      src/main/resources/dev/message.properties
  23. 2 1
      src/main/resources/prod/message.properties
  24. 2 1
      src/main/resources/test/message.properties
  25. 1 1
      src/main/webapp/resources/js/index/app.js
  26. 3 3
      src/main/webapp/resources/tpl/index/sale/inquiry.html

+ 2 - 0
src/main/java/com/uas/platform/b2b/dao/SaleTenderDao.java

@@ -25,4 +25,6 @@ public interface SaleTenderDao extends JpaSpecificationExecutor<SaleTender>,JpaR
 
 	@Query("select t from SaleTender t where t.ptId = :tenderId and t.vendUU = :vendUU")
     SaleTender findByPtId(@Param("tenderId")Long tenderId, @Param("vendUU")Long vendUU);
+
+    List<SaleTender> findByEnUUAndCodeAndStatus(Long enUU, String code, String status);
 }

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/controller/RelationshipController.java

@@ -46,7 +46,9 @@ public class RelationshipController {
 				if (vendors.size() == 0) {// 供应商资料在平台上不存在
 					Vendor vendor = addVendor(otheruu, enUU);// 添加企业的供应商资料
 					// 添加企业圈合作伙伴资料
-					addPartnerShipRecord(vendor);
+					if (null != vendor) {
+						addPartnerShipRecord(vendor);
+					}
 				}
 			} else {
 				ok = false;

+ 18 - 0
src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.erp.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
 import com.uas.platform.b2b.model.*;
@@ -788,4 +789,21 @@ public class TenderController {
     public ModelMap decideInAdvance(Long id) {
         return tenderService.decideInAdvance(id);
     }
+
+    /**
+     * 获取招标单供应商列表
+     */
+    @RequestMapping(value = "/thisVendors", method = RequestMethod.GET)
+    public ModelMap getThisVendors (Long id) {
+        return tenderService.getSaleTenderVendors(id);
+    }
+
+
+    /**
+     * 短信通知接口
+     */
+    @RequestMapping(value = "/message/mobile", method = RequestMethod.POST)
+    public ModelMap sendMobileMessage (Long id) {
+        return tenderService.sendMobileMessage(id);
+    }
 }

+ 14 - 0
src/main/java/com/uas/platform/b2b/erp/model/B2BVendor.java

@@ -56,6 +56,11 @@ public class B2BVendor {
      */
     private String ve_uu;
 
+    /**
+     * 供应商邮箱
+     */
+    private String ve_email;
+
     /**
      * B2B vendorId
      */
@@ -85,6 +90,7 @@ public class B2BVendor {
         this.setVe_uu(String.valueOf(vendor.getVendEnUU()));
         if (vendor.getVendorUser() != null) {
             this.setVe_contact(vendor.getVendorUser().getUserName());
+            this.setVe_email(vendor.getVendorUser().getUserEmail());
         }
     }
 
@@ -191,4 +197,12 @@ public class B2BVendor {
     public void setServicerSwitch(Short servicerSwitch) {
         this.servicerSwitch = servicerSwitch;
     }
+
+    public String getVe_email() {
+        return ve_email;
+    }
+
+    public void setVe_email(String ve_email) {
+        this.ve_email = ve_email;
+    }
 }

+ 4 - 0
src/main/java/com/uas/platform/b2b/erp/service/TenderService.java

@@ -181,4 +181,8 @@ public interface TenderService {
     ModelMap publishTender(Long id);
 
     ModelMap decideInAdvance(Long id);
+
+    ModelMap getSaleTenderVendors(Long id);
+
+    ModelMap sendMobileMessage(Long id);
 }

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/ARCheckServiceImpl.java

@@ -48,7 +48,9 @@ public class ARCheckServiceImpl implements ARCheckService {
 					List<Vendor> existVendors = vendorDao.findByMyEnUUAndVendUU(arCheck.getAc_custuu(), vendUU);
 					if (CollectionUtils.isEmpty(existVendors)) {// 不存在供应商关系,增加供应商关系
 						Vendor vendor = addVendor(customer);
-						addPartnerShipRecord(vendor); // 添加合作伙伴关系
+						if (null != vendor) {
+							addPartnerShipRecord(vendor); // 添加合作伙伴关系
+						}
 					}
 					SaleARCheck saleARCheck = arCheck.convert();
 					if (!CollectionUtils.isEmpty(saleARCheck.getItems())) {

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryMouldServiceImpl.java

@@ -57,7 +57,9 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 					}
 				} else {
 					vendor = addVendor(purchaseInquiryMould);
-					addPartnerShipRecord(vendor); // 添加合作伙伴关系
+					if (null != vendor) {
+						addPartnerShipRecord(vendor); // 添加合作伙伴关系
+					}
 				}
 				if (vendor != null) {
 					for (PurchaseInquiryMouldItem item : purchaseInquiryMould.getInquiryMouldItems()) {

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -71,7 +71,9 @@ public class InquiryServiceImpl implements InquiryService {
 							// 添加供应商资料
 							vendor = addVendor(item);
 							// 添加合作伙伴关系
-							addPartnerShipRecord(vendor);
+							if (null != vendor) {
+								addPartnerShipRecord(vendor);
+							}
 						}
 						if (vendor != null) {
 							item.setInquiry(purchaseInquiry);

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/MakeServiceImpl.java

@@ -56,7 +56,9 @@ public class MakeServiceImpl implements MakeService {
 				Vendor vend = new Vendor();
 				if (CollectionUtils.isEmpty(vendors)) {
 					vend = addVendor(make);
-					addPartnerShipRecord(vend); // 添加合作伙伴
+					if (null != vend) {
+						addPartnerShipRecord(vend); // 添加合作伙伴
+					}
 				} else {
 					vend = vendors.get(0);
 				}

+ 6 - 2
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseForecastServiceImpl.java

@@ -58,7 +58,9 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 							Vendor vendor = null;
 							if (vendors.size() == 0) {
 								vendor = addVendor(item);
-								addPartnerShipRecord(vendor); // 添加合作伙伴关系
+								if (null != vendor) {
+									addPartnerShipRecord(vendor); // 添加合作伙伴关系
+								}
 							} else {
 								vendor = vendors.get(0);
 							}
@@ -143,7 +145,9 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 							Vendor vendor = null;
 							if (vendors.size() == 0) {
 								vendor = addVendor(item);
-								addPartnerShipRecord(vendor);
+								if (null != vendor) {
+									addPartnerShipRecord(vendor);
+								}
 							} else {
 								vendor = vendors.get(0);
 							}

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseSampleServiceImpl.java

@@ -65,7 +65,9 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 						Vendor vendor = null;
 						if (vendors.size() == 0) {// 供应商列表中不存在供应商关系
 							vendor = addVendor(proofingItem);// 增加供应商关系
-							addPartnerShipRecord(vendor);
+							if (null != vendor) {
+								addPartnerShipRecord(vendor);
+							}
 						} else {
 							vendor = vendors.get(0);
 						}

+ 5 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -59,7 +59,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 				Vendor vendor = null;
 				if (vendors.size() == 0) {// 供应商资料在平台上不存在
 					vendor = addVendor(order);// 添加企业的供应商资料
-					addPartnerShipRecord(vendor);// 添加企业圈合作伙伴关系
+					if (null != vendor) {
+						addPartnerShipRecord(vendor);// 添加企业圈合作伙伴关系
+					}
 				} else {// 供应商资料在平台上存在
 					vendor = vendors.get(0);
 					if (order.getVendUserUU() == null || order.getVendUserUU() == 0)// 单据不包含供应商联系人UU号&&供应商列表中有供应商联系人
@@ -139,6 +141,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(order.getEnUU());
 		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
+		// 默认开启供应商
+		vendor.setVendswitch(Constant.YES);
 		// 买方用户(联系人)
 		// 1、单据存在买方用户UU号:买方企业存在对应uu号的用户,设为该用户;买方企业不存在对应uu号的用户,供应商和单据设为当前用户(管理员)
 		// 2、单据不存在买方用户UU号:供应商和单据设为当前用户(管理员)

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/QuotationServiceImpl.java

@@ -70,7 +70,9 @@ public class QuotationServiceImpl implements QuotationService {
 					}
 				} else {// 不存在对应的供应商资料,增加供应商关系
 					vendor = addVendor(saleQuotation);
-					addPartnerShipRecord(vendor); // 添加供应商关系同时增加合作伙伴关系记录
+					if (null != vendor) {
+						addPartnerShipRecord(vendor); // 添加供应商关系同时增加合作伙伴关系记录
+					}
 				}
 				if (vendor != null && vendor.getMyEnUU() != null) {
 					if (!CollectionUtils.isEmpty(saleQuotation.getQuotationItems())) {

+ 73 - 1
src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -4,17 +4,22 @@ import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
 import com.uas.platform.b2b.event.PurchaseTenderDecideReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseTenderSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.AttachService;
+import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.b2b.temporary.model.PurcTenderProd;
+import com.uas.platform.b2b.temporary.model.SmsMessage;
 import com.uas.platform.b2b.temporary.model.TenderContactInfo;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -30,6 +35,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -83,6 +89,14 @@ public class TenderServiceImpl implements TenderService {
     @Autowired
     private UserOrderDao userOrderDao;
 
+    @Autowired
+    private MessageConf messageConf;
+
+    /**
+     * 短信接口
+     */
+    final String messageUrl = "http://message.ubtob.com/sms/send";
+
     /**
      *  发布和保存
      * @param purchaseTender
@@ -371,6 +385,7 @@ public class TenderServiceImpl implements TenderService {
                 if (null == saleTender) { // 不存在投标单说明未转投标单,进行新增投标单操作
                     saleTender = new SaleTender(tender);
                     saleTender.setVendUU(vendUU);
+                    saleTender.setUserEmail(SystemSession.getUser().getUserEmail());
                     saleTender.setUseruu(SystemSession.getUser().getUserUU());
                     saleTender.setUser(SystemSession.getUser().getUserName());
                     saleTender.setUserTel(SystemSession.getUser().getUserTel());
@@ -542,6 +557,61 @@ public class TenderServiceImpl implements TenderService {
         return map;
     }
 
+    @Override
+    public ModelMap getSaleTenderVendors(Long id) {
+        ModelMap map = new ModelMap();
+        PurchaseTender tender = purchaseTenderDao.findOne(id);
+        List<SaleTender> saleTenders = saleTenderDao.findByEnUUAndCode(tender.getEnUU(), tender.getCode());
+        List<B2BVendor> vendors = new ArrayList<>();
+        for (SaleTender saleTender : saleTenders) {
+            List<Vendor> vendor = vendorDao.findByMyEnUUAndVendUU(tender.getEnUU(), saleTender.getVendUU());
+            if (!CollectionUtils.isEmpty(vendor)) {
+                B2BVendor b2BVendor = new B2BVendor(vendor.get(0));
+                b2BVendor.setVe_email(saleTender.getUserEmail());
+                b2BVendor.setVe_contact(saleTender.getUser());
+                vendors.add(b2BVendor);
+            }
+        }
+        tender.setPurchaseTenderProds(new HashSet<PurchaseTenderProd>());
+        map.put("vendors", vendors);
+        map.put("tender", tender);
+        return map;
+    }
+
+    @Override
+    public ModelMap sendMobileMessage(Long id) {
+        ModelMap map = new ModelMap();
+        PurchaseTender tender = purchaseTenderDao.findOne(id);
+        List<SaleTender> saleTenders = saleTenderDao.findByEnUUAndCode(tender.getEnUU(), tender.getCode());
+        for (SaleTender saleTender : saleTenders) {
+            try {
+                SmsMessage sms = new SmsMessage();
+                List<Object> obj = new ArrayList<>();
+                // 招标方
+                obj.add(saleTender.getEnUU());
+                obj.add(saleTender.getEnterprise().getEnName());
+//                obj.add(saleTender.getRecorder().getUserName());
+                obj.add(saleTender.getEnterpriseBaseInfo().getEnName());
+                obj.add(saleTender.getCode());
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String date = dateFormat.format(saleTender.getDate());
+                System.out.println(date);
+                obj.add(date);
+                sms.setParams(obj);
+                sms.setReceiver(saleTender.getUserTel());
+                sms.setTemplateId(messageConf.getMsgTenderForB2B());
+                HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
+            } catch (Exception e) {
+                map.put("error", "发送知会短信失败,单号:" + tender.getCode());
+                e.printStackTrace();
+            }
+        }
+        if (null == map.get("error")) {
+            map.put("success", true);
+        }
+        return map;
+    }
+
     /**
      * 发布或保存方法(针对保存的单据)
      *
@@ -674,7 +744,9 @@ public class TenderServiceImpl implements TenderService {
                                 Vendor vendor = null;
                                 if (vendors.size() == 0) {// 供应商列表中不存在供应商关系
                                     vendor = addVendor(saleTender);// 增加供应商关系
-                                    addPartnerShipRecord(vendor);
+                                    if (null != vendor) {
+                                        addPartnerShipRecord(vendor);
+                                    }
                                 } else {
                                     vendor = vendors.get(0);
                                 }

+ 0 - 1
src/main/java/com/uas/platform/b2b/listener/MessageListener.java

@@ -99,7 +99,6 @@ public class MessageListener implements ApplicationListener<SaveReleaseEvent<?,
 					}
 				}
 				// 新增消息
-				System.out.println(userUUs.toString());
 				for (Long userUU : userUUs) {
                     try { //去除userUU为空值的情况
 						if (null != userUU) {

+ 11 - 0
src/main/java/com/uas/platform/b2b/model/PurchaseTender.java

@@ -189,6 +189,9 @@ public class PurchaseTender implements Serializable {
     @Column(name = "pt_auditstatus")
     private Short auditStatus;
 
+    @Transient
+    private Short bidEnNum;
+
     public Long getId() {
         return id;
     }
@@ -404,6 +407,14 @@ public class PurchaseTender implements Serializable {
     public void setAuditStatus(Short auditStatus) {
         this.auditStatus = auditStatus;
     }
+
+    public Short getBidEnNum() {
+        return bidEnNum;
+    }
+
+    public void setBidEnNum(Short bidEnNum) {
+        this.bidEnNum = bidEnNum;
+    }
 }
 
 

+ 15 - 0
src/main/java/com/uas/platform/b2b/model/SaleTender.java

@@ -109,6 +109,12 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     @Column(name = "st_usertel")
     private String userTel;
 
+    /**
+     * 供应商联系人邮箱
+     */
+    @Column(name = "st_useremail")
+    private String userEmail;
+
     /**
      * 招标企业uu
      */
@@ -284,6 +290,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setUserTel(contactInfo.getContactTel());
         this.setUser(contactInfo.getContact());
         this.setUseruu(contactInfo.getContactUU());
+        this.setUserEmail(contactInfo.getContactEmail());
         this.setRecorderuu(tender.getUseruu());
         this.setPtId(tender.getId());
     }
@@ -556,4 +563,12 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     public void setResult(Short result) {
         this.result = result;
     }
+
+    public String getUserEmail() {
+        return userEmail;
+    }
+
+    public void setUserEmail(String userEmail) {
+        this.userEmail = userEmail;
+    }
 }

+ 3 - 0
src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -860,6 +860,9 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		List<PurchaseTender> tenderList = new ArrayList<>();
 		for (PurchaseTender tender : content) {
 			tender.setPurchaseTenderProds(prods); // erp查看列表只返回主表信息
+			// 已投标企业统计
+			List<SaleTender> saleTenders = saleTenderDao.findByEnUUAndCodeAndStatus(tender.getEnUU(), tender.getCode(), "待评标");
+			tender.setBidEnNum((short) saleTenders.size());
 			tenderList.add(tender);
 		}
 		sortByProperty(tenderList, PurchaseTender.class, "id", idsPage.getContent());

+ 1 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -437,6 +437,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                         saleTender.setUseruu(SystemSession.getUser().getUserUU());
                         saleTender.setUser(SystemSession.getUser().getUserName());
                         saleTender.setUserTel(SystemSession.getUser().getUserTel());
+                        saleTender.setUserEmail(SystemSession.getUser().getUserEmail());
                         saleTender.setVendUU(vendUU);
                         saleTenderDao.save(saleTender);
                     }

+ 13 - 0
src/main/java/com/uas/platform/b2b/support/MessageConf.java

@@ -26,6 +26,12 @@ public class MessageConf {
 	@Value("#{message.tplAfterBeAddedtoB2B}")
 	private String tplAfterBeAddedtoB2B;
 
+	/**
+	 * 短信模板id:发布招标单短信通知模版id
+	 */
+	@Value("#{message.msgTenderForB2B}")
+	private String msgTenderForB2B;
+
 	public String getTplInvitationForB2B() {
 		return tplInvitationForB2B;
 	}
@@ -50,4 +56,11 @@ public class MessageConf {
 		this.tplAfterBeAddedtoB2B = tplAfterBeAddedtoB2B;
 	}
 
+	public String getMsgTenderForB2B() {
+		return msgTenderForB2B;
+	}
+
+	public void setMsgTenderForB2B(String msgTenderForB2B) {
+		this.msgTenderForB2B = msgTenderForB2B;
+	}
 }

+ 10 - 0
src/main/java/com/uas/platform/b2b/temporary/model/TenderContactInfo.java

@@ -14,6 +14,8 @@ public class TenderContactInfo {
 
     private Long contactUU;
 
+    private String contactEmail;
+
     public Long getUu() {
         return uu;
     }
@@ -45,4 +47,12 @@ public class TenderContactInfo {
     public void setContactUU(Long contactUU) {
         this.contactUU = contactUU;
     }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
 }

+ 2 - 1
src/main/resources/dev/message.properties

@@ -1,3 +1,4 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
-tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6

+ 2 - 1
src/main/resources/prod/message.properties

@@ -1,3 +1,4 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
-tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6

+ 2 - 1
src/main/resources/test/message.properties

@@ -1,3 +1,4 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
-tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
+msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6

+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -3684,7 +3684,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             var regex = /^\d+(.\d{1,5})?$/;
             var valid = true;
             angular.forEach(inquiryItem.replies, function(reply, $index) {
-                if (reply.lapQty != null && (($index < index && reply.lapQty >= value) || ($index > index && reply.lapQty <= value))) {
+                if ($index < index && reply.lapQty >= value) {
                     valid = false;
                 }
             });

+ 3 - 3
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -391,7 +391,7 @@
 				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
 					<div ng-repeat="reply in inquiryItem.replies">
 						<div class="form-group input-group input-group-xs">
-							<input type="text" class="form-control input-xs" ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"
+							<input type="text" class="form-control input-xs" ng-class="{'input-error': !replylapQtys[$index]}"  ng-change="verifylapQty(reply.lapQty,$index, inquiryItem)"
 								   ng-model="reply.lapQty" min="{{$index == 0 ? 0 :(inquiryItem.replies[$index - 1].lapQty + 1)}}"
 								   ng-Readonly="$index == 0"  placeholder="数量" />
 								   <span class="input-group-btn" ng-show="$index != 0">
@@ -401,9 +401,9 @@
 									</button>
 								</span>
 						</div>
-						<!--<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">请填数字,且分段数应递增!</div>-->
+						<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">分段数量递增!</div>
 					</div>
-					<div class="text-muted" style="margin-top:-15px" >*分段数量递增!</div>
+					<!--<div class="text-muted" style="margin-top:-15px" >*分段数量递增!</div>-->
 					<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"
 					   ng-show="!inquiryItem.custLap">添加分段</a>
 				</div>