Merge remote-tracking branch 'origin/dev' into authority

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

@@ -56,10 +56,13 @@ public class PurchaseInquiryMouldInvalidReleaseEvent extends SaveReleaseEvent<Pa
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type, isReply, category, table, sourceId, orderStatus, toVendor, url);
         Long vendUU = mould.getVenduu();
         Long vendUserUU = mould.getVendUserUU();
+        String vendUserName = "操作员";
         if (null == vendUserUU) {
             vendUserUU = 1L;
         }
-        String vendUserName = mould.getVendUser().getUserName();
+        if (null != mould.getVendUser()) {
+            vendUserName = mould.getVendUser().getUserName();
+        }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);
         releaseDetail.setPagingRelease(release);
         return releaseDetail;

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

@@ -59,6 +59,8 @@ public class PurchaseInquiryMouldSaveReleaseEvent extends SaveReleaseEvent<Pagin
         String vendUserName = "业务员";
         if (null == vendUserUU) {
             vendUserUU = 1L;
+        }
+        if (null != mould.getVendUser()) {
             vendUserName = mould.getVendUser().getUserName();
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);

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

@@ -63,6 +63,8 @@ public class PurchaseProofingItemSaveReleaseEvent extends SaveReleaseEvent<Pagin
         String vendUserName = "业务员";
         if (null == vendUserUU) {
             vendUserUU = 1L;
+        }
+        if (null != proofingItem.getVendUser()) {
             vendUserName = proofingItem.getVendUser().getUserName();
         }
         PagingReleaseDetail releaseDetail = new PagingReleaseDetail(vendUU, vendUserUU, vendUserName);

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

@@ -11,13 +11,17 @@ import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.event.*;
+import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.b2b.temporary.model.SmsMessage;
@@ -110,6 +114,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
+	private final static UsageBufferedLogger usageLogger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
 	@Override
 	public void save(List<PurchaseInquiryItem> inquiryItems) {
 		inquiryItems = purchaseInquiryItemDao.save(inquiryItems);
@@ -261,8 +267,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 									try {
 										mailService.send(messageConf.getTplInquiryForB2B(), userEmail, model);
 									} catch (Exception e) {
-										logger.log("内部询价发送邮件出错", inquiry.getEnUU() + "," +inquiry.getCode() +" 发送失败", 0);
-										throw new RuntimeException(e);
+										usageLogger.log("询价发送邮件", "企业UU:" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +" 发送邮件失败", "询价发送邮件出错");
 									}
 								}
 							}
@@ -274,8 +279,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 									HttpUtil.sendPost(messageConf.getMessageUrl(), FlexJsonUtils.toJsonDeep(sms));
 
 								} catch (Exception e) {
-									logger.log("内部询价发送短信出错", inquiry.getEnUU() + "," +inquiry.getCode() +" 发送失败", 0);
-									throw new RuntimeException(e);
+									usageLogger.log("询价发送短信", "企业UU：" + inquiry.getEnUU() + ",单号：" +inquiry.getCode() +"短信发送失败", "询价发送短信出错");
 								}
 							}
 							enUUs.add(inquiryItem.getVendUU());

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

@@ -10635,10 +10635,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         var getMangagerInfo = function() {
             CurrentRole.isManager({}, function(data) {
-               $scope.isManager = data.isManager;
+               $scope.isManager = data.isManager || $scope.user.sys;
             });
             CurrentRole.roles({}, function(data) {
-               $scope.roles = data.count;
+               $scope.roles = data.count || $scope.user.sys;
             });
         };
         getMangagerInfo();

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

@@ -416,9 +416,6 @@ tbody td div.text-mould {
 							<span ng-show="inquiryMould.$editing">
 								<a ng-click="inquiryMould.$editing=!inquiryMould.$editing;reload()"
 									class="btn btn-xs btn-link text-error">取消</a>&nbsp;
-								<a ng-click="onReplyClick(inquiryMould)"
-									ng-disabled="!canSave"
-									class="btn btn-link btn-xs text-success">保存</a>&nbsp;
 								<a ng-click="onReplyClick(inquiryMould, true);setOrdersRead(inquiryMould.id)"
 									ng-disabled="!canSave"
 									class="btn btn-link btn-xs text-inverse">