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

# Conflicts:
#	src/main/java/com/uas/platform/b2b/service/PurchaseOrderService.java

src/main/java/com/uas/platform/b2b/controller/SaleInquiryMouldController.java

@@ -21,7 +21,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+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.PurchaseInquiryMouldService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -39,6 +41,19 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 卖家对模具询价单的操作 -- 无关键词直接从数据库获取，已修改
@@ -438,7 +453,7 @@ public class SaleInquiryMouldController {
 	 }
 
 	/**
-	 * 作为卖家，报价时上传附件（模具询价b2b目前不需要上传附件）
+	 * 作为卖家，报价时上传附件
 	 *
 	 * @param id
 	 * @return

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

@@ -54,7 +54,7 @@ public class SaleQuotationDecideReleaseEvent extends SaveReleaseEvent<PagingRele
         String category = "sale";  // 对接收方来说，该单据类型
         String table = "sale$quotation";
         Long sourceId = quotation.getId();
-        String url = "sale/quotation/" + quotation.getId();
+        String url = "#/sale/quotation/" + quotation.getId();
         Short orderStatus = quotation.getStatus();
         String context;
         if (item.getAgreed() == Constant.YES) {

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

@@ -54,7 +54,7 @@ public class SaleQuotationInvalidReleaseEvent extends SaveReleaseEvent<PagingRel
         String category = "sale";  // 对接收方来说，该单据类型
         String table = "sale$quotation";
         Long sourceId = quotation.getId();
-        String url = "sale/quotation/" + quotation.getId();
+        String url = "#/sale/quotation/" + quotation.getId();
         Short orderStatus = quotation.getStatus();
         String context = quotation.getCust().getEnName() + "的" + emName + "作废了您的主动报价单（" + codeValue + ")！";
         PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type,

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

@@ -16292,11 +16292,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             // ReportService.print(deputyOrder.deputyuu, 'PURCHASE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 采购订单
             // ReportService.print(deputyOrder.deputyuu, 'PAYCONFIRM', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 付款确认
             // ReportService.print(deputyOrder.deputyuu, 'TRADECONTRACT', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 买卖合同
-            //TODO 目前只有信扬有代采业务，先写死之后再改
-            ReportService.print(10044118, 'PURCNOTICE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 定向采购通知
-            ReportService.print(10044118, 'PURCHASE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 采购订单
-            ReportService.print(10044118, 'PAYCONFIRM', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 付款确认
-            ReportService.print(10044118, 'TRADECONTRACT', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 买卖合同
+            ReportService.print(deputyOrder.deputyuu, 'PURCNOTICE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 定向采购通知
+            ReportService.print(deputyOrder.deputyuu, 'PURCHASE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 采购订单
+            ReportService.print(deputyOrder.deputyuu, 'PAYCONFIRM', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 付款确认
+            ReportService.print(deputyOrder.deputyuu, 'TRADECONTRACT', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 买卖合同
 
         };