UAS发布的询价单，报价错误处理

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -47,22 +47,14 @@ public class InquiryForSaleController {
      * 后续统一使用
      * @param publicInquiryItem 报价单内容
      * @return
-     * @throws Exception
      */
     @HttpLog
     @RequestMapping(value = "/item/saveQuote", method = RequestMethod.POST)
-    public ModelMap saveQuote(@RequestBody PublicInquiryItem publicInquiryItem) throws Exception {
+    public ModelMap saveQuote(@RequestBody PublicInquiryItem publicInquiryItem) {
         Long start = System.currentTimeMillis();
         ModelMap result = saleService.saveQuote(publicInquiryItem);
         log.info("/inquiry/sale/item/saveQuote post,保存报价接口, 报价单Id：{}, 耗时: {}", publicInquiryItem.getId(), (System.currentTimeMillis() - start));
         publicInquiryService.ReceiveMessage(publicInquiryItem, InquirySource.MALL.name());
-//        if (null != item) {
-//            PublicInquiry inquiry = item.getInquiry();
-//            inquiry.setQuteId(item.getId());
-//            return JSON.toJSONString(inquiry);
-//        } else {
-//            throw new Exception("保存失败");
-//        }
         return result;
     }
 

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -1065,9 +1065,9 @@ public class PublicInquiryItem implements Serializable {
 							&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
 							&& this.agreed == null) && this.erpstatus != Constant.NO);
 		}
-		return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
+		return null != status && (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
 				&& (null != this.inquiry && (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES))
-				&& this.agreed == null) && this.erpstatus != Constant.NO;
+				&& this.agreed == null) && this.erpstatus != Constant.NO);
 	}
 
     public static List<PublicInquiry> distinct(List<PublicInquiryItem> purcitems) {

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -737,20 +737,19 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         if (validatePublicItem(publicInquiryItem, result)) {
             return result;
         }
-        Long sourceId;
-        if (null != publicInquiryItem.getSourceId()) {
-            sourceId = publicInquiryItem.getSourceId();
-        } else {
-            sourceId = publicInquiryItem.getId();
+        Long itemId = null != publicInquiryItem.getId() ? publicInquiryItem.getId() : publicInquiryItem.getSourceId();
+        if (null == itemId) {
+            result.put("message", "未传入有效的询价明细id");
+            return result;
         }
         // 是否为自己的询价 并查询公共询价的信息
-        PurcInquiryItemInfo item = inquiryItemInfoDao.findOne(sourceId);
+        PurcInquiryItemInfo item = inquiryItemInfoDao.findOne(itemId);
         // 验证询价明细信息
         if (validatePurcInquiryItem(publicInquiryItem, result, item)) {
             return result;
         }
         // 验证是否重复
-        if (validateRepeat(publicInquiryItem, result)) {
+        if (validateRepeat(publicInquiryItem, result, itemId)) {
             return result;
         }
 
@@ -764,8 +763,8 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         return replyInquiry(result, inquiry, inquiryItem);
     }
 
-    private boolean validateRepeat(PublicInquiryItem publicInquiryItem, ModelMap result) {
-        PublicInquiryItem existInquiry = infoDao.findByVendUUAndSourceId(publicInquiryItem.getVendUU(), publicInquiryItem.getSourceId());
+    private boolean validateRepeat(PublicInquiryItem publicInquiryItem, ModelMap result, Long itemId) {
+        PublicInquiryItem existInquiry = infoDao.findByVendUUAndSourceId(publicInquiryItem.getVendUU(), itemId);
         // 是否重复报价
         if (null != existInquiry) {
             result.put("message", "该单据已报价，不能重复报价");

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -357,6 +357,7 @@ public class InquiryServiceImpl implements InquiryService {
             product.setSourceApp(sourceApp);
             product.setSpec(StringUtils.isEmpty(item.getSpec()) ? item.getCmpCode() : item.getSpec());
             product.setKind(item.getProdTitle());
+            product.setTitle(item.getProdTitle());
             products.add(product);
         }
         // 调用公共物料服务的接口