客户打样申请红点

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

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

@@ -68,77 +68,79 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	@Autowired
 	private PagingReleaseCountDao pagingReleaseCountDao;
 
-//	@Autowired
-//	private RoleDao roleDao;
-//
-//	@Autowired
-//	private UserDao userDao;
-//
-//	@Autowired
-//	private VendorDao vendorDao;
-//
-//	@Autowired
-//	private DistributeDao distributeDao;
-//
+	@Autowired
+	private RoleDao roleDao;
+
+	@Autowired
+	private UserDao userDao;
+
+	@Autowired
+	private VendorDao vendorDao;
+
+	@Autowired
+	private DistributeDao distributeDao;
+
 	@Autowired
 	private UserOrderDao userOrderDao;
 
 	public void save(List<PurchaseProofingItem> proofingItems) {
 		proofingItems = purchaseProofingItemDao.save(proofingItems);
-//		saveUserOrders(proofingItems);
+		saveUserOrders(proofingItems);
 		ContextUtils.publishEvent(new PurchaseProofingItemSaveEvent(proofingItems));
 	}
 
-//	private void saveUserOrders(final List<PurchaseProofingItem> proofingItems) {
-//
-//		ThreadTask.getInstance().execute(new Runnable() {
-//			@Override
-//			public void run() {
-//            /* 添加供应商的阅读记录*/
-//				for(PurchaseProofingItem item : proofingItems) {
-//					Set<Long> userUUs = new HashSet<>();
-//					// 添加管理员
-//					List<Role> roles = roleDao.findByEnUUAndIssys(item.getVendUU(), Constant.YES);
-//					if (!CollectionUtils.isEmpty(roles)) {
-//						List<User> admins = userDao.findByRole(roles.get(0).getId());
-//						for (User admin : admins) {
-//							if (!userUUs.contains(admin.getUserUU())) {
-//								userUUs.add(admin.getUserUU());
-//							}
-//						}
-//					}
-//					List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(item.getVendUU(), item.getProofing().getEnUU());
-//					// 查找有权限的用户
-//					if (!CollectionUtils.isEmpty(vendors)) {
-//						Long vendorId = vendors.get(0).getId();
-//						List<Distribute> distributes = distributeDao.findByVendorId(vendorId);
-//						if (!CollectionUtils.isEmpty(distributes)) {
-//							for (Distribute distribute : distributes) {
-//								if (!userUUs.contains(distribute.getUserUU())) {
-//									userUUs.add(distribute.getUserUU());
-//								}
-//							}
-//						}
-//					}
-//					UserOrders userOrders;
-//					List<UserOrders> list = new ArrayList<>();
-//					for (Long userUU : userUUs) {
-//						if (userUU == null) {
-//							continue;
-//						}
-//						userOrders = new UserOrders(userUU, item.getVendUU(), item.getId(), "sale", "purc$proofingitems");
-//						list.add(userOrders);
-//					}
-//
-//                /* 添加采购员的阅读记录*/
-//					userOrders = new UserOrders(item.getProofing().getUserUU(), item.getProofing().getEnUU(), item.getId(), "purc", "purc$proofingitems");
-//					list.add(userOrders);
-//					userOrderDao.save(list);
-//				}
-//			}
-//		});
-//
-//	}
+	private void saveUserOrders(final List<PurchaseProofingItem> proofingItems) {
+
+		ThreadTask.getInstance().execute(new Runnable() {
+			@Override
+			public void run() {
+            	/* 添加供应商的阅读记录*/
+				for(PurchaseProofingItem item : proofingItems) {
+					Set<Long> userUUs = new HashSet<>();
+					// 添加管理员
+					List<Role> roles = roleDao.findByEnUUAndIssys(item.getVendUU(), Constant.YES);
+					if (!CollectionUtils.isEmpty(roles)) {
+						List<User> admins = userDao.findByRole(roles.get(0).getId());
+						for (User admin : admins) {
+							if (!userUUs.contains(admin.getUserUU())) {
+								userUUs.add(admin.getUserUU());
+							}
+						}
+					}
+					List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(item.getVendUU(), item.getProofing().getEnUU());
+					// 查找有权限的用户
+					if (!CollectionUtils.isEmpty(vendors)) {
+						Long vendorId = vendors.get(0).getId();
+						List<Distribute> distributes = distributeDao.findByVendorId(vendorId);
+						if (!CollectionUtils.isEmpty(distributes)) {
+							for (Distribute distribute : distributes) {
+								if (!userUUs.contains(distribute.getUserUU())) {
+									userUUs.add(distribute.getUserUU());
+								}
+							}
+						}
+					}
+					UserOrders userOrders;
+					List<UserOrders> list = new ArrayList<>();
+					for (Long userUU : userUUs) {
+						if (userUU == null) {
+							continue;
+						}
+						userOrders = new UserOrders(userUU, item.getVendUU(), item.getId(), "sale", "purc$proofingitems");
+						list.add(userOrders);
+					}
+
+                	/* 添加采购员的阅读记录*/
+					if (item.getProofing().getUserUU() != null) {
+						userOrders = new UserOrders(item.getProofing().getUserUU(), item.getProofing().getEnUU(), item.getId(), "purc", "purc$proofingitems");
+						list.add(userOrders);
+					}
+					userOrderDao.save(list);
+				}
+			}
+		});
+
+	}
 
 	@Override
 	public void saveAttach(List<Attach> attachs) {

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

@@ -6870,7 +6870,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //设置单个单据已读
         $scope.setOrdersRead = function (id) {
-            if (!isUnread(id)) {
+            if (!$scope.isUnread(id)) {
                 return;
             }
             var sourceId = [];

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

@@ -260,7 +260,7 @@
 						</a>&nbsp;&nbsp;
 						<span class="text-num" title="录单时间">{{::check.recordDate | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>&nbsp;&nbsp;&nbsp;
 						<span><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.custName}}</span>
-						<span style="margin-left: 100px;">单据编号：</span>
+						<span style="margin-left: 100px;">{{check.id}}单据编号：</span>
 						<span class="text-num"><a ui-sref="fa.apCheck_detail({id:check.id})" title="点击查看详情" ng-click="setOrdersRead(check.id)" style="color: #5078cb">{{::check.code}}</a></span>
 					</div>
 					<div class="static">

src/main/webapp/resources/tpl/index/sale/left.html

@@ -49,7 +49,7 @@
 			<i></i>样品管理
 		</div>
 		<ul class="list-unstyled">
-			<li ui-sref-active="active"><a ui-sref="sale.sample"><em class="new-dot" ng-if="false"></em>客户打样申请</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale.sample"><em class="new-dot" ng-if="unread.sample > 0"></em>客户打样申请</a></li>
 			<li ui-sref-active="active"><a ui-sref="sale.approval"><em class="new-dot" ng-if="false"></em>客户认定单</a></li>
 		</ul>
 	</div>

src/main/webapp/resources/tpl/index/sale/sample_send.html

@@ -184,7 +184,7 @@
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button class="btn btn-primary" type="submit" ng-disabled="sampleSendForm.$invalid">确认送样</button>
+		<button class="btn btn-primary" type="submit" ng-disabled="sampleSendForm.$invalid" ng-click="setOrdersRead(sampleItem.id)">确认送样</button>
 		<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
 	</div>
 </form>