增加通过明细id查询明细详情的方法；返回报价信息时针对物料编号进行优化处理

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

@@ -14,6 +14,7 @@ import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.entity.OrderStatus;
 import com.uas.ps.inquiry.model.PublicInquiryItemInfo;
 import com.uas.ps.inquiry.model.PurcInquiry;
+import com.uas.ps.inquiry.model.PurcInquiryItem;
 import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
@@ -390,4 +391,18 @@ public class PublicInquiryController {
     public List<Map<String, Object>> findCodeRankingList() {
         return publicInquiryService.findCodeRankingList();
     }
+
+    /**
+     * 通过明细id查询该条询价的详情
+     *
+     * @param itemId 明细id
+     * @param enuu enuu
+     * @return
+     */
+    @HttpLog
+    @RequestMapping(value = "/findItemByItemId", method = RequestMethod.GET)
+    public PurcInquiryItemInfo findItemByItemId(Long itemId, Long enuu) {
+        logger.log("公共询价", "获取询价信息", "id: " + itemId, Constant.UU, enuu, InquirySource.B2B.name());
+        return publicInquiryService.findItemByItemId(itemId);
+    }
 }

src/main/java/com/uas/ps/inquiry/entity/InquiryDetail.java

@@ -304,6 +304,9 @@ public class InquiryDetail {
         this.id_prodcode = item.getProdCode();
         this.id_currency = item.getCurrency();
         this.ve_uu = item.getVendUU();
+        if (this.id_prodcode == null && item.getProduct() != null) {
+        	this.id_prodcode = item.getProduct().getCode();
+		}
         this.in_inquirytype = item.getInquiry().getInquirytype();
         if (!CollectionUtils.isEmpty(item.getReplies())) {
             dets = new ArrayList<InquiryDetailDet>();

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -205,5 +205,13 @@ public interface PublicInquiryService {
      * @return
      */
     List<Map<String, Object>> findCodeRankingList();
+
+    /**
+     * 通过明细id查询询价详情
+     *
+     * @param itemId 明细id
+     * @return
+     */
+    PurcInquiryItemInfo findItemByItemId(Long itemId);
 }
 

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

@@ -922,4 +922,15 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 + " a order by seekAmount desc limit 0,5";
         return jdbcTemplate.queryForList(sql);
     }
+
+    /**
+     * 通过明细id查询询价详情
+     *
+     * @param itemId 明细id
+     * @return
+     */
+    @Override
+    public PurcInquiryItemInfo findItemByItemId(Long itemId) {
+        return inquiryItemInfoDao.findOne(itemId);
+    }
 }