EDI传销售预测、送货提醒到平台，获取平台发货单接口；企业圈红点提示调整。

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

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseForecastController.java

@@ -1,22 +1,25 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.erp.model.PurchaseForecast;
+import com.uas.platform.b2b.erp.service.PurchaseForecastService;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.service.PurchaseForecastOrderService;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.axis.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.platform.b2b.erp.model.PurchaseForecast;
-import com.uas.platform.b2b.erp.service.PurchaseForecastService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.PurchaseForecastOrderService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 @Controller
 @RequestMapping("/erp/purchase/forecast")
@@ -45,4 +48,36 @@ public class PurchaseForecastController {
 		logger.log("采购预测", "上传采购预测", purchaseForecasts.size());
 	}
 
+	/**
+	 * 将ERP的采购预测写到平台(EDI)
+	 *
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/EDI", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap saveEDIPurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		ModelMap map = new ModelMap();
+		if (null == data) {
+			map.put("success", false);
+			map.put("message", "未传入参数！");
+			return map;
+		}
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		JSONObject jsonObject = JSON.parseObject(jsonStr);
+		if (StringUtils.isEmpty(jsonObject.getString("enUU")) || StringUtils.isEmpty(jsonObject.getString("PurchaseForecast"))) {
+			map.put("success", false);
+			map.put("message", "参数名有误！");
+			return map;
+
+		}
+		List<PurchaseForecast> purchaseForecasts = FlexJsonUtils.fromJsonArray(jsonObject.getString("PurchaseForecast"), PurchaseForecast.class);
+		Long enUU = FlexJsonUtils.fromJson(jsonObject.getString("enUU"), Long.class);
+		purchaseForecastOrderService.save(purchaseForecastService.convertEDIPurchaseForecast(purchaseForecasts, enUU));
+		logger.log("采购预测", "上传采购预测", purchaseForecasts.size());
+		map.put("success", true);
+		return map;
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseNotifyController.java

@@ -1,18 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.AcceptNotifyConfirm;
 import com.uas.platform.b2b.erp.model.AcceptNotifyVerify;
@@ -23,6 +12,20 @@ import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.axis.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 对买家ERP的数据接口<br>
@@ -71,6 +74,49 @@ public class PurchaseNotifyController {
 		return modifiedNotifies;
 	}
 
+	/**
+	 * 将送货提醒写到平台（EDI）
+	 *
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/EDI", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap saveEDINotifies(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		ModelMap map = new ModelMap();
+		if (null == data) {
+			map.put("success", false);
+			map.put("message", "未传入参数！");
+			return map;
+		}
+//		List<PurchaseNotify> modifiedNotifies = new ArrayList<PurchaseNotify>();
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		JSONObject jsonObject = JSON.parseObject(jsonStr);
+		if (StringUtils.isEmpty(jsonObject.getString("enUU")) || StringUtils.isEmpty(jsonObject.getString("PurchaseNotify"))) {
+			map.put("success", false);
+			map.put("message", "参数名有误！");
+			return map;
+
+		}
+		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonObject.getString("PurchaseNotify"), PurchaseNotify.class);
+		Long enUU = FlexJsonUtils.fromJson(jsonObject.getString("enUU"), Long.class);
+		List<List<PurchaseNotice>> lists = purchaseNotifyService.convertEDIPurchaseNotify(notifies, enUU);
+		purchaseNoticeService.save(lists.get(0));
+		List<PurchaseNotice> oppNotices = lists.get(1);
+		if (!CollectionUtils.isEmpty(oppNotices)) {
+			for (PurchaseNotice notice : oppNotices) {
+				PurchaseNotify notify = new PurchaseNotify();
+				notify.setPn_id(notice.getSourceId());
+				notify.setPn_qty(notice.getQty());
+//				modifiedNotifies.add(notify);
+			}
+		}
+		logger.log("送货提醒", "上传送货提醒", notifies.size());
+		map.put("success", true);
+		return map;
+	}
+
 	/**
 	 * 从买家ERP获取平台的发货单
 	 * 
@@ -84,6 +130,7 @@ public class PurchaseNotifyController {
 		return notifies;
 	}
 
+
 	/**
 	 * 平台的发货单传到ERP之后，修改平台里面的发货单的状态
 	 * 
@@ -96,6 +143,48 @@ public class PurchaseNotifyController {
 		purchaseNoticeService.onSendUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
 	}
 
+	/**
+	 * 从买家ERP获取平台的发货单(EDI)
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/accept/EDI", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap getEDIAcceptNotify(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		ModelMap map = new ModelMap();
+		if (null == data) {
+			map.put("success", false);
+			map.put("message", "未传入参数！");
+			return map;
+		}
+		String enUU = URLDecoder.decode(data, "UTF-8");
+		List<AcceptNotify> notifies = purchaseNotifyService.convertSaleSend(purchaseNoticeService.findNotUploadSendEDI(Long.valueOf(enUU)));
+		logger.log("供应商发货单", "下载来自供应商的发货单", notifies.size());
+		map.put("success", true);
+		map.put("AcceptNotify", notifies);
+		return map;
+	}
+
+	/**
+	 * 平台的发货单传到ERP之后，修改平台里面的发货单的状态(EDI)
+	 *
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/accept/back/EDI", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap onSendSuccessEDI(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		ModelMap map = new ModelMap();
+		if (null == data) {
+			map.put("success", false);
+			map.put("message", "未传入参数！");
+			return map;
+		}
+		purchaseNoticeService.onSendUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		map.put("success", true);
+		return map;
+	}
+
 	/**
 	 * 买家ERP主动收料的记录上传到平台 <br>
 	 * 买卖双方直接电话沟通之后，结果由买家填写到ERP系统的情况

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

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 
+import java.util.Date;
+
 /**
  * 买家ERP系统的送货提醒单（提醒卖家发货）
  * 
@@ -135,4 +135,32 @@ public class PurchaseNotify {
 		return notice;
 	}
 
+	/**
+	 * 转为平台的客户送货提醒（EDI）
+	 *
+	 * @return
+	 */
+	public PurchaseNotice convertEDI(Long enUU) {
+		PurchaseNotice notice = new PurchaseNotice();
+		notice.setSourceId(pn_id);
+		notice.setDate(pn_indate);
+		notice.setDelivery(pn_delivery);
+		notice.setEndQty(pn_endqty);
+		notice.setEnUU(enUU);
+		notice.setQty(pn_qty);
+		notice.setRemark(pn_remark);
+		notice.setVendUU(ve_uu);
+		PurchaseOrder order = new PurchaseOrder();
+		order.setCode(pn_ordercode);
+		PurchaseOrderItem orderItem = new PurchaseOrderItem();
+		orderItem.setNumber(pn_orderdetno);
+		orderItem.setOrder(order);
+		notice.setOrderItem(orderItem);
+		notice.setStatus((short) Status.NOT_REPLY.value());
+		notice.setSendStatus((short) Status.NOT_UPLOAD.value());
+		notice.setMinPackQty(pr_zxbzs);// 物料最小包装数
+		notice.setErpDate(new Date());
+		return notice;
+	}
+
 }

src/main/java/com/uas/platform/b2b/erp/service/PurchaseForecastService.java

@@ -1,13 +1,14 @@
 package com.uas.platform.b2b.erp.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.erp.model.PurchaseForecast;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 
+import java.util.List;
+
 
 public interface PurchaseForecastService {
 
 	List<PurchaseForecastAllItem> convertPurchaseForecast(List<PurchaseForecast> purchaseForecasts);
 
+    List<PurchaseForecastAllItem> convertEDIPurchaseForecast(List<PurchaseForecast> purchaseForecasts, Long enUU);
 }

src/main/java/com/uas/platform/b2b/erp/service/PurchaseNotifyService.java

@@ -61,4 +61,5 @@ public interface PurchaseNotifyService {
 	 */
 	List<SaleSendItemVerify> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies);
 
+    List<List<PurchaseNotice>> convertEDIPurchaseNotify(List<PurchaseNotify> notifies, Long enUU);
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseForecastServiceImpl.java

@@ -97,6 +97,65 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 		return items;
 	}
 
+	@Override
+	public List<PurchaseForecastAllItem> convertEDIPurchaseForecast(List<PurchaseForecast> purchaseForecasts, Long enUU) {
+		List<PurchaseForecastAllItem> items = new ArrayList<PurchaseForecastAllItem>();
+		for (PurchaseForecast purchaseForecast : purchaseForecasts) {
+			// 先查看是否已存在
+			List<PurchaseForecastAll> forecasts = purchaseForecastDao.findByEnUUAndCode(enUU,
+					purchaseForecast.getPf_code());
+			if (forecasts.size() == 0) {
+				PurchaseForecastAll forecast = purchaseForecast.convert();
+				if (!CollectionUtils.isEmpty(forecast.getForecastItems())) {
+					// 设置User
+					if (forecast.getUserUU() != null) {
+						List<User> users = userDao.findByEnUUAndUserUU(enUU, forecast.getUser().getUserUU());
+						if (CollectionUtils.isEmpty(users)) {
+							forecast.setUserUU(SystemSession.getUser().getUserUU());
+						}
+					} else {
+						forecast.setUserUU(SystemSession.getUser().getUserUU());
+					}
+					// 对明细遍历
+					for (PurchaseForecastAllItem item : forecast.getForecastItems()) {
+						item.setOrder(forecast);
+						if (item.getVendUU() != null) {// 明细中有供应商uu号
+							List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, item.getVendUU());
+							Vendor vendor = null;
+							if (vendors.size() == 0) {
+								vendor = addVendor(item);
+							} else {
+								vendor = vendors.get(0);
+							}
+							List<Product> products = productDao.findByEnUUAndCode(enUU, item.getProduct().getCode());
+							if (products.size() > 0 && vendor != null) {
+								item.setVendUU(vendor.getVendEnUU());
+								if (item.getVendUserUU() != null && item.getVendUserUU() != 0) {
+									List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(),
+											item.getVendUserUU());
+									if (vendUsers.size() == 0) {
+										// 平台中的供应商企业不存在供应商联系人uu的用户
+										// 则设为平台中供应商列表中的供应商联系人UU
+										item.setVendUserUU(vendors.get(0).getVendUserUU());
+									}
+								} else {
+									// 买方ERP中供应商资料没有设置供应商联系人uu
+									// 则设为平台中供应商列表中的供应商联系人UU
+									item.setVendUserUU(vendors.get(0).getVendUserUU());
+								}
+								item.setProduct(products.get(0));
+								item.setProductId(products.get(0).getId());
+								item.setErpDate(new Date());
+								items.add(item);
+							}
+						}
+					}
+				}
+			}
+		}
+		return items;
+	}
+
 	/**
 	 * 添加供应商资料
 	 * 

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -1,16 +1,5 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
 import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
@@ -20,13 +9,19 @@ import com.uas.platform.b2b.erp.model.AcceptNotifyConfirm;
 import com.uas.platform.b2b.erp.model.AcceptNotifyVerify;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.erp.service.PurchaseNotifyService;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.SaleSend;
-import com.uas.platform.b2b.model.SaleSendItem;
-import com.uas.platform.b2b.model.SaleSendItemVerify;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 @Service
 public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
@@ -108,6 +103,75 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 		return allNotices;
 	}
 
+
+	@Override
+	public List<List<PurchaseNotice>> convertEDIPurchaseNotify(List<PurchaseNotify> notifies, Long enUU) {
+		List<List<PurchaseNotice>> allNotices = new ArrayList<List<PurchaseNotice>>();
+		List<PurchaseNotice> notices = new ArrayList<PurchaseNotice>();
+		List<PurchaseNotice> oppNotices = new ArrayList<PurchaseNotice>();
+		for (PurchaseNotify notify : notifies) {
+			PurchaseNotice notice = notify.convertEDI(enUU);
+			List<PurchaseNotice> existNotices = purchaseNoticeDao.findByEnUUAndSourceId(enUU,
+					notice.getSourceId());
+			if (CollectionUtils.isEmpty(existNotices)) {// sourceId不存在新增保存
+				List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(
+						notice.getEnUU(), notice.getOrderItem().getOrder().getCode(),
+						notice.getOrderItem().getNumber());
+				if (!CollectionUtils.isEmpty(orderItems)) {
+					notice.setOrderItem(orderItems.get(0));
+					notice.setOrderItemId(notice.getOrderItem().getId());
+					notices.add(notice);
+				}
+			} else {// 对现有的单据，修改
+				PurchaseNotice existNotice = existNotices.get(0);
+				SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日");
+				String dateString = dateFormat.format(new Date());
+				String remark = "";
+				if (StringUtils.hasText(existNotice.getRemark())) {
+					remark = existNotice.getRemark() + "； ";
+				}
+				existNotice.setSendStatus((short) Status.NOT_UPLOAD.value());// 对卖家传输状态
+				// 待上传
+				if (existNotice.getQty() != null && !existNotice.getQty().equals(notice.getQty())) {
+					if (existNotice.getEndQty() > notice.getQty()) {
+						// 已发货数大于新的需求数，修改平台上的需求数为已发货数，将已发货数量传回买家ERP修改发货提醒的数量
+						existNotice.setRemark(remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> "
+								+ existNotice.getEndQty());
+						existNotice.setQty(existNotice.getEndQty());// 需求数量
+						existNotice.setStatus((short) Status.REPLIED.value());// 状态
+						// 已回复
+						oppNotices.add(existNotice);
+						notices.add(existNotice);
+					} else {
+						// 已发货数小于或等于新的需求数，修改平台上的需求数为新的需求数
+						existNotice.setRemark(
+								remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> " + notice.getQty());
+						existNotice.setQty(notice.getQty());// 需求数量
+						existNotice.setDelivery(notice.getDelivery());// 交期
+						notices.add(existNotice);
+					}
+				} else {
+					String existDeliveryStr = "空";
+					String deliveryStr = "空";
+					if (existNotice.getDelivery() != null) {
+						existDeliveryStr = dateFormat.format(existNotice.getDelivery());
+					}
+					if (notice.getDelivery() != null) {
+						deliveryStr = dateFormat.format(notice.getDelivery());
+					}
+					if (!existDeliveryStr.equals(deliveryStr)) {
+						existNotice.setRemark(remark + dateString + "修改交期，" + existDeliveryStr + " -> " + deliveryStr);
+					}
+					existNotice.setDelivery(notice.getDelivery());// 交期
+					notices.add(existNotice);
+				}
+			}
+		}
+		allNotices.add(notices);
+		allNotices.add(oppNotices);
+		return allNotices;
+	}
+
 	@Override
 	public List<AcceptNotify> convertSaleSend(List<SaleSend> sends) {
 		List<AcceptNotify> accepts = new ArrayList<AcceptNotify>();

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

@@ -297,4 +297,6 @@ public interface PurchaseNoticeService {
 	 * @return
 	 */
     void printCount(Long id);
+
+    List<SaleSend> findNotUploadSendEDI(Long enUU);
 }

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

@@ -182,6 +182,12 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				(short) Status.NOT_UPLOAD.value());
 	}
 
+	@Override
+	public List<SaleSend> findNotUploadSendEDI(Long enUU) {
+		return saleSendDao.findByCustUUAndSendStatus(enUU,
+				(short) Status.NOT_UPLOAD.value());
+	}
+
 	@Override
 	public List<SaleSend> findNotSendSend() {
 		return saleSendDao.findByEnUUAndBackStatus(SystemSession.getUser().getEnterprise().getUu(),

src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -11,9 +11,9 @@
 <div class="tab-first" ng-controller="RequestAmountCtrl">
 	<div class="row">
 		<div class="tab-menu">
-			<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='vendor' || status=='customer' || status=='partner' && active=='done'}" class="tab-btn">我的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0" ></b></a>
+			<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='vendor' || status=='customer' || status=='partner' && active=='done'}" class="tab-btn">我的合作伙伴</a>
 			<!-- <a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a> -->
-			<a type="button" ui-sref="baseInfo.newPartner" class="tab-btn" ng-class="{'active':status=='add' || status=='invitation' && status!='send' && status!='add' || status=='partner' && active == 'all'}">新的合作伙伴</a>
+			<a type="button" ui-sref="baseInfo.newPartner" class="tab-btn" ng-class="{'active':status=='add' || status=='invitation' && status!='send' && status!='add' || status=='partner' && active == 'all'}">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0" ></b></a>
 			<!--<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">新的合作伙伴</a>-->
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html

@@ -19,7 +19,7 @@
 		</div>-->
 		<div class="com-tab-menu col-xs-6">
 			<ul>
-				<li><a ui-sref="baseInfo.myRequest" ng-class="{'active':status=='partner'}">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0" style="top:0;"></b></a></li>
+				<li><a ui-sref="baseInfo.myRequest" ng-class="{'active':status=='partner'}">全部合作伙伴</a></li>
 				<li><a  ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor'}" >供应商</a></li>
 				<li><a ui-sref="baseInfo.customerInfo" ng-class="{'active':status=='customer'}" >客户</a></li>
 			</ul>

src/main/webapp/resources/tpl/index/fa/apCheck_detail.html

@@ -114,7 +114,7 @@
 				<thead>
 					<tr class="header">
 						<th class="br-r">行号</th>
-						<th>商品</th>
+						<th style="max-width: 150px;">商品</th>
 						<th>客户单据编号</th>
 						<th>单据类型</th>
 						<th>序号</th>
@@ -130,7 +130,7 @@
 				<tbody ng-repeat="item in data.items" style="text-align: center;">
 					<tr>
 						<td ng-bind="item.number"></td>
-						<td ng-bind="item.prodCode"></td>
+						<td style="max-width: 150px;" ng-bind="item.prodCode"></td>
 						<td ng-bind="item.inoutno"></td>
 						<td ng-bind="item.orderClass"></td>
 						<td ng-bind="item.inoutnodetno"></td>

src/main/webapp/resources/tpl/index/home/right.html

@@ -399,8 +399,8 @@
 		<div class="enterprise-btn">
 			<img src="static/img/home/entLib.png" >
 			<div ng-controller="RequestAmountCtrl">
-				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴<em ng-if="requestTodo.todo>0"></em></a><br/>
-				<a title="新的合作伙伴" ui-sref="baseInfo.newPartner">新的合作伙伴</a>
+				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴</a><br/>
+				<a title="新的合作伙伴" ui-sref="baseInfo.newPartner">新的合作伙伴<em ng-if="requestTodo.todo>0"></em></a>
 			</div>
 		</div>
 		<!--<a href="#/baseInfo/enterpriseList"><img src="static/img/home/entLib.png" ></a>-->